gentoo resync : 25.08.2020

3 files changed, 136 insertions, 2 deletions

diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index ca6bc9fccbaf..07b689da15dd 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -1,5 +1,6 @@
+AUX aumix-2.9.1-fno-common.patch 5798 BLAKE2B 1d3c6bf6b501b3daf4b96e1b2093b9a3d94553b4fd43fc3d02136450e805b75a8c8bc82e7ce0222179bae54126aa4e3cb148f784590de818f0593ceebf74638d SHA512 248ed0bceb2b1030930c89a1d6eace9c43338be80dae5d023bcb131a1666be21984fa2bd814945f8e5683d6e31eeb10bc2cddc6820385ce44e3ae32fdb8da3e9
 AUX aumix-2.9.1-tinfo.patch 737 BLAKE2B faae7740cbdf0af61df2febed5a7901822b73682b3e294a46b901b033c87e1900e7256b073cf0e5257ec3db32218e106cf350059a0f62ba7d29992179ea98d64 SHA512 9a2e68378d7bf7920ae2004ecefb2bcffdd829cab0c09340796de4d1617f0959e2b68432c9e29f748179abcfef87c22b8a3698615eef6485e1d7e17383d3d7eb
 AUX aumix.rc6 1037 BLAKE2B ba9842705caa5e78c7d5886afa6c8408a50169ec79a788d49ca04a8c90bcf581dcb96f4b11c8b6004370143ee6a92d9e0b660132826b2b9e167a07a6dfe73001 SHA512 8960c6c5e61e15e981bfafff7b03aded627971c11d6c21ce9e0d953737f440885fb5dda6a9f942112697c344b4f3ad9f222e2a7cfa493a504dc75a8f4c8cf1c9
 DIST aumix-2.9.1.tar.bz2 231622 BLAKE2B b96075d310b1d04bfc697a9097fd656d85705f68f1b06b1e6ee5bc0ca2b2a3614df67980d0f6e293c4d99adb9d12fae3608ac446eefd1cdf4f04de7f4a5fd1db SHA512 bd063dc9dab8455f467fbe9e4ea1baa5cef914923e66ab5a8fca1e6964cac7851e3755f054bfe41657371e221920fe9a52f9807457996244f4bcd5db4659b21d
-EBUILD aumix-2.9.1.ebuild 996 BLAKE2B 4e003f44ceaae4db2b78ed579934ca12cff1118ee493a110a3172d1de18cde8301dc9357eba7ebb04d3f97fe66684e25149d8b8650c7ef00ff8ebcf95a8eb3fe SHA512 1b8764df079db8e0cc7761b7fdcb600a28ef0eee22cafcc35b895574b5677f9c5874f767d9398ffd1d3a43e7a1438149a66d6ce5ac7eb4b3dd18cb94a360c0e6
+EBUILD aumix-2.9.1.ebuild 1033 BLAKE2B 018bf631c1a68ddd3561cb9e65ec2b8198f08c4bed769b7254d5c859f7567db2aad38b85c587635aab852586657bd02832730453edfc31e7b38da8d1290bbbd3 SHA512 30da0c21889ce0a30e6ec950dc3d6a2d7c936d238981c002fef4b36fc182088d65641e7b357716d9792c757ce9289087c6e37dadaf4192cf96589418dc7120cc
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/aumix/aumix-2.9.1.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild
index 2b8a55174718..76cdbdadc38d 100644
--- a/media-sound/aumix/aumix-2.9.1.ebuild
+++ b/media-sound/aumix/aumix-2.9.1.ebuild
@@ -25,7 +25,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-tinfo.patch" #578722
+	"${FILESDIR}"/${P}-tinfo.patch #578722
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
diff --git a/media-sound/aumix/files/aumix-2.9.1-fno-common.patch b/media-sound/aumix/files/aumix-2.9.1-fno-common.patch
new file mode 100644
index 000000000000..f021cbda4d6c
--- /dev/null
+++ b/media-sound/aumix/files/aumix-2.9.1-fno-common.patch
@@ -0,0 +1,132 @@
+--- a/src/common.h
++++ b/src/common.h
+@@ -129,8 +129,8 @@
+ extern int      ReadRecSrc(void);
+ extern int      WriteRecSrc(void);
+ int             ReadWriteMixer(int device, char *rw, int *left, int *right, char *rp);
+-int             ourlevel[SOUND_MIXER_NRDEVICES];
+-int             our_recplay[SOUND_MIXER_NRDEVICES];	/* Store record/play settings for updates. */
++extern int             ourlevel[SOUND_MIXER_NRDEVICES];
++extern int             our_recplay[SOUND_MIXER_NRDEVICES];	/* Store record/play settings for updates. */
+ int             LoadSettings(void);
+ int             SaveSettings(void);
+ int             dummy_ioctl(int fd, unsigned long req, int *arg);
+--- a/src/curses.c
++++ b/src/curses.c
+@@ -27,8 +27,9 @@
+ #include "mouse.h"
+ 
+ unsigned char  *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo, *lang;
+-int             current_dev, level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved;
++int             level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved;
+ int             in_keysbox = FALSE;
++int             (*Wgetch) (WINDOW * win);
+ static int	cursor_x, cursor_y;	/* keep track of cursor position */
+ 
+ void            InitScreenCurses(void)
+--- a/src/curses.h
++++ b/src/curses.h
+@@ -88,8 +88,8 @@
+ };
+ #define ARROW_WIDTH 1		/* width of selection arrow */
+ #define R_P_WIDTH 1		/* width of record/play indicator */
+-int             level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode;
+-int             (*Wgetch) (WINDOW * win);
++extern int             level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode;
++extern int             (*Wgetch) (WINDOW * win);
+ #define Getch() (*Wgetch)(stdscr)
+ void            WakeUpCurses(void);
+ void            InitScreenCurses(void);
+--- a/src/gtk.c
++++ b/src/gtk.c
+@@ -45,6 +45,24 @@
+ #include "interactive.h"
+ #include <signal.h>		/* SIGALRM */
+ 
++GdkBitmap      *rmask;
++GdkBitmap      *pmask;
++GtkWidget      *pixmapwid[SOUND_MIXER_NRDEVICES];
++GdkPixmap      *record_pixmap;
++GdkPixmap      *play_pixmap;
++GtkAdjustment  *adjustment[SOUND_MIXER_NRDEVICES];
++GtkAdjustment  *balance[SOUND_MIXER_NRDEVICES];
++GtkWidget      *baltracks[SOUND_MIXER_NRDEVICES];
++GtkWidget      *channellabel[SOUND_MIXER_NRDEVICES];
++GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
++GtkWidget      *levels[SOUND_MIXER_NRDEVICES];
++GtkWidget      *maintable;
++gint            balcallback[SOUND_MIXER_NRDEVICES];
++gint            lvlcallback[SOUND_MIXER_NRDEVICES];
++gint            rpcallback[SOUND_MIXER_NRDEVICES];
++gboolean        menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
++GtkWidget      *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
++
+ void            SaveSettingsGTK(void)
+ {
+ 	(void) SaveSettings();
+--- a/src/gtk.h
++++ b/src/gtk.h
+@@ -7,23 +7,23 @@
+ #include <sys/mman.h>
+ #include <gtk/gtk.h>
+ 
+-GdkBitmap      *rmask;
+-GdkBitmap      *pmask;
+-GtkWidget      *pixmapwid[SOUND_MIXER_NRDEVICES];
+-GdkPixmap      *record_pixmap;
+-GdkPixmap      *play_pixmap;
+-GtkAdjustment  *adjustment[SOUND_MIXER_NRDEVICES];
+-GtkAdjustment  *balance[SOUND_MIXER_NRDEVICES];
+-GtkWidget      *baltracks[SOUND_MIXER_NRDEVICES];
+-GtkWidget      *channellabel[SOUND_MIXER_NRDEVICES];
+-GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
+-GtkWidget      *levels[SOUND_MIXER_NRDEVICES];
+-GtkWidget      *maintable;
+-gint            balcallback[SOUND_MIXER_NRDEVICES];
+-gint            lvlcallback[SOUND_MIXER_NRDEVICES];
+-gint            rpcallback[SOUND_MIXER_NRDEVICES];
+-gboolean        menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
+-GtkWidget      *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
++extern GdkBitmap      *rmask;
++extern GdkBitmap      *pmask;
++extern GtkWidget      *pixmapwid[SOUND_MIXER_NRDEVICES];
++extern GdkPixmap      *record_pixmap;
++extern GdkPixmap      *play_pixmap;
++extern GtkAdjustment  *adjustment[SOUND_MIXER_NRDEVICES];
++extern GtkAdjustment  *balance[SOUND_MIXER_NRDEVICES];
++extern GtkWidget      *baltracks[SOUND_MIXER_NRDEVICES];
++extern GtkWidget      *channellabel[SOUND_MIXER_NRDEVICES];
++extern GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
++extern GtkWidget      *levels[SOUND_MIXER_NRDEVICES];
++extern GtkWidget      *maintable;
++extern gint            balcallback[SOUND_MIXER_NRDEVICES];
++extern gint            lvlcallback[SOUND_MIXER_NRDEVICES];
++extern gint            rpcallback[SOUND_MIXER_NRDEVICES];
++extern gboolean        menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
++extern GtkWidget      *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
+ void            WakeUpGTK(void);
+ void            HideShowBalancesGTK(void);
+ void            HideShowNumbersGTK(void);
+--- a/src/interactive.c
++++ b/src/interactive.c
+@@ -28,6 +28,9 @@
+ #include "gtk.h"
+ #endif				/* HAVE_GTK */
+ 
++int ourlevel[SOUND_MIXER_NRDEVICES];
++int our_recplay[SOUND_MIXER_NRDEVICES];
++
+ void            AumixSignalHandler(int signal_number)
+ {
+ /* Handle SIGALRM. */
+--- a/src/interactive.h
++++ b/src/interactive.h
+@@ -7,7 +7,7 @@
+ #define MUTE_ONLY 2
+ #define        REFRESH_PERIOD 1	/* number of seconds between updates */
+ 
+-unsigned char  *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo;
++extern unsigned char  *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo;
+ void            AumixSignalHandler(int signal_number);
+ void            InitScreen(void);
+ void            KeysBox(void);