[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmix/files/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmix/files/

[David Seifert]

commit:     91fb56fee7bd7fe062e6d6bdd4519c074bca8a51
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Feb 18 15:43:44 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 22:07:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91fb56fe

x11-plugins/wmix: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/4014

 x11-plugins/wmix/files/wmix-fix-free.patch | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/x11-plugins/wmix/files/wmix-fix-free.patch b/x11-plugins/wmix/files/wmix-fix-free.patch
deleted file mode 100644
index 340f91771f..0000000000
--- a/x11-plugins/wmix/files/wmix-fix-free.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wmix.c.orig	2004-05-12 21:30:53.000000000 -0300
-+++ wmix.c	2009-07-08 00:20:28.000000000 -0300
-@@ -134,7 +134,7 @@
-     }
- 
-     /* handle writing PID file, silently ignore if we can't do it */
--    pid = calloc(1, strlen(home) + 10);
-+    pid = calloc(1, strlen(home) + 11);
-     sprintf(pid, "%s/.wmix.pid", home);
-     fp = fopen(pid, "w");
-     if (fp) {

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmix/files/

[Bernard Cafarelli]

commit:     83bb969b698de0c6700ce62ea894d14b04ae4221
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Dec  6 17:47:37 2017 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Dec  8 18:21:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83bb969b

x11-plugins/wmix: remove unused patch

Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 x11-plugins/wmix/files/fix-wmix-3.1-version-number.patch | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/x11-plugins/wmix/files/fix-wmix-3.1-version-number.patch b/x11-plugins/wmix/files/fix-wmix-3.1-version-number.patch
deleted file mode 100644
index 65b7ac9688e..00000000000
--- a/x11-plugins/wmix/files/fix-wmix-3.1-version-number.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wmix.c	2004-07-19 10:37:58.999866344 +0200
-+++ wmix.c	2004-07-19 10:38:11.541959656 +0200
-@@ -38,7 +38,7 @@
- #include "include/misc.h"
- #include "include/ui_x.h"
- 
--#define VERSION "3.0"
-+#define VERSION "3.1"
- 
- static Display *display;
- static char *display_name = NULL;

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmix/files/

[Bernard Cafarelli]

commit:     38312c2dd09edc259b6d03dd186c39945615e6ad
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 18 14:42:30 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 10:38:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38312c2d

x11-plugins/wmix: remove unused patch(es)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 x11-plugins/wmix/files/wmix-3.4-gcc-10.patch | 89 ----------------------------
 x11-plugins/wmix/files/wmix.1                | 68 ---------------------
 2 files changed, 157 deletions(-)

diff --git a/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch b/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch
deleted file mode 100644
index 4e91a1a53d7..00000000000
--- a/x11-plugins/wmix/files/wmix-3.4-gcc-10.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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/files/wmix.1 b/x11-plugins/wmix/files/wmix.1
deleted file mode 100644
index afd65224bbe..00000000000
--- a/x11-plugins/wmix/files/wmix.1
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\"
-.\" This documentation may be distributed under the terms of
-.\" the GNU General Public Licence version 2.
-.\"
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH wmix 1 "Jul 19, 2004" "Michele Noberasco"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-wmix \- Dockapp mixer for OSS or ALSA
-
-
-.SH SYNOPSIS
-.B wmix
-.RI "{ " options " }"
-
-
-.SH DESCRIPTION
-.B wmix
-Dockapp mixer for OSS or ALSA. Allows toggling record source,
-muting individual channels, adjusting volume and balance, all in a
-compact dockapp size, with TV\-like on\-screen\-display for volume levels.
-.LP 
-Supports mousewheel to adjust current channelvolume
-and can be controlled remotely with SIGUSR1 / SIGUSR2 to adjust the volume.
-Keeps a simple configuration file for user\-defined settings.
-
-
-.SH OPTIONS
-.TP 
-.BI "\-d " dsp
-Connect to remote X display.
-.TP 
-.BI "\-f " file
-Use alternate config file (default is \fI~/.wmixrc\fP)
-.TP 
-.BI "\-m " dev
-Use this mixer device (default  is \fI/dev/mixer\fP)
-.TP 
-.BI "\-h"
-Display list of command line options.
-.TP 
-.BI "\-v"
-Use verbose output messages.
-.TP 
-.BI "\-e " name
-Exclude a channel, can be used many times.
-
-
-.SH AUTHORS
-wmix was written by <timecop@japan.co.jp> and <skunk@mit.edu>
-.LP 
-This man page was written by Fredrik Steen <stone@debian.org> for the Debian
-distribution. Updated and fixed by Michele Noberasco <s4t4n@gentoo.org>
-for the Gentoo distribution.