diff options
Diffstat (limited to 'x11-plugins/wmix')
| -rw-r--r-- | x11-plugins/wmix/Manifest | 5 | ||||
| -rw-r--r-- | x11-plugins/wmix/files/wmix-3.4-gcc-10.patch | 89 | ||||
| -rw-r--r-- | x11-plugins/wmix/wmix-3.3-r2.ebuild | 22 | ||||
| -rw-r--r-- | x11-plugins/wmix/wmix-3.4.ebuild | 4 |
4 files changed, 94 insertions, 26 deletions
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest index c6c802d3016d..8a66609f56ee 100644 --- a/x11-plugins/wmix/Manifest +++ b/x11-plugins/wmix/Manifest @@ -1,8 +1,7 @@ +AUX wmix-3.4-gcc-10.patch 3584 BLAKE2B 4026aa39e88ea33625e37995607845b710c5150b8a3afc5d6142bf127cd17216a9843a6e5ce1913e5698bd6488ce1d009abfee20e25a9818c770dacbd55031ce SHA512 b79b3bfc92682e49ad2d45d97c21bb1d97d40db42de242049a6567507b9766e37a7f5f438ebe16b09b29ddca18391dfee8bba67888b817f71e1b9ce1da57f2f6 AUX wmix.1 1969 BLAKE2B 9599e110ef1efcfb1582749cc58355f5d055920f5d1d0834073bd161af65cea300c100a9cd64ef65906842858da0e4539527a0c448616228280f7b283bf2a29a SHA512 3937513506295543cef1a12a0a739f4923e2fe6500436433969351547493b712c891ac41ccf627a325eaf03c8552cbe6cac0cedc3ba3548a26c138f4eec084d6 DIST wmix-3.2.tar.gz 33504 BLAKE2B cafc6d4d1d52094edc459db8ab82b46ea0a216ca8035a2882be7ab2dba6945c155a73c2fc3601e9697076f8cf032b7943617680fd70ef889590a9976c2b147a8 SHA512 8382ab849aeacfc88d28cd094c0d9a3218f8aa26b763d9fb4fd8b9837c275a835cc3e29df0659c244fa94b884ebc36b571fe824eaa785a736e630dc2e0081417 -DIST wmix-3.3.tar.gz 118037 BLAKE2B b219f607ea31132b7753ba7e92e7ff3ce1ddbb992a3f0295ca68001ee81c55ed347196b2d864058f09763e6cf438865060a768c466f3f647474382a9434f76e8 SHA512 5bca1ca70ba8e76e66d70dd01e2198d85d7ac57a5180740c453f349458ba38291bbb7a87697a25c36b79722a1ada5edd1ff3f1c9021998cdf33d248a1f554d4e DIST wmix-3.4.tar.gz 116220 BLAKE2B 01aac1603c34298d9b4aa45ec3425ec52e75965634f6c64ae554c44b95a9bea08021527519fe15729f103d2b8aa93757d6dbabbc2223b35cbb37520554fdfa2b SHA512 791e0f22c73d48fd97ce59a0a8d740a2647626fd6d5f172238ae41abac700fb40d7cd95e28463199fd20d14eae3807428949b78c095ee5bd0a347c26aaed1e75 EBUILD wmix-3.2.ebuild 674 BLAKE2B d7c082f0d5e54415ea880d0ddc08695fdecc7bb4db3916dad02069579cd7aa1101c5f2b2764e3f5a498a9e99e45d4d13758f43e3ed9e1a26bf2b72ca92616b57 SHA512 74e06a9c9b2007284e8688192c60880557208aeab1c23bd0f45ea1470b6f24a0588166ecd24ed1d3660679dca0a2ae808cf7e35ef2b37049d2ae804e1e1cf444 -EBUILD wmix-3.3-r2.ebuild 494 BLAKE2B bca47764688e70866fdbb53d8e15032b26d1d8a37234d4fc2c6c19d16a6a49c1732c964dcee29b39ddc50adbd5a5145d2deb22587a94a76e3551a9f5ff95b497 SHA512 c7858600df6faf39f7f5220c0c651d3d938c235c9fa4308b91210514ac1c36065ec72f8fdedce5c347ca17bb241631bec69acbdeb2ccf9bf278ca1fab59ca337 -EBUILD wmix-3.4.ebuild 491 BLAKE2B a7316e2fdabb6428fc5fd8670bfdcd984deea4262b13a69e78b0aa6481d1c70acd290484d60bc18be35791d1ada792600537f2207cf8b224d31d73f82589efc3 SHA512 c27eff98ad85d1528f0cc7267281b7e205646e15b005cd5c81c77113bfdc330783c26cc46a2e2d104649bb6c9500e448868e753542fa86eb368f32cb09720d72 +EBUILD wmix-3.4.ebuild 536 BLAKE2B 940782ea3a564f33dc211a4e880a74801081d1304372c713712ab7a6e609746a382f901aff04d71994e85ab867d0f40d3a8370a76dc45365f6f535c4272fd540 SHA512 b6c13bae7f0b28fe25f37a1fbe162387fe6883e38f9c74f65ef0dbbe6ecb6e1f9045ca8d73110ad8ee33f16779f513078e3fee572fdbf66da5f4a1913b5c6db9 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d diff --git a/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch b/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch new file mode 100644 index 000000000000..4e91a1a53d78 --- /dev/null +++ b/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch @@ -0,0 +1,89 @@ +diff -Naur wmix-3.4.orig/include/mixer.h wmix-3.4/include/mixer.h +--- wmix-3.4.orig/include/mixer.h 2018-04-30 14:17:50.000000000 +0200 ++++ wmix-3.4/include/mixer.h 2020-01-29 19:07:14.932404252 +0100 +@@ -55,28 +55,28 @@ + * - Muting must occur independently of the volume level. + */ + +-void (*mixer_init)(const char *mixer_device, ++extern void (*mixer_init)(const char *mixer_device, + bool verbose, + const char *exclude[]); +-bool (*mixer_is_changed)(void); +-int (*mixer_get_channel_count)(void); +-int (*mixer_get_channel)(void); +-const char *(*mixer_get_channel_name)(void); +-const char *(*mixer_get_short_name)(void); +-void (*mixer_set_channel)(int channel); +-void (*mixer_set_channel_rel)(int delta_channel); +-float (*mixer_get_volume)(void); +-void (*mixer_set_volume)(float volume); +-void (*mixer_set_volume_rel)(float delta_volume); +-float (*mixer_get_balance)(void); +-void (*mixer_set_balance)(float balance); +-void (*mixer_set_balance_rel)(float delta_balance); +-void (*mixer_toggle_mute)(void); +-void (*mixer_toggle_rec)(void); +-bool (*mixer_is_muted)(void); +-bool (*mixer_is_stereo)(void); +-bool (*mixer_is_rec)(void); +-bool (*mixer_can_rec)(void); +-bool (*is_exclude)(const char *short_name, ++extern bool (*mixer_is_changed)(void); ++extern int (*mixer_get_channel_count)(void); ++extern int (*mixer_get_channel)(void); ++extern const char *(*mixer_get_channel_name)(void); ++extern const char *(*mixer_get_short_name)(void); ++extern void (*mixer_set_channel)(int channel); ++extern void (*mixer_set_channel_rel)(int delta_channel); ++extern float (*mixer_get_volume)(void); ++extern void (*mixer_set_volume)(float volume); ++extern void (*mixer_set_volume_rel)(float delta_volume); ++extern float (*mixer_get_balance)(void); ++extern void (*mixer_set_balance)(float balance); ++extern void (*mixer_set_balance_rel)(float delta_balance); ++extern void (*mixer_toggle_mute)(void); ++extern void (*mixer_toggle_rec)(void); ++extern bool (*mixer_is_muted)(void); ++extern bool (*mixer_is_stereo)(void); ++extern bool (*mixer_is_rec)(void); ++extern bool (*mixer_can_rec)(void); ++extern bool (*is_exclude)(const char *short_name, + const char *exclude[]); +-void (*mixer_tick)(void); ++extern void (*mixer_tick)(void); +diff -Naur wmix-3.4.orig/wmix.c wmix-3.4/wmix.c +--- wmix-3.4.orig/wmix.c 2019-07-12 18:44:38.000000000 +0200 ++++ wmix-3.4/wmix.c 2020-01-29 19:06:52.685402994 +0100 +@@ -53,6 +53,31 @@ + static int mouse_drag_home_y; + static int idle_loop; + ++void (*mixer_init)(const char *mixer_device, ++ bool verbose, ++ const char *exclude[]); ++bool (*mixer_is_changed)(void); ++int (*mixer_get_channel_count)(void); ++int (*mixer_get_channel)(void); ++const char *(*mixer_get_channel_name)(void); ++const char *(*mixer_get_short_name)(void); ++void (*mixer_set_channel)(int channel); ++void (*mixer_set_channel_rel)(int delta_channel); ++float (*mixer_get_volume)(void); ++void (*mixer_set_volume)(float volume); ++void (*mixer_set_volume_rel)(float delta_volume); ++float (*mixer_get_balance)(void); ++void (*mixer_set_balance)(float balance); ++void (*mixer_set_balance_rel)(float delta_balance); ++void (*mixer_toggle_mute)(void); ++void (*mixer_toggle_rec)(void); ++bool (*mixer_is_muted)(void); ++bool (*mixer_is_stereo)(void); ++bool (*mixer_is_rec)(void); ++bool (*mixer_can_rec)(void); ++bool (*is_exclude)(const char *short_name, ++ const char *exclude[]); ++void (*mixer_tick)(void); + /* local stuff */ + static void signal_catch(int sig); + static void button_press_event(XButtonEvent *event); diff --git a/x11-plugins/wmix/wmix-3.3-r2.ebuild b/x11-plugins/wmix/wmix-3.3-r2.ebuild deleted file mode 100644 index c3f80938b61e..000000000000 --- a/x11-plugins/wmix/wmix-3.3-r2.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="Dockapp mixer for OSS or ALSA" -HOMEPAGE="https://www.dockapps.net/wmix" -SRC_URI="https://www.dockapps.net/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" - -RDEPEND="media-libs/alsa-lib - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - x11-libs/libXrandr" -DEPEND="${RDEPEND} - x11-base/xorg-proto" diff --git a/x11-plugins/wmix/wmix-3.4.ebuild b/x11-plugins/wmix/wmix-3.4.ebuild index 55507ef664ac..5f69dde7b3ac 100644 --- a/x11-plugins/wmix/wmix-3.4.ebuild +++ b/x11-plugins/wmix/wmix-3.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,3 +20,5 @@ RDEPEND="media-libs/alsa-lib x11-libs/libXrandr" DEPEND="${RDEPEND} x11-base/xorg-proto" + +PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) |