Index: head/audio/gvolwheel/Makefile =================================================================== --- head/audio/gvolwheel/Makefile (revision 553419) +++ head/audio/gvolwheel/Makefile (revision 553420) @@ -1,40 +1,35 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= gvolwheel -PORTVERSION= 1.0 -PORTREVISION= 2 +PORTVERSION= 1.0.2 CATEGORIES= audio -MASTER_SITES= SF/${PORTNAME} MAINTAINER= ports@FreeBSD.org -COMMENT= Volume mixer +COMMENT= Control volume by scrolling over tray icon LICENSE= GPLv3 -CONFIGURE_ARGS+=--enable-oss +USES= autoreconf libtool gmake gnome pkgconfig GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -USES= gmake gnome iconv pkgconfig -USE_GNOME= gtk30 intltool +CONFIGURE_ARGS= --enable-oss +USE_GNOME= cairo gdkpixbuf2 gtk30 intltool +USE_GITHUB= yes +GH_ACCOUNT= Junker -PORTDOCS= AUTHORS ChangeLog README +PORTDOCS= AUTHORS ChangeLog README.md OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext -SUB_FILES= pkg-message - DESKTOP_ENTRIES="GVolWheel" "${COMMENT}" "${PORTNAME}" \ "${PORTNAME}" "GTK;AudioVideo;Audio;Mixer;" true post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - ${LN} -sf gvolwheel/audio-volume-high.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png + ${LN} -sf gvolwheel/audio-volume-high.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .include Index: head/audio/gvolwheel/distinfo =================================================================== --- head/audio/gvolwheel/distinfo (revision 553419) +++ head/audio/gvolwheel/distinfo (revision 553420) @@ -1,2 +1,3 @@ -SHA256 (gvolwheel-1.0.tar.gz) = 43f5fa526865055d7196a58ad1fbb4019ceb2353a82bff5827c19033d616c676 -SIZE (gvolwheel-1.0.tar.gz) = 347187 +TIMESTAMP = 1596274379 +SHA256 (Junker-gvolwheel-1.0.2_GH0.tar.gz) = bea06a301ee4e7e7a6a3035e9d495e166aeef00d23644943d2df519362a520d9 +SIZE (Junker-gvolwheel-1.0.2_GH0.tar.gz) = 16277 Index: head/audio/gvolwheel/files/patch-src_trayicon.c =================================================================== --- head/audio/gvolwheel/files/patch-src_trayicon.c (revision 553419) +++ head/audio/gvolwheel/files/patch-src_trayicon.c (nonexistent) @@ -1,27 +0,0 @@ ---- 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 -+} Property changes on: head/audio/gvolwheel/files/patch-src_trayicon.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/gvolwheel/files/patch-src_trayicon.h =================================================================== --- head/audio/gvolwheel/files/patch-src_trayicon.h (revision 553419) +++ head/audio/gvolwheel/files/patch-src_trayicon.h (nonexistent) @@ -1,20 +0,0 @@ ---- src/trayicon.h.orig 2011-06-04 12:27:58 UTC -+++ src/trayicon.h -@@ -2,8 +2,8 @@ - #include - #include - --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(); Property changes on: head/audio/gvolwheel/files/patch-src_trayicon.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/gvolwheel/files/pkg-message.in =================================================================== --- head/audio/gvolwheel/files/pkg-message.in (revision 553419) +++ head/audio/gvolwheel/files/pkg-message.in (nonexistent) @@ -1,19 +0,0 @@ -[ -{ type: install - message: <. */ -#include +#include +#include #include #include #include "oss.h" ++ ++struct stereo_volume vol; - static char *default_device = "/dev/mixer"; -+struct stereo_volume oss_vol; + static char *default_device = "/dev/mixer"; - 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); --} -\ No newline at end of file -+ ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_PCM), &oss_vol); -+} Index: head/audio/gvolwheel/files/patch-src_oss.h =================================================================== --- head/audio/gvolwheel/files/patch-src_oss.h (revision 553419) +++ head/audio/gvolwheel/files/patch-src_oss.h (revision 553420) @@ -1,14 +1,11 @@ ---- src/oss.h.orig 2020-08-29 07:49:49 UTC +--- src/oss.h.orig 2020-08-01 09:32:59 UTC +++ src/oss.h -@@ -23,8 +23,8 @@ struct stereo_volume +@@ -23,7 +23,7 @@ struct stereo_volume unsigned char right; }; -struct stereo_volume vol; -+extern struct stereo_volume oss_vol; ++extern struct stereo_volume 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); Index: head/audio/gvolwheel/pkg-descr =================================================================== --- head/audio/gvolwheel/pkg-descr (revision 553419) +++ head/audio/gvolwheel/pkg-descr (revision 553420) @@ -1,6 +1,5 @@ -GVolWheel is a Lightweight application which lets you control the audio -volume. GVolWheel is application which lets you control the volume easily -through a tray icon you can scroll on. Easily integrate with minimal -desktops (Openbox,IceWM,XFCE etc). +GVolWheel is application which lets one control the volume easily through +a scrollable tray icon. It integrates nicely with minimalistic desktop +environments such as Openbox, IceWM, XFCE, etc. -WWW: https://sourceforge.net/projects/gvolwheel/ +WWW: https://github.com/Junker/gvolwheel Index: head/audio/gvolwheel/pkg-message =================================================================== --- head/audio/gvolwheel/pkg-message (nonexistent) +++ head/audio/gvolwheel/pkg-message (revision 553420) @@ -0,0 +1,19 @@ +[ +{ type: install + message: <