Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/aumix/files/, media-sound/aumix/
Date: Sat, 08 Aug 2020 16:55:52
Message-Id: 1596905643.496c9ec7355f06f6d1d19be780a6981503e6df1f.soap@gentoo
1 commit: 496c9ec7355f06f6d1d19be780a6981503e6df1f
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 8 16:54:03 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 8 16:54:03 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=496c9ec7
7
8 media-sound/aumix: Fix building under -fno-common
9
10 Closes: https://bugs.gentoo.org/707650
11 Package-Manager: Portage-3.0.1, Repoman-2.3.23
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 media-sound/aumix/aumix-2.9.1.ebuild | 3 +-
15 .../aumix/files/aumix-2.9.1-fno-common.patch | 132 +++++++++++++++++++++
16 2 files changed, 134 insertions(+), 1 deletion(-)
17
18 diff --git a/media-sound/aumix/aumix-2.9.1.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild
19 index 2b8a5517471..76cdbdadc38 100644
20 --- a/media-sound/aumix/aumix-2.9.1.ebuild
21 +++ b/media-sound/aumix/aumix-2.9.1.ebuild
22 @@ -25,7 +25,8 @@ BDEPEND="
23 "
24
25 PATCHES=(
26 - "${FILESDIR}/${P}-tinfo.patch" #578722
27 + "${FILESDIR}"/${P}-tinfo.patch #578722
28 + "${FILESDIR}"/${P}-fno-common.patch
29 )
30
31 src_prepare() {
32
33 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
34 new file mode 100644
35 index 00000000000..f021cbda4d6
36 --- /dev/null
37 +++ b/media-sound/aumix/files/aumix-2.9.1-fno-common.patch
38 @@ -0,0 +1,132 @@
39 +--- a/src/common.h
40 ++++ b/src/common.h
41 +@@ -129,8 +129,8 @@
42 + extern int ReadRecSrc(void);
43 + extern int WriteRecSrc(void);
44 + int ReadWriteMixer(int device, char *rw, int *left, int *right, char *rp);
45 +-int ourlevel[SOUND_MIXER_NRDEVICES];
46 +-int our_recplay[SOUND_MIXER_NRDEVICES]; /* Store record/play settings for updates. */
47 ++extern int ourlevel[SOUND_MIXER_NRDEVICES];
48 ++extern int our_recplay[SOUND_MIXER_NRDEVICES]; /* Store record/play settings for updates. */
49 + int LoadSettings(void);
50 + int SaveSettings(void);
51 + int dummy_ioctl(int fd, unsigned long req, int *arg);
52 +--- a/src/curses.c
53 ++++ b/src/curses.c
54 +@@ -27,8 +27,9 @@
55 + #include "mouse.h"
56 +
57 + unsigned char *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo, *lang;
58 +-int current_dev, level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved;
59 ++int level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved;
60 + int in_keysbox = FALSE;
61 ++int (*Wgetch) (WINDOW * win);
62 + static int cursor_x, cursor_y; /* keep track of cursor position */
63 +
64 + void InitScreenCurses(void)
65 +--- a/src/curses.h
66 ++++ b/src/curses.h
67 +@@ -88,8 +88,8 @@
68 + };
69 + #define ARROW_WIDTH 1 /* width of selection arrow */
70 + #define R_P_WIDTH 1 /* width of record/play indicator */
71 +-int level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode;
72 +-int (*Wgetch) (WINDOW * win);
73 ++extern int level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode;
74 ++extern int (*Wgetch) (WINDOW * win);
75 + #define Getch() (*Wgetch)(stdscr)
76 + void WakeUpCurses(void);
77 + void InitScreenCurses(void);
78 +--- a/src/gtk.c
79 ++++ b/src/gtk.c
80 +@@ -45,6 +45,24 @@
81 + #include "interactive.h"
82 + #include <signal.h> /* SIGALRM */
83 +
84 ++GdkBitmap *rmask;
85 ++GdkBitmap *pmask;
86 ++GtkWidget *pixmapwid[SOUND_MIXER_NRDEVICES];
87 ++GdkPixmap *record_pixmap;
88 ++GdkPixmap *play_pixmap;
89 ++GtkAdjustment *adjustment[SOUND_MIXER_NRDEVICES];
90 ++GtkAdjustment *balance[SOUND_MIXER_NRDEVICES];
91 ++GtkWidget *baltracks[SOUND_MIXER_NRDEVICES];
92 ++GtkWidget *channellabel[SOUND_MIXER_NRDEVICES];
93 ++GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
94 ++GtkWidget *levels[SOUND_MIXER_NRDEVICES];
95 ++GtkWidget *maintable;
96 ++gint balcallback[SOUND_MIXER_NRDEVICES];
97 ++gint lvlcallback[SOUND_MIXER_NRDEVICES];
98 ++gint rpcallback[SOUND_MIXER_NRDEVICES];
99 ++gboolean menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
100 ++GtkWidget *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
101 ++
102 + void SaveSettingsGTK(void)
103 + {
104 + (void) SaveSettings();
105 +--- a/src/gtk.h
106 ++++ b/src/gtk.h
107 +@@ -7,23 +7,23 @@
108 + #include <sys/mman.h>
109 + #include <gtk/gtk.h>
110 +
111 +-GdkBitmap *rmask;
112 +-GdkBitmap *pmask;
113 +-GtkWidget *pixmapwid[SOUND_MIXER_NRDEVICES];
114 +-GdkPixmap *record_pixmap;
115 +-GdkPixmap *play_pixmap;
116 +-GtkAdjustment *adjustment[SOUND_MIXER_NRDEVICES];
117 +-GtkAdjustment *balance[SOUND_MIXER_NRDEVICES];
118 +-GtkWidget *baltracks[SOUND_MIXER_NRDEVICES];
119 +-GtkWidget *channellabel[SOUND_MIXER_NRDEVICES];
120 +-GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
121 +-GtkWidget *levels[SOUND_MIXER_NRDEVICES];
122 +-GtkWidget *maintable;
123 +-gint balcallback[SOUND_MIXER_NRDEVICES];
124 +-gint lvlcallback[SOUND_MIXER_NRDEVICES];
125 +-gint rpcallback[SOUND_MIXER_NRDEVICES];
126 +-gboolean menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
127 +-GtkWidget *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
128 ++extern GdkBitmap *rmask;
129 ++extern GdkBitmap *pmask;
130 ++extern GtkWidget *pixmapwid[SOUND_MIXER_NRDEVICES];
131 ++extern GdkPixmap *record_pixmap;
132 ++extern GdkPixmap *play_pixmap;
133 ++extern GtkAdjustment *adjustment[SOUND_MIXER_NRDEVICES];
134 ++extern GtkAdjustment *balance[SOUND_MIXER_NRDEVICES];
135 ++extern GtkWidget *baltracks[SOUND_MIXER_NRDEVICES];
136 ++extern GtkWidget *channellabel[SOUND_MIXER_NRDEVICES];
137 ++extern GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
138 ++extern GtkWidget *levels[SOUND_MIXER_NRDEVICES];
139 ++extern GtkWidget *maintable;
140 ++extern gint balcallback[SOUND_MIXER_NRDEVICES];
141 ++extern gint lvlcallback[SOUND_MIXER_NRDEVICES];
142 ++extern gint rpcallback[SOUND_MIXER_NRDEVICES];
143 ++extern gboolean menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
144 ++extern GtkWidget *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
145 + void WakeUpGTK(void);
146 + void HideShowBalancesGTK(void);
147 + void HideShowNumbersGTK(void);
148 +--- a/src/interactive.c
149 ++++ b/src/interactive.c
150 +@@ -28,6 +28,9 @@
151 + #include "gtk.h"
152 + #endif /* HAVE_GTK */
153 +
154 ++int ourlevel[SOUND_MIXER_NRDEVICES];
155 ++int our_recplay[SOUND_MIXER_NRDEVICES];
156 ++
157 + void AumixSignalHandler(int signal_number)
158 + {
159 + /* Handle SIGALRM. */
160 +--- a/src/interactive.h
161 ++++ b/src/interactive.h
162 +@@ -7,7 +7,7 @@
163 + #define MUTE_ONLY 2
164 + #define REFRESH_PERIOD 1 /* number of seconds between updates */
165 +
166 +-unsigned char *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo;
167 ++extern unsigned char *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo;
168 + void AumixSignalHandler(int signal_number);
169 + void InitScreen(void);
170 + void KeysBox(void);
Report Message
Find on MARC Find on Google Groups