Gentoo Archives: gentoo-commits

From: Bernard Cafarelli <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmix/, x11-plugins/wmix/files/
Date: Wed, 29 Jan 2020 18:28:13
Message-Id: 1580322420.ca77453ab4c49bb3edcf20213d431159bcad7de9.voyageur@gentoo
1 commit: ca77453ab4c49bb3edcf20213d431159bcad7de9
2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 29 18:07:55 2020 +0000
4 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 29 18:27:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca77453a
7
8 x11-plugins/wmix: fix build with -fno-common
9
10 Closes: https://bugs.gentoo.org/706720
11 Package-Manager: Portage-2.3.86, Repoman-2.3.20
12 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
13
14 x11-plugins/wmix/files/wmix-3.4-gcc-10.patch | 89 ++++++++++++++++++++++++++++
15 x11-plugins/wmix/wmix-3.4.ebuild | 4 +-
16 2 files changed, 92 insertions(+), 1 deletion(-)
17
18 diff --git a/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch b/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch
19 new file mode 100644
20 index 00000000000..4e91a1a53d7
21 --- /dev/null
22 +++ b/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch
23 @@ -0,0 +1,89 @@
24 +diff -Naur wmix-3.4.orig/include/mixer.h wmix-3.4/include/mixer.h
25 +--- wmix-3.4.orig/include/mixer.h 2018-04-30 14:17:50.000000000 +0200
26 ++++ wmix-3.4/include/mixer.h 2020-01-29 19:07:14.932404252 +0100
27 +@@ -55,28 +55,28 @@
28 + * - Muting must occur independently of the volume level.
29 + */
30 +
31 +-void (*mixer_init)(const char *mixer_device,
32 ++extern void (*mixer_init)(const char *mixer_device,
33 + bool verbose,
34 + const char *exclude[]);
35 +-bool (*mixer_is_changed)(void);
36 +-int (*mixer_get_channel_count)(void);
37 +-int (*mixer_get_channel)(void);
38 +-const char *(*mixer_get_channel_name)(void);
39 +-const char *(*mixer_get_short_name)(void);
40 +-void (*mixer_set_channel)(int channel);
41 +-void (*mixer_set_channel_rel)(int delta_channel);
42 +-float (*mixer_get_volume)(void);
43 +-void (*mixer_set_volume)(float volume);
44 +-void (*mixer_set_volume_rel)(float delta_volume);
45 +-float (*mixer_get_balance)(void);
46 +-void (*mixer_set_balance)(float balance);
47 +-void (*mixer_set_balance_rel)(float delta_balance);
48 +-void (*mixer_toggle_mute)(void);
49 +-void (*mixer_toggle_rec)(void);
50 +-bool (*mixer_is_muted)(void);
51 +-bool (*mixer_is_stereo)(void);
52 +-bool (*mixer_is_rec)(void);
53 +-bool (*mixer_can_rec)(void);
54 +-bool (*is_exclude)(const char *short_name,
55 ++extern bool (*mixer_is_changed)(void);
56 ++extern int (*mixer_get_channel_count)(void);
57 ++extern int (*mixer_get_channel)(void);
58 ++extern const char *(*mixer_get_channel_name)(void);
59 ++extern const char *(*mixer_get_short_name)(void);
60 ++extern void (*mixer_set_channel)(int channel);
61 ++extern void (*mixer_set_channel_rel)(int delta_channel);
62 ++extern float (*mixer_get_volume)(void);
63 ++extern void (*mixer_set_volume)(float volume);
64 ++extern void (*mixer_set_volume_rel)(float delta_volume);
65 ++extern float (*mixer_get_balance)(void);
66 ++extern void (*mixer_set_balance)(float balance);
67 ++extern void (*mixer_set_balance_rel)(float delta_balance);
68 ++extern void (*mixer_toggle_mute)(void);
69 ++extern void (*mixer_toggle_rec)(void);
70 ++extern bool (*mixer_is_muted)(void);
71 ++extern bool (*mixer_is_stereo)(void);
72 ++extern bool (*mixer_is_rec)(void);
73 ++extern bool (*mixer_can_rec)(void);
74 ++extern bool (*is_exclude)(const char *short_name,
75 + const char *exclude[]);
76 +-void (*mixer_tick)(void);
77 ++extern void (*mixer_tick)(void);
78 +diff -Naur wmix-3.4.orig/wmix.c wmix-3.4/wmix.c
79 +--- wmix-3.4.orig/wmix.c 2019-07-12 18:44:38.000000000 +0200
80 ++++ wmix-3.4/wmix.c 2020-01-29 19:06:52.685402994 +0100
81 +@@ -53,6 +53,31 @@
82 + static int mouse_drag_home_y;
83 + static int idle_loop;
84 +
85 ++void (*mixer_init)(const char *mixer_device,
86 ++ bool verbose,
87 ++ const char *exclude[]);
88 ++bool (*mixer_is_changed)(void);
89 ++int (*mixer_get_channel_count)(void);
90 ++int (*mixer_get_channel)(void);
91 ++const char *(*mixer_get_channel_name)(void);
92 ++const char *(*mixer_get_short_name)(void);
93 ++void (*mixer_set_channel)(int channel);
94 ++void (*mixer_set_channel_rel)(int delta_channel);
95 ++float (*mixer_get_volume)(void);
96 ++void (*mixer_set_volume)(float volume);
97 ++void (*mixer_set_volume_rel)(float delta_volume);
98 ++float (*mixer_get_balance)(void);
99 ++void (*mixer_set_balance)(float balance);
100 ++void (*mixer_set_balance_rel)(float delta_balance);
101 ++void (*mixer_toggle_mute)(void);
102 ++void (*mixer_toggle_rec)(void);
103 ++bool (*mixer_is_muted)(void);
104 ++bool (*mixer_is_stereo)(void);
105 ++bool (*mixer_is_rec)(void);
106 ++bool (*mixer_can_rec)(void);
107 ++bool (*is_exclude)(const char *short_name,
108 ++ const char *exclude[]);
109 ++void (*mixer_tick)(void);
110 + /* local stuff */
111 + static void signal_catch(int sig);
112 + static void button_press_event(XButtonEvent *event);
113
114 diff --git a/x11-plugins/wmix/wmix-3.4.ebuild b/x11-plugins/wmix/wmix-3.4.ebuild
115 index 55507ef664a..5f69dde7b3a 100644
116 --- a/x11-plugins/wmix/wmix-3.4.ebuild
117 +++ b/x11-plugins/wmix/wmix-3.4.ebuild
118 @@ -1,4 +1,4 @@
119 -# Copyright 1999-2019 Gentoo Authors
120 +# Copyright 1999-2020 Gentoo Authors
121 # Distributed under the terms of the GNU General Public License v2
122
123 EAPI=7
124 @@ -20,3 +20,5 @@ RDEPEND="media-libs/alsa-lib
125 x11-libs/libXrandr"
126 DEPEND="${RDEPEND}
127 x11-base/xorg-proto"
128 +
129 +PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )