From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 30 May 2020 11:44:06 +0100
Subject: gentoo resync : 30.05.2020

---
 media-video/transcode/Manifest                     |  3 +-
 .../files/transcode-1.1.7-gcc10-fno-common.patch   | 48 ++++++++++++++++++++++
 media-video/transcode/transcode-1.1.7-r5.ebuild    |  1 +
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 media-video/transcode/files/transcode-1.1.7-gcc10-fno-common.patch

(limited to 'media-video/transcode')

diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index e33e302959b1..c409f37a21d6 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,7 +1,8 @@
 AUX ffmpeg4.patch 28911 BLAKE2B f1189589a39ea9801e1620bd138499f5f5a29429cc7372ebf65b38901f1f4f0b71957a216a65367108660709ea5ca001e5ce68d67dfd478ed471963acef087a3 SHA512 1550b2de1ca0265703513d3b7fca3441f6216d89792dc68e224f5f2d99386275cdfdf7ef7b01abaf69f5de5d9af1f221617697aff6345d3d1b2e5a06d30e1f6d
+AUX transcode-1.1.7-gcc10-fno-common.patch 860 BLAKE2B c564b28e99ef397694243e9411e10feec4fe9c1b5efb8f6ea4c76621a61116a6c0d643a3c21a9544960763e9ff68221e747be1b66598f31bf638edaf585131cd SHA512 edfc821ec0beb4c0edd9fc7a6f2f5f49417190a03c7c79b62b386e34a4746c327fcf7bfe8d0ee339cc374a6333b55bf1399d7cc9c300620c348f22b658247861
 AUX transcode-1.1.7-swresample.patch 674 BLAKE2B 733a3490d2a25b20555cce3624f8e1753d22e3ae945a9656b835a5bf0eabf1b2f16fc1df1f817931dfc618b644c9e359c1c37939ef169f3f59006455a4fa2c75 SHA512 a9a79215082506882f1d1549cbe51706670f7ccf9d5da1400f9bf81482d4f410a855772183eeac8d9fa865d5d6086e10cbe8f4d7176802959a0a8b5df0759abb
 DIST transcode-1.1.7-patchset.tar.bz2 16379 BLAKE2B fbdc188bffeb8751814abfa7e119a1053e482f194bc1b87a721c48e2b66e107df146d38b3ea11a88d066c49d8862489b88b74f61fa36ce3f8a1a782da3762615 SHA512 bedc82aa4fbc17774e34d8fc24799d70b8460c6c1dd728549bcaa5c387492f56e520674fdf8bb976c0b5fcc9ccefb765f2ee26816e0d2b96a83402a21cee3f6d
 DIST transcode-1.1.7.tar.bz2 2183627 BLAKE2B 25001d4cae83d86e5295917bcd9e2e77dd61637e238394a2d603398baf810201dc61d8b0de5b54a7b8848ac3bcef5fb211e8f2b43ed7da4e56e335b8d4d2fbe1 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
 EBUILD transcode-1.1.7-r4.ebuild 4131 BLAKE2B ebcdf29ad43555dc557fc9f05c8830efa680cf8f50286850b3d0d8b36ae0c931293f2e7ac69f95b471b2ef458470ab75a465757323ae6fe05d3f329846c41733 SHA512 1134536dcfcbbc4418bd8b9a4a7fac6aa2e87f7c4aa1c2897a373fa46a5e0f48692859b67dcf696634a36dbb89e3fa89821e6cec54d778a4156112a8f2939f18
-EBUILD transcode-1.1.7-r5.ebuild 4189 BLAKE2B a25f43e7bd15eb2b45a4414a4d8b4350f3d8539d471d16ac82fa5c201e5e3bf3ef79dd7ca08ae5020ba57be9b149f1dec56eee24fb9ea0a867e71637922b242d SHA512 db8f579e41169dbee17b34835a8244d872ae514f2f135497409a50ef5a9976fb9ae88dc102de65661ae2909a7b55e9fe7f3e062c1a86cea3137a6a8a2d1b44f0
+EBUILD transcode-1.1.7-r5.ebuild 4232 BLAKE2B ad831e1ea1fd05fa2d3c4e0a02847cb6661ce2dac17ce313f12fdb869b9c0b86ab2e9aed281b041ec2a42acabb2a00d2cdbfa9b953361b86f53eeee3a9e9ed4e SHA512 5f823ca59191cb040e1f75cc60d6becff6e88621f65fc3dc537a8942c9c488a10a728bca95727215607d8bdffb36fae4134fcb75a3f31b3a1fe63240cd554d44
 MISC metadata.xml 619 BLAKE2B fa440f0f00bd7afe2834108078f48dc93dfe5ea38d343587267e2b45f4c4187762fdf16e1f023e4fc3af69d181ec77cbedec4a39df98eb8d4a098b98248c7b56 SHA512 043d39001850f8088e33e7277a579af7cb45b6fd2b3fe4483eb7771340dae8eab14927184f0fab9aedc8934a6d2599ce6231726308079d0ae16e7710f826ad1b
diff --git a/media-video/transcode/files/transcode-1.1.7-gcc10-fno-common.patch b/media-video/transcode/files/transcode-1.1.7-gcc10-fno-common.patch
new file mode 100644
index 000000000000..fcee415deee1
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-gcc10-fno-common.patch
@@ -0,0 +1,48 @@
+--- a/import/demux_pass.c
++++ b/import/demux_pass.c
+@@ -32,8 +32,6 @@
+ #include "packets.h"
+ 
+ 
+-int gop, gop_pts, gop_cnt;
+-
+ /* if you listen carefully, then you can hear the desesperate
+  * whisper of this code calling for a rewrite. Or for a redesign.
+  * Or both. --  FR
+--- a/import/extract_ac3.c
++++ b/import/extract_ac3.c
+@@ -334,7 +334,6 @@
+ FILE *fd;
+ 
+ #define MAX_BUF 4096
+-char audio[MAX_BUF];
+ 
+ 
+ /* from ac3scan.c */
+@@ -472,6 +471,8 @@
+ void extract_ac3(info_t *ipipe)
+ {
+ 
++    char audio[MAX_BUF];
++
+     int error=0;
+ 
+     avi_t *avifile;
+--- a/import/extract_mp3.c
++++ b/import/extract_mp3.c
+@@ -243,7 +243,6 @@
+ }
+ 
+ #define MAX_BUF 4096
+-char audio[MAX_BUF];
+ 
+ /* ------------------------------------------------------------
+  *
+@@ -258,6 +257,7 @@
+ 
+ void extract_mp3(info_t *ipipe)
+ {
++    char audio[MAX_BUF];
+ 
+     int error=0;
+ 
diff --git a/media-video/transcode/transcode-1.1.7-r5.ebuild b/media-video/transcode/transcode-1.1.7-r5.ebuild
index 7a878b4fd548..6af3a27f9474 100644
--- a/media-video/transcode/transcode-1.1.7-r5.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r5.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
 	"${WORKDIR}"/${P}-patchset/${P}-freetype251.patch
 	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg24.patch
 	"${FILESDIR}"/${P}-swresample.patch #722296
+	"${FILESDIR}"/${P}-gcc10-fno-common.patch
 )
 
 src_prepare() {
-- 
cgit v1.2.3