audio/gvolwheel: fix build on recent current

Obtained from:	https://github.com/Junker/gvolwheel/commit/d7dc17bd4991f9fecfa3a5949888446018377fb0

6 files changed, 126 insertions, 4 deletions

diff --git a/audio/gvolwheel/files/patch-src_conf.h b/audio/gvolwheel/files/patch-src_conf.h
new file mode 100644
index 000000000000..2e2b1dc2cfa8
--- /dev/null
+++ b/audio/gvolwheel/files/patch-src_conf.h
@@ -0,0 +1,20 @@
+--- src/conf.h.orig	2011-06-04 18:20:10 UTC
++++ src/conf.h
+@@ -4,11 +4,11 @@
+ #define OPT_CHANNEL_MASTER	0
+ #define OPT_CHANNEL_PCM		1 
+ 
+-gchar opt_mixer[100];
+-guint opt_channel;
+-guint opt_incr;
+-gboolean opt_gnome_icons;
+-gboolean opt_show_tooltip;
++extern gchar opt_mixer[100];
++extern guint opt_channel;
++extern guint opt_incr;
++extern gboolean opt_gnome_icons;
++extern gboolean opt_show_tooltip;
+ 
+ void load_config();
+ void save_config();
+\ No newline at end of file
diff --git a/audio/gvolwheel/files/patch-src_main.c b/audio/gvolwheel/files/patch-src_main.c
new file mode 100644
index 000000000000..756746bd12fe
--- /dev/null
+++ b/audio/gvolwheel/files/patch-src_main.c
@@ -0,0 +1,15 @@
+--- src/main.c.orig	2012-04-07 21:54:38 UTC
++++ src/main.c
+@@ -71,7 +71,11 @@ static GOptionEntry entries[] =
+ 	{NULL}
+ };
+ 
+-
++gchar opt_mixer[100];
++guint opt_channel;
++guint opt_incr;
++gboolean opt_gnome_icons;
++gboolean opt_show_tooltip;
+ 
+ int main (int argc, char *argv[])
+ {
diff --git a/audio/gvolwheel/files/patch-src_oss.c b/audio/gvolwheel/files/patch-src_oss.c
index a2af139c85a6..16a7760657e9 100644
--- a/audio/gvolwheel/files/patch-src_oss.c
+++ b/audio/gvolwheel/files/patch-src_oss.c
@@ -1,6 +1,6 @@
 --- src/oss.c.orig	2012-04-07 21:18:50 UTC
 +++ src/oss.c
-@@ -17,7 +17,8 @@
+@@ -17,13 +17,15 @@
   * along with this program. If not, see <http://www.gnu.org/licenses/>.
   */
  
@@ -10,10 +10,36 @@
  #include <fcntl.h>
  #include <sys/ioctl.h>
  
-@@ -51,4 +52,4 @@ void vol_backend_set(int mixer, int valu
- 		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &vol);
+ #include "oss.h"
+ 
+ static char *default_device = "/dev/mixer"; 
++struct stereo_volume oss_vol;
+ 
+ int mixer_fd;
+ 
+@@ -38,17 +40,17 @@ int vol_backend_init (char *device)
+ int vol_backend_get(int mixer)
+ {
+ 	if (mixer == 0)
+-		ioctl(mixer_fd, MIXER_READ(SOUND_MIXER_VOLUME), &vol);
++		ioctl(mixer_fd, MIXER_READ(SOUND_MIXER_VOLUME), &oss_vol);
+ 	else if (mixer == 1)	
+-		ioctl(mixer_fd, MIXER_READ(SOUND_MIXER_PCM), &vol);
+-	return(vol.left);
++		ioctl(mixer_fd, MIXER_READ(SOUND_MIXER_PCM), &oss_vol);
++	return(oss_vol.left);
+ }
+ 
+ void vol_backend_set(int mixer, int value)
+ {
+-	vol.left=vol.right = value;
++	oss_vol.left=oss_vol.right = value;
+ 	if (mixer == 0)	
+-		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &vol);
++		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &oss_vol);
  	else if (mixer == 1)	
- 		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_PCM), &vol);
+-		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_PCM), &vol);
 -}
 \ No newline at end of file
++		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_PCM), &oss_vol);
 +}
diff --git a/audio/gvolwheel/files/patch-src_oss.h b/audio/gvolwheel/files/patch-src_oss.h
new file mode 100644
index 000000000000..4285f847cbdb
--- /dev/null
+++ b/audio/gvolwheel/files/patch-src_oss.h
@@ -0,0 +1,14 @@
+--- src/oss.h.orig	2020-08-29 07:49:49 UTC
++++ src/oss.h
+@@ -23,8 +23,8 @@ struct stereo_volume
+ 	unsigned char right;
+ };
+ 
+-struct stereo_volume vol;
++extern struct stereo_volume oss_vol;
+ 
+ int vol_backend_init(char *device);
+ void vol_backend_set(int mixer, int value);
+-int vol_backend_get(int mixer);
+\ No newline at end of file
++int vol_backend_get(int mixer);
diff --git a/audio/gvolwheel/files/patch-src_trayicon.c b/audio/gvolwheel/files/patch-src_trayicon.c
new file mode 100644
index 000000000000..fb1b7f7d1885
--- /dev/null
+++ b/audio/gvolwheel/files/patch-src_trayicon.c
@@ -0,0 +1,27 @@
+--- src/trayicon.c.orig	2012-04-07 21:56:11 UTC
++++ src/trayicon.c
+@@ -31,6 +31,8 @@ const char *tray_image_stocks[] = {
+ 	 "audio-volume-high"
+  	 };
+ 
++GtkStatusIcon *tray_icon; 
++GdkPixbuf *tray_pixbufs[4]; 
+  
+ GtkStatusIcon *create_tray_icon() 
+ {
+@@ -49,6 +51,8 @@ GtkStatusIcon *create_tray_icon() 
+ 	
+ 	gtk_status_icon_set_visible(tray_icon, TRUE);
+ 
++GtkStatusIcon *tray_icon;
++GdkPixbuf *tray_pixbufs[4];
+ 
+ 	return tray_icon;
+ }
+@@ -157,4 +161,4 @@ void update_tray_image()
+ 
+ 	g_sprintf(volchar, "%i\%%", vol);
+ 	if (opt_show_tooltip) gtk_status_icon_set_tooltip_text(tray_icon, volchar);
+-}
+\ No newline at end of file
++}
diff --git a/audio/gvolwheel/files/patch-src_trayicon.h b/audio/gvolwheel/files/patch-src_trayicon.h
new file mode 100644
index 000000000000..2a824cf25589
--- /dev/null
+++ b/audio/gvolwheel/files/patch-src_trayicon.h
@@ -0,0 +1,20 @@
+--- src/trayicon.h.orig	2011-06-04 12:27:58 UTC
++++ src/trayicon.h
+@@ -2,8 +2,8 @@
+ #include <glib/gstdio.h>
+ #include <glib/gi18n-lib.h>
+ 
+-GtkStatusIcon *tray_icon; 
+-GdkPixbuf *tray_pixbufs[4]; 
++extern GtkStatusIcon *tray_icon; 
++extern GdkPixbuf *tray_pixbufs[4]; 
+ 
+ GtkStatusIcon* create_tray_icon();
+ gboolean tray_icon_recreate(gpointer data);
+@@ -12,4 +12,4 @@ void on_tray_icon_scroll (GtkWidget *widget, GdkEventS
+ void on_tray_icon_click(GtkWidget *widget, GdkEventButton *event, gpointer user_data);
+ void on_tray_icon_press(GtkWidget *widget, GdkEventButton *event, gpointer user_data);
+ void update_tray_image();
+-void load_pixbufs();
+\ No newline at end of file
++void load_pixbufs();