Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id E652D1A9239 for ; Sun, 28 Nov 2021 06:42:48 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 9225D84EC9; Sun, 28 Nov 2021 06:42:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CDB7A84D80 for ; Sun, 28 Nov 2021 06:42:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id j8U6EnFFyk6n for ; Sun, 28 Nov 2021 06:42:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 22B7884D15 for ; Sun, 28 Nov 2021 06:42:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 16A9DFAEC; Sun, 28 Nov 2021 06:42:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16380817675000" MIME-Version: 1.0 Date: Sun, 28 Nov 2021 06:42:47 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/audio/alsa-plugins-oss To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20211128064247.16A9DFAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16380817675000 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Sun Nov 28 06:42:46 UTC 2021 Modified Files: pkgsrc/audio/alsa-plugins-oss: Makefile PLIST Added Files: pkgsrc/audio/alsa-plugins-oss: MESSAGE pkgsrc/audio/alsa-plugins-oss/files: asoundrc.example Log Message: Add an example .asoundrc to use this plugin by default To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/audio/alsa-plugins-oss/MESSAGE cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/alsa-plugins-oss/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/alsa-plugins-oss/PLIST cvs rdiff -u -r0 -r1.1 pkgsrc/audio/alsa-plugins-oss/files/asoundrc.example Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16380817675000 Content-Disposition: inline Content-Length: 3069 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/alsa-plugins-oss/Makefile diff -u pkgsrc/audio/alsa-plugins-oss/Makefile:1.15 pkgsrc/audio/alsa-plugins-oss/Makefile:1.16 --- pkgsrc/audio/alsa-plugins-oss/Makefile:1.15 Sun Nov 21 16:06:30 2021 +++ pkgsrc/audio/alsa-plugins-oss/Makefile Sun Nov 28 06:42:46 2021 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2021/11/21 16:06:30 hauke Exp $ +# $NetBSD: Makefile,v 1.16 2021/11/28 06:42:46 pho Exp $ DISTNAME= alsa-plugins-1.2.5 PKGNAME= ${DISTNAME:S/plugins/plugins-oss/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ftp://ftp.alsa-project.org/pub/plugins/ EXTRACT_SUFX= .tar.bz2 @@ -34,6 +34,13 @@ LIBS+= ${LIBOSSAUDIO} BUILD_DIRS= oss +EGDIR= ${PREFIX}/share/examples/${PKGBASE} +MESSAGE_SUBST+= EGDIR=${EGDIR} +INSTALLATION_DIRS+= ${EGDIR} +post-install: + ${INSTALL_DATA} "${FILESDIR}/asoundrc.example" \ + "${DESTDIR}${EGDIR}/asoundrc" + .include "../../audio/alsa-lib/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/audio/alsa-plugins-oss/PLIST diff -u pkgsrc/audio/alsa-plugins-oss/PLIST:1.2 pkgsrc/audio/alsa-plugins-oss/PLIST:1.3 --- pkgsrc/audio/alsa-plugins-oss/PLIST:1.2 Wed May 12 14:14:38 2021 +++ pkgsrc/audio/alsa-plugins-oss/PLIST Sun Nov 28 06:42:46 2021 @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2021/05/12 14:14:38 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.3 2021/11/28 06:42:46 pho Exp $ lib/alsa-lib/libasound_module_ctl_oss.la lib/alsa-lib/libasound_module_pcm_oss.la share/alsa/alsa.conf.d/50-oss.conf share/alsa/conf.d/50-oss.conf +share/examples/alsa-plugins-oss/asoundrc Added files: Index: pkgsrc/audio/alsa-plugins-oss/MESSAGE diff -u /dev/null pkgsrc/audio/alsa-plugins-oss/MESSAGE:1.1 --- /dev/null Sun Nov 28 06:42:47 2021 +++ pkgsrc/audio/alsa-plugins-oss/MESSAGE Sun Nov 28 06:42:46 2021 @@ -0,0 +1,12 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2021/11/28 06:42:46 pho Exp $ + +ALSA does not automatically use this plugin. To use it by default, copy + + ${EGDIR}/asoundrc + +to your + + ~/.asoundrc + +=========================================================================== Index: pkgsrc/audio/alsa-plugins-oss/files/asoundrc.example diff -u /dev/null pkgsrc/audio/alsa-plugins-oss/files/asoundrc.example:1.1 --- /dev/null Sun Nov 28 06:42:47 2021 +++ pkgsrc/audio/alsa-plugins-oss/files/asoundrc.example Sun Nov 28 06:42:46 2021 @@ -0,0 +1,27 @@ +# $NetBSD: asoundrc.example,v 1.1 2021/11/28 06:42:46 pho Exp $ +# We can't just use "type oss" for pcm.!default because +# alsa-plugins-oss doesn't support FLOAT_NE, which Firefox uses. See +# https://mail-index.netbsd.org/pkgsrc-users/2017/02/10/msg024431.html + +pcm.oss { + type oss +} + +pcm.!default { + type plug + slave { + pcm oss + format S16_LE + } + hint { + show { + @func refer + name defaults.namehint.basic + } + description "Open Sound System" + } +} + +ctl.!default { + type oss +} --_----------=_16380817675000--