Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_16205480928350"
MIME-Version: 1.0
Date: Sun, 9 May 2021 08:14:52 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20210509081452.631C8FA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	nia
Date:		Sun May  9 08:14:52 UTC 2021

Modified Files:
	pkgsrc/audio: Makefile
Added Files:
	pkgsrc/audio/osstest: DESCR Makefile PLIST distinfo
	pkgsrc/audio/osstest/files: Makefile
	pkgsrc/audio/osstest/patches: patch-cmd_osstest_osstest.c

Log Message:
add audio/osstest

The osstest applet is a simple test application that can be used to test
functionality of the sound hardware installed in the system.

osstest performs a playback test for each installed audio device. If there
are any "machine detectable" problems they will be reported. You will first
hear an audio sample played on the left speaker, then the right speaker and
finally in stereo on both speakers.

NOTE: On NetBSD, use `audiocfg test 0` instead. This package primarily
exists to test OSSv4 compatibility.


To generate a diff of this commit:
cvs rdiff -u -r1.629 -r1.630 pkgsrc/audio/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/osstest/DESCR \
    pkgsrc/audio/osstest/Makefile pkgsrc/audio/osstest/PLIST \
    pkgsrc/audio/osstest/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/osstest/files/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/osstest/patches/patch-cmd_osstest_osstest.c

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


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

Modified files:

Index: pkgsrc/audio/Makefile
diff -u pkgsrc/audio/Makefile:1.629 pkgsrc/audio/Makefile:1.630
--- pkgsrc/audio/Makefile:1.629	Sun May  9 08:02:03 2021
+++ pkgsrc/audio/Makefile	Sun May  9 08:14:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.629 2021/05/09 08:02:03 nia Exp $
+# $NetBSD: Makefile,v 1.630 2021/05/09 08:14:51 nia Exp $
 #
 
 COMMENT=	Audio tools, players, and libraries
@@ -353,6 +353,7 @@ SUBDIR+=	opencore-amr
 SUBDIR+=	opus-tools
 SUBDIR+=	opusfile
 SUBDIR+=	ossmix
+SUBDIR+=	osstest
 SUBDIR+=	ossxmix
 SUBDIR+=	p5-Audio-CD
 SUBDIR+=	p5-Audio-Scan

Added files:

Index: pkgsrc/audio/osstest/DESCR
diff -u /dev/null pkgsrc/audio/osstest/DESCR:1.1
--- /dev/null	Sun May  9 08:14:52 2021
+++ pkgsrc/audio/osstest/DESCR	Sun May  9 08:14:51 2021
@@ -0,0 +1,10 @@
+The osstest applet is a simple test application that can be used to test
+functionality of the sound hardware installed in the system.
+
+osstest performs a playback test for each installed audio device. If there
+are any "machine detectable" problems they will be reported. You will first
+hear an audio sample played on the left speaker, then the right speaker and
+finally in stereo on both speakers.
+
+NOTE: On NetBSD, use `audiocfg test 0` instead. This package primarily
+exists to test OSSv4 compatibility.
Index: pkgsrc/audio/osstest/Makefile
diff -u /dev/null pkgsrc/audio/osstest/Makefile:1.1
--- /dev/null	Sun May  9 08:14:52 2021
+++ pkgsrc/audio/osstest/Makefile	Sun May  9 08:14:51 2021
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.1 2021/05/09 08:14:51 nia Exp $
+
+DISTNAME=	oss-v4.2-build2019-src-bsd
+PKGNAME=	osstest-${DISTNAME:S/oss-v//1:S/-src-bsd//1:S/-/./g}
+CATEGORIES=	audio
+MASTER_SITES=	http://www.opensound.com/developer/sources/stable/bsd/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	nia@NetBSD.org
+HOMEPAGE=	http://www.opensound.com/
+COMMENT=	Application for testing OSSv4 sound devices
+LICENSE=	2-clause-bsd
+
+BUILD_DIRS=	cmd/${PKGBASE}
+
+# NOTE: Linux support will require an OSSv4 package integrated into
+# oss.buildlink3.mk
+ONLY_FOR_PLATFORM+=	FreeBSD-*-*
+ONLY_FOR_PLATFORM+=	NetBSD-*-*
+ONLY_FOR_PLATFORM+=	SunOS-*-*
+
+.include "../../mk/oss.buildlink3.mk"
+
+LDFLAGS+=	${LIBOSSAUDIO}
+
+.if ${OPSYS} == "NetBSD" && \
+	(!empty(OS_VERSION:M[5-9].*) && empty(OS_VERSION:M9.99.*))
+PKG_SKIP_REASON+=	"Requires OSSv4 support"
+.endif
+
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	cmd/${PKGBASE}/${PKGBASE}.man
+SUBST_SED.paths=	-e 's,/usr/bin,${PREFIX}/bin,g'
+
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	share/doc/${PKGBASE}
+
+pre-build:
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}/cmd/${PKGBASE}/Makefile
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/cmd/${PKGBASE}/${PKGBASE} \
+		${DESTDIR}${PREFIX}/bin/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/COPYING \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/COPYING
+	${INSTALL_DATA} ${WRKSRC}/cmd/${PKGBASE}/${PKGBASE}.man \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/${PKGBASE}.man
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/osstest/PLIST
diff -u /dev/null pkgsrc/audio/osstest/PLIST:1.1
--- /dev/null	Sun May  9 08:14:52 2021
+++ pkgsrc/audio/osstest/PLIST	Sun May  9 08:14:51 2021
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2021/05/09 08:14:51 nia Exp $
+bin/osstest
+share/doc/osstest/COPYING
+share/doc/osstest/osstest.man
Index: pkgsrc/audio/osstest/distinfo
diff -u /dev/null pkgsrc/audio/osstest/distinfo:1.1
--- /dev/null	Sun May  9 08:14:52 2021
+++ pkgsrc/audio/osstest/distinfo	Sun May  9 08:14:51 2021
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2021/05/09 08:14:51 nia Exp $
+
+SHA1 (oss-v4.2-build2019-src-bsd.tar.bz2) = f6e03cbb5b5010aa48dd6d963b7e68c991c7d7dc
+RMD160 (oss-v4.2-build2019-src-bsd.tar.bz2) = be04756160843acdaacbb610d5e8ebd9f7acf572
+SHA512 (oss-v4.2-build2019-src-bsd.tar.bz2) = 9d43fa3e3abe4cf006cabfedf2c9fc51372f8cbe499c2e4bee6ba489291c31eb93b66b312054bcf92fc26df329bc3c7ef14a633fece8af38256bc7198d0c1556
+Size (oss-v4.2-build2019-src-bsd.tar.bz2) = 1723557 bytes
+SHA1 (patch-cmd_osstest_osstest.c) = 3e7a9d5b166430995c45aa390bed96bbba858ee8

Index: pkgsrc/audio/osstest/files/Makefile
diff -u /dev/null pkgsrc/audio/osstest/files/Makefile:1.1
--- /dev/null	Sun May  9 08:14:52 2021
+++ pkgsrc/audio/osstest/files/Makefile	Sun May  9 08:14:52 2021
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2021/05/09 08:14:52 nia Exp $
+
+CFLAGS+=	-DLOCAL_BUILD
+
+OBJS=		osstest.o help.o wavedata.o
+PROG=		osstest
+
+all: ${PROG}
+
+.c.o:
+	${CC} ${CFLAGS} -c ${.IMPSRC}
+
+${PROG}: ${OBJS}
+	${CC} ${LDFLAGS} -o ${PROG} ${OBJS}

Index: pkgsrc/audio/osstest/patches/patch-cmd_osstest_osstest.c
diff -u /dev/null pkgsrc/audio/osstest/patches/patch-cmd_osstest_osstest.c:1.1
--- /dev/null	Sun May  9 08:14:52 2021
+++ pkgsrc/audio/osstest/patches/patch-cmd_osstest_osstest.c	Sun May  9 08:14:52 2021
@@ -0,0 +1,20 @@
+$NetBSD: patch-cmd_osstest_osstest.c,v 1.1 2021/05/09 08:14:52 nia Exp $
+
+XXX: I need to implement this in libossaudio...
+
+--- cmd/osstest/osstest.c.orig	2019-03-06 07:52:21.000000000 +0000
++++ cmd/osstest/osstest.c
+@@ -524,11 +524,13 @@ test_device (int t, int flags)
+ 	return 1;
+       }
+ 
++#ifdef DSP_CH_MASK
+   if ((ainfo.caps & DSP_CH_MASK) == DSP_CH_MULTI)
+     {
+       printf ("- Skipping multi channel device\n");
+       return 1;
+     }
++#endif
+ 
+   if (ainfo.pid != -1)
+     {


--_----------=_16205480928350--