svn commit: r546881 - head/audio/gvolwheel/files
Tobias C. Berner
tcberner at FreeBSD.org
Sat Aug 29 07:54:36 UTC 2020
Author: tcberner
Date: Sat Aug 29 07:54:34 2020
New Revision: 546881
URL: https://svnweb.freebsd.org/changeset/ports/546881
Log:
audio/gvolwheel: fix build on recent current
Obtained from: https://github.com/Junker/gvolwheel/commit/d7dc17bd4991f9fecfa3a5949888446018377fb0
Added:
head/audio/gvolwheel/files/patch-src_conf.h (contents, props changed)
head/audio/gvolwheel/files/patch-src_main.c (contents, props changed)
head/audio/gvolwheel/files/patch-src_oss.h (contents, props changed)
head/audio/gvolwheel/files/patch-src_trayicon.c (contents, props changed)
head/audio/gvolwheel/files/patch-src_trayicon.h (contents, props changed)
Modified:
head/audio/gvolwheel/files/patch-src_oss.c
Added: head/audio/gvolwheel/files/patch-src_conf.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/gvolwheel/files/patch-src_conf.h Sat Aug 29 07:54:34 2020 (r546881)
@@ -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
Added: head/audio/gvolwheel/files/patch-src_main.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/gvolwheel/files/patch-src_main.c Sat Aug 29 07:54:34 2020 (r546881)
@@ -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[])
+ {
Modified: head/audio/gvolwheel/files/patch-src_oss.c
==============================================================================
--- head/audio/gvolwheel/files/patch-src_oss.c Sat Aug 29 07:50:18 2020 (r546880)
+++ head/audio/gvolwheel/files/patch-src_oss.c Sat Aug 29 07:54:34 2020 (r546881)
@@ -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_WRITE(SOUND_MIXER_PCM), &vol);
+- 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);
-}
\ No newline at end of file
++ ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_PCM), &oss_vol);
+}
Added: head/audio/gvolwheel/files/patch-src_oss.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/gvolwheel/files/patch-src_oss.h Sat Aug 29 07:54:34 2020 (r546881)
@@ -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);
Added: head/audio/gvolwheel/files/patch-src_trayicon.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/gvolwheel/files/patch-src_trayicon.c Sat Aug 29 07:54:34 2020 (r546881)
@@ -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
++}
Added: head/audio/gvolwheel/files/patch-src_trayicon.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/gvolwheel/files/patch-src_trayicon.h Sat Aug 29 07:54:34 2020 (r546881)
@@ -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();
More information about the svn-ports-head
mailing list