Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1574380746214570"
MIME-Version: 1.0
Date: Thu, 21 Nov 2019 23:59:06 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio/xmp
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20191121235906.D1547FA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	nia
Date:		Thu Nov 21 23:59:06 UTC 2019

Modified Files:
	pkgsrc/audio/xmp: DESCR Makefile distinfo options.mk
	pkgsrc/audio/xmp/patches: patch-src_drivers_netbsd.c

Log Message:
xmp: Update to 4.1.0

Switch to native audio drivers for NetBSD and Solaris, which it has,
somehow.

4.1.0 (20160719):
	- Requires libxmp 4.4
	- Add option to force tracker emulation
	- Add option to use simulated Amiga mixers
	- Add option to set the maximum number of virtual channels
	- Add command to switch between standard and classic mixers
	- Add command to display current mixer type
	- Fix default amplification factor
	- Fix module-specific configuration file options
	- Fix screen corruption when module uses more than 255 virtual
	  channels (reported by Lionel Debroux)
	- Remove option --offset-bug-emulation

4.0.11 (20160306):
	- Mark surround channels in channel list
	- Address errors reported by Coverity Scan


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/xmp/DESCR
cvs rdiff -u -r1.53 -r1.54 pkgsrc/audio/xmp/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/audio/xmp/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/xmp/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/xmp/patches/patch-src_drivers_netbsd.c

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


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

Modified files:

Index: pkgsrc/audio/xmp/DESCR
diff -u pkgsrc/audio/xmp/DESCR:1.1 pkgsrc/audio/xmp/DESCR:1.2
--- pkgsrc/audio/xmp/DESCR:1.1	Thu Nov  1 00:18:37 2001
+++ pkgsrc/audio/xmp/DESCR	Thu Nov 21 23:59:06 2019
@@ -1,12 +1,4 @@
-This is the Extended Module Player, an open source module player for UNIX
-distributed under the terms of the GNU GPL. xmp currently runs on several
-platforms, including ALSA, OSS (for Linux on i386 and Alpha and FreeBSD),
-BSD, SunOS, Solaris, S/Linux and HP-UX.  On PC class machines with GUS or
-AWE cards xmp takes advantage of the  OSS sequencer to play modules  with
-virtually no system load. Using software mixing, xmp plays at rates up to
-48 kHz in mono or stereo, 8 or 16 bits, signed or unsigned, little or big
-endian samples with 32 bit linear interpolation.
-
-The current version of xmp supports many Amiga and PC module formats
-(including packed, Powerpacked and SQSHed modules) -- currently 47 known
-formats.
+The Extended Module Player, or xmp, is a portable command-line module
+player. Xmp plays many mainstream and obscure module formats including
+Protracker (MOD), Scream Tracker 3 (S3M), Fast Tracker II (XM), and
+Impulse Tracker (IT).

Index: pkgsrc/audio/xmp/Makefile
diff -u pkgsrc/audio/xmp/Makefile:1.53 pkgsrc/audio/xmp/Makefile:1.54
--- pkgsrc/audio/xmp/Makefile:1.53	Wed Sep 18 14:17:06 2019
+++ pkgsrc/audio/xmp/Makefile	Thu Nov 21 23:59:06 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2019/09/18 14:17:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.54 2019/11/21 23:59:06 nia Exp $
 
-DISTNAME=	xmp-4.0.10
-PKGREVISION=	7
+DISTNAME=	xmp-4.1.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmp/}
 
@@ -20,7 +19,20 @@ CONF_FILES+=	${EGDIR}/xmp.conf ${PKG_SYS
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${EGDIR}
 INSTALL_MAKE_FLAGS+=	INSTALL=${INSTALL:Q}
 
-.include "options.mk"
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/oss.buildlink3.mk"
+
+# NetBSD and Solaris have their own drivers.
+.if ${OPSYS} != "NetBSD" && \
+    ${OPSYS} != "Solaris" && \
+    ${OSS_TYPE} != "none"
+LIBS+=		${LIBOSSAUDIO}
+CPPFLAGS+=	-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
+CPPFLAGS+=	-DDEVOSSSOUND="\"${DEVOSSSOUND}\""
+.else
+CONFIGURE_ARGS+=	--disable-oss
+.endif
 
+.include "options.mk"
 .include "../../audio/libxmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/xmp/distinfo
diff -u pkgsrc/audio/xmp/distinfo:1.18 pkgsrc/audio/xmp/distinfo:1.19
--- pkgsrc/audio/xmp/distinfo:1.18	Tue Nov  3 01:12:56 2015
+++ pkgsrc/audio/xmp/distinfo	Thu Nov 21 23:59:06 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 01:12:56 agc Exp $
+$NetBSD: distinfo,v 1.19 2019/11/21 23:59:06 nia Exp $
 
-SHA1 (xmp-4.0.10.tar.gz) = e6a39a5158a9e36d437b233d68a8dc7756a971e1
-RMD160 (xmp-4.0.10.tar.gz) = 1dfd7f50c0bf8fa7cfd72c127d9d66dc151cced2
-SHA512 (xmp-4.0.10.tar.gz) = 14e85cb0a35edb7f1584e1b8485b502b8ac8b1ce8d6360f9d3d5cbb488379e25a6a19587c9bacd598cac13ca7ab8e07380cfbb7fb41fe54897fa3ef598de0da6
-Size (xmp-4.0.10.tar.gz) = 203088 bytes
+SHA1 (xmp-4.1.0.tar.gz) = 4550bd5daa505f577a9cd9470da202fcc4b57ebc
+RMD160 (xmp-4.1.0.tar.gz) = 61d875610bf2e90d1d91fb01e2a960b714036413
+SHA512 (xmp-4.1.0.tar.gz) = 9d9791b729f902afc8c728609e82c06fc6576d915b83a01957b1ca585d726f00196f9059df1d86c3e75db7b275416b3d550aea32b140daafaf20b0170ae2dc32
+Size (xmp-4.1.0.tar.gz) = 210435 bytes
 SHA1 (patch-etc_Makefile) = 5816b82a6253a627b39ff2ca262bfb5675ca97e3
-SHA1 (patch-src_drivers_netbsd.c) = 6bbb1a40b7bb95ecdad6fe5f76be2a51a8940906
+SHA1 (patch-src_drivers_netbsd.c) = ff8c97165380ea2323957135554fda53253b00d5
 SHA1 (patch-src_options.c) = f372d1336e795b77c7ce38230bf69dd363da02c2
 SHA1 (patch-src_sound_oss.c) = 251a09075ade185e33938be67776e7740473a6a5

Index: pkgsrc/audio/xmp/options.mk
diff -u pkgsrc/audio/xmp/options.mk:1.5 pkgsrc/audio/xmp/options.mk:1.6
--- pkgsrc/audio/xmp/options.mk:1.5	Wed Sep 27 13:47:30 2017
+++ pkgsrc/audio/xmp/options.mk	Thu Nov 21 23:59:06 2019
@@ -1,20 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2017/09/27 13:47:30 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2019/11/21 23:59:06 nia Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.xmp
-# XXX configure.ac is broken, you cannot disable oss and alsa at the moment.
-PKG_SUPPORTED_OPTIONS=	alsa esound nas oss pulseaudio
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS=	alsa
-.elif ${OPSYS} == "Interix"
-# No native support for this OS, so use esound for audio output
-PKG_SUGGESTED_OPTIONS=	esound
-# On Darwin, xmp uses CoreAudio
-.elif ${OPSYS} != "Darwin"
-PKG_SUGGESTED_OPTIONS+=	pulseaudio
-.endif
+PKG_OPTIONS_VAR=		PKG_OPTIONS.xmp
+PKG_SUPPORTED_OPTIONS=		alsa pulseaudio
+PKG_SUGGESTED_OPTIONS.Linux=	alsa
 
 .include "../../mk/bsd.options.mk"
 
@@ -22,33 +10,11 @@ PKG_SUGGESTED_OPTIONS+=	pulseaudio
 .if !empty(PKG_OPTIONS:Malsa)
 .  include "../../audio/alsa-lib/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=--disable-alsa
-.endif
-
-# Esd support
-.if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+=--enable-esd
-.  include "../../audio/esound/buildlink3.mk"
-.endif
-
-# Nas support
-.if !empty(PKG_OPTIONS:Mnas)
-CONFIGURE_ARGS+=--enable-nas
-.  include "../../audio/nas/buildlink3.mk"
-.endif
-
-# Oss support
-.if !empty(PKG_OPTIONS:Moss)
-.  include "../../mk/oss.buildlink3.mk"
-LIBS+=		${LIBOSSAUDIO}
-CPPFLAGS+=	-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-CPPFLAGS+=	-DDEVOSSSOUND="\"${DEVOSSSOUND}\""
-.else
-CONFIGURE_ARGS+=--disable-oss
+CONFIGURE_ARGS+=	--disable-alsa
 .endif
 
 # Pulseaudio support
 .if !empty(PKG_OPTIONS:Mpulseaudio)
-CONFIGURE_ARGS+=--enable-pulseaudio
+CONFIGURE_ARGS+=	--enable-pulseaudio
 .  include "../../audio/pulseaudio/buildlink3.mk"
 .endif

Index: pkgsrc/audio/xmp/patches/patch-src_drivers_netbsd.c
diff -u pkgsrc/audio/xmp/patches/patch-src_drivers_netbsd.c:1.3 pkgsrc/audio/xmp/patches/patch-src_drivers_netbsd.c:1.4
--- pkgsrc/audio/xmp/patches/patch-src_drivers_netbsd.c:1.3	Thu Feb 27 03:40:10 2014
+++ pkgsrc/audio/xmp/patches/patch-src_drivers_netbsd.c	Thu Nov 21 23:59:06 2019
@@ -1,8 +1,17 @@
-$NetBSD: patch-src_drivers_netbsd.c,v 1.3 2014/02/27 03:40:10 rxg Exp $
+$NetBSD: patch-src_drivers_netbsd.c,v 1.4 2019/11/21 23:59:06 nia Exp $
 
---- src/sound_netbsd.c.orig	2013-04-06 13:38:02.000000000 +0000
+--- src/sound_netbsd.c.orig	2016-07-16 11:29:44.213738881 +0000
 +++ src/sound_netbsd.c
-@@ -99,7 +101,7 @@ static void play(void *b, int i)
+@@ -36,7 +36,7 @@ static int init(struct options *options)
+ 	chkparm1("buffer", bsize = strtoul(token, NULL, 0));
+ 	parm_end();
+ 
+-	if ((audio_fd = open("/dev/sound", O_WRONLY)) == -1)
++	if ((audio_fd = open("/dev/audio", O_WRONLY)) == -1)
+ 		return -1;
+ 
+ 	/* try to open audioctldevice */
+@@ -101,7 +101,7 @@ static void play(void *b, int i)
  	while (i) {
  		if ((j = write(audio_fd, b, i)) > 0) {
  			i -= j;


--_----------=_1574380746214570--