Date: Tue, 27 Oct 2020 06:27:57 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553420 - in head/audio/gvolwheel: . files Message-ID: <202010270627.09R6Rvk1096934@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Oct 27 06:27:56 2020 New Revision: 553420 URL: https://svnweb.freebsd.org/changeset/ports/553420 Log: - Update to version 1.0.2 (project had moved to GitHub) - Give a better COMMENT (gets propagated to the .desktop file) - GC no longer needed -fno-common patches and fix the logic for the ``struct stereo_volume vol'' definition and symbol - Install more complete set of documentation files, clean up Makefile, remove redundant wording from the port description Added: head/audio/gvolwheel/files/patch-Makefile.am - copied, changed from r553419, head/audio/gvolwheel/files/patch-Makefile.in head/audio/gvolwheel/pkg-message - copied unchanged from r553419, head/audio/gvolwheel/files/pkg-message.in Deleted: head/audio/gvolwheel/files/patch-Makefile.in head/audio/gvolwheel/files/patch-src_conf.h head/audio/gvolwheel/files/patch-src_main.c head/audio/gvolwheel/files/patch-src_trayicon.c head/audio/gvolwheel/files/patch-src_trayicon.h head/audio/gvolwheel/files/pkg-message.in Modified: head/audio/gvolwheel/Makefile head/audio/gvolwheel/distinfo head/audio/gvolwheel/files/patch-src_oss.c head/audio/gvolwheel/files/patch-src_oss.h head/audio/gvolwheel/pkg-descr Modified: head/audio/gvolwheel/Makefile ============================================================================== --- head/audio/gvolwheel/Makefile Tue Oct 27 06:25:38 2020 (r553419) +++ head/audio/gvolwheel/Makefile Tue Oct 27 06:27:56 2020 (r553420) @@ -2,24 +2,22 @@ # $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 @@ -27,14 +25,11 @@ 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 <bsd.port.mk> Modified: head/audio/gvolwheel/distinfo ============================================================================== --- head/audio/gvolwheel/distinfo Tue Oct 27 06:25:38 2020 (r553419) +++ head/audio/gvolwheel/distinfo Tue Oct 27 06:27:56 2020 (r553420) @@ -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 Copied and modified: head/audio/gvolwheel/files/patch-Makefile.am (from r553419, head/audio/gvolwheel/files/patch-Makefile.in) ============================================================================== --- head/audio/gvolwheel/files/patch-Makefile.in Tue Oct 27 06:25:38 2020 (r553419, copy source) +++ head/audio/gvolwheel/files/patch-Makefile.am Tue Oct 27 06:27:56 2020 (r553420) @@ -1,18 +1,20 @@ ---- Makefile.in.orig 2012-04-07 22:37:17 UTC -+++ Makefile.in -@@ -315,14 +315,8 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - SUBDIRS = src po +--- Makefile.am.orig 2020-08-01 09:32:59 UTC ++++ Makefile.am +@@ -3,14 +3,11 @@ + + SUBDIRS = src po + -gvolwheeldocdir = ${prefix}/doc/gvolwheel +gvolwheeldocdir = ${prefix}/share/doc/gvolwheel gvolwheeldoc_DATA = \ - README\ - COPYING\ -- AUTHORS\ ++ README.md\ + AUTHORS\ - ChangeLog\ - INSTALL\ -- NEWS +- NEWS ++ ChangeLog EXTRA_DIST = $(gvolwheeldoc_DATA) \ $(intltool_DATA)\ Modified: head/audio/gvolwheel/files/patch-src_oss.c ============================================================================== --- head/audio/gvolwheel/files/patch-src_oss.c Tue Oct 27 06:25:38 2020 (r553419) +++ head/audio/gvolwheel/files/patch-src_oss.c Tue Oct 27 06:27:56 2020 (r553420) @@ -1,6 +1,6 @@ ---- src/oss.c.orig 2012-04-07 21:18:50 UTC +--- src/oss.c.orig 2020-08-01 09:32:59 UTC +++ src/oss.c -@@ -17,13 +17,15 @@ +@@ -17,11 +17,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -11,35 +11,8 @@ #include <sys/ioctl.h> #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); -+} Modified: head/audio/gvolwheel/files/patch-src_oss.h ============================================================================== --- head/audio/gvolwheel/files/patch-src_oss.h Tue Oct 27 06:25:38 2020 (r553419) +++ head/audio/gvolwheel/files/patch-src_oss.h Tue Oct 27 06:27:56 2020 (r553420) @@ -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); Modified: head/audio/gvolwheel/pkg-descr ============================================================================== --- head/audio/gvolwheel/pkg-descr Tue Oct 27 06:25:38 2020 (r553419) +++ head/audio/gvolwheel/pkg-descr Tue Oct 27 06:27:56 2020 (r553420) @@ -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 Copied: head/audio/gvolwheel/pkg-message (from r553419, head/audio/gvolwheel/files/pkg-message.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gvolwheel/pkg-message Tue Oct 27 06:27:56 2020 (r553420, copy of r553419, head/audio/gvolwheel/files/pkg-message.in) @@ -0,0 +1,19 @@ +[ +{ type: install + message: <<EOM +GVolWheel has been installed. + +You could adjust which mixer you wish to use with + +GVolWheel / Preferences / Default mixer + +Default is used ALSA with + + gnome-alsamixer + +You could use aumix with similar settings + + aumix -d /dev/mixer2 -I +EOM +} +]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010270627.09R6Rvk1096934>