From 6228d70137eab7594520fe6e4dbd1a9a23bfe967 Mon Sep 17 00:00:00 2001
From: Ben Kohler <bkohler@gentoo.org>
Date: Fri, 15 May 2020 11:23:38 -0500
Subject: [PATCH] media-video/transcode: add gcc-10 / -fno-common fix

Closes: https://bugs.gentoo.org/707162
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 .../transcode-1.1.7-gcc10-fno-common.patch    | 48 +++++++++++++++++++
 .../transcode/transcode-1.1.7-r5.ebuild       |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 media-video/transcode/files/transcode-1.1.7-gcc10-fno-common.patch

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() {
-- 
2.26.2