Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_158729602738830"
MIME-Version: 1.0
Date: Sun, 19 Apr 2020 11:33:47 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20200419113347.0D154FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_158729602738830
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sun Apr 19 11:33:46 UTC 2020

Modified Files:
	pkgsrc/audio/audacious: Makefile distinfo
	pkgsrc/audio/audacious-plugins: Makefile PLIST

Log Message:
audacious: Update to 4.0.2

Bug fixes since 4.0.1:
 * Fixed a regression where the Enter key did not work in the playlist
 * Fixed the seek bar changing width as the time counter increments
 * Fixed the title bar getting stuck showing "Buffering"
 * Added a workaround to ensure that the toolbar is not hidden on startup
 * Fixed the Composer field not being saved when updating ID3v2 tags


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/audio/audacious/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/audacious/distinfo
cvs rdiff -u -r1.104 -r1.105 pkgsrc/audio/audacious-plugins/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/audio/audacious-plugins/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_158729602738830
Content-Disposition: inline
Content-Length: 4268
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/audacious/Makefile
diff -u pkgsrc/audio/audacious/Makefile:1.62 pkgsrc/audio/audacious/Makefile:1.63
--- pkgsrc/audio/audacious/Makefile:1.62	Sun Apr 12 12:08:51 2020
+++ pkgsrc/audio/audacious/Makefile	Sun Apr 19 11:33:46 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2020/04/12 12:08:51 nia Exp $
+# $NetBSD: Makefile,v 1.63 2020/04/19 11:33:46 nia Exp $
 
-DISTNAME=	audacious-4.0.1
+DISTNAME=	audacious-4.0.2
 CATEGORIES=	audio
 MASTER_SITES=	https://distfiles.audacious-media-player.org/
 EXTRACT_SUFX=	.tar.bz2

Index: pkgsrc/audio/audacious/distinfo
diff -u pkgsrc/audio/audacious/distinfo:1.13 pkgsrc/audio/audacious/distinfo:1.14
--- pkgsrc/audio/audacious/distinfo:1.13	Sun Apr 12 12:08:51 2020
+++ pkgsrc/audio/audacious/distinfo	Sun Apr 19 11:33:46 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2020/04/12 12:08:51 nia Exp $
+$NetBSD: distinfo,v 1.14 2020/04/19 11:33:46 nia Exp $
 
-SHA1 (audacious-4.0.1.tar.bz2) = a031eb43c21bbd617588382a97984999ddaeea46
-RMD160 (audacious-4.0.1.tar.bz2) = 61633cdc5713de701ad526123069ab6b24ff735f
-SHA512 (audacious-4.0.1.tar.bz2) = bd1387af281e7f533d4a21bf9fdb8ae49d5a406c051bcfa3a509b9d3cf8fdf6faff21dee841fad9ce1c9bf1a24ce1c08d9dc27a7a28b78ade3f0075fa89aad3d
-Size (audacious-4.0.1.tar.bz2) = 572314 bytes
+SHA1 (audacious-4.0.2.tar.bz2) = f68c8578b9d21e29593fdb79c86f1ce2577b80c1
+RMD160 (audacious-4.0.2.tar.bz2) = 7e74550ba2bd4642d794397fa46511e683e1e4b6
+SHA512 (audacious-4.0.2.tar.bz2) = 3f541000c874f2d026f2a4c23f1f98486aae9450c6dc8d7597f742b21d701883b31bbc5620bf23408ce0da397fdf414dffe37a778eb70df5a553a854f2435b99
+Size (audacious-4.0.2.tar.bz2) = 576407 bytes
 SHA1 (patch-configure) = 2f310b55fdfc4147af6132dd821a9f81a1be6864
 SHA1 (patch-src_libaudcore_audio.h.in) = 621afba8a610ab0f30d064d5d9ed581e781de7d2

Index: pkgsrc/audio/audacious-plugins/Makefile
diff -u pkgsrc/audio/audacious-plugins/Makefile:1.104 pkgsrc/audio/audacious-plugins/Makefile:1.105
--- pkgsrc/audio/audacious-plugins/Makefile:1.104	Sun Apr 12 12:08:51 2020
+++ pkgsrc/audio/audacious-plugins/Makefile	Sun Apr 19 11:33:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2020/04/12 12:08:51 nia Exp $
+# $NetBSD: Makefile,v 1.105 2020/04/19 11:33:46 nia Exp $
 
 DISTNAME=	audacious-plugins-4.0.1
 CATEGORIES=	audio
@@ -21,16 +21,32 @@ CONFIGURE_ARGS+=	--disable-cue
 # prefer libsamplerate
 CONFIGURE_ARGS+=	--disable-soxr
 CONFIGURE_ARGS+=	--disable-notify
-# use SDL instead, it has working volume control
-CONFIGURE_ARGS+=	--disable-oss4
 CONFIGURE_ARGS+=	--disable-qtaudio
 CONFIGURE_ARGS+=	--disable-sndio
 
+.include "../../mk/oss.buildlink3.mk"
+PLIST_VARS+=		oss4
+# Currently, don't use this on NetBSD - the volume manipulation is broken.
+# Use SDL instead, it has working volume control
+.if ${OSS_TYPE} != "none" && \
+	(${OPSYS} == "FreeBSD" || \
+	${OPSYS} == "SunOS")
+PLIST.oss4=		yes
+LDFLAGS+=		${LIBOSSAUDIO}
+SUBST_CLASSES+=		oss
+SUBST_STAGE.oss=	pre-configure
+SUBST_MESSAGE.oss=	Correcting the path to the OSS device.
+SUBST_FILES.oss+=	src/oss4/oss.h
+SUBST_SED.oss+=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
+.else
+CONFIGURE_ARGS+=	--disable-oss4
+.endif
+
 PLIST_VARS+=	dbus
 
 .include "options.mk"
 .include "../../audio/audacious/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.audacious:Mdbus)
+.if ${PKG_BUILD_OPTIONS.audacious:Mdbus}
 TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 PLIST.dbus=		yes
 .else

Index: pkgsrc/audio/audacious-plugins/PLIST
diff -u pkgsrc/audio/audacious-plugins/PLIST:1.19 pkgsrc/audio/audacious-plugins/PLIST:1.20
--- pkgsrc/audio/audacious-plugins/PLIST:1.19	Sun Apr 12 12:08:51 2020
+++ pkgsrc/audio/audacious-plugins/PLIST	Sun Apr 19 11:33:46 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2020/04/12 12:08:51 nia Exp $
+@comment $NetBSD: PLIST,v 1.20 2020/04/19 11:33:46 nia Exp $
 lib/audacious/Container/asx.so
 lib/audacious/Container/asx3.so
 lib/audacious/Container/audpl.so
@@ -49,6 +49,7 @@ lib/audacious/Input/xsf.so
 ${PLIST.alsa}lib/audacious/Output/alsa.so
 lib/audacious/Output/filewriter.so
 ${PLIST.jack}lib/audacious/Output/jack-ng.so
+${PLIST.oss4}lib/audacious/Output/oss4.so
 ${PLIST.pulse}lib/audacious/Output/pulse_audio.so
 lib/audacious/Output/sdlout.so
 lib/audacious/Transport/gio.so


--_----------=_158729602738830--