Received: by mail.netbsd.org (Postfix, from userid 605) id D746484E76; Thu, 9 Sep 2021 12:14:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0EE3784E56 for ; Thu, 9 Sep 2021 12:14:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id fXXUCBV-OiMP for ; Thu, 9 Sep 2021 12:14:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2003784D3C for ; Thu, 9 Sep 2021 12:14:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1CF8CFA97; Thu, 9 Sep 2021 12:14:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1631189683127840" MIME-Version: 1.0 Date: Thu, 9 Sep 2021 12:14:43 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/audio/libsndfile To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210909121443.1CF8CFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1631189683127840 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Sep 9 12:14:43 UTC 2021 Modified Files: pkgsrc/audio/libsndfile: Makefile distinfo options.mk Added Files: pkgsrc/audio/libsndfile/patches: patch-programs_sndfile-play.c Log Message: libsndfile: fix sndfile-play tool on netbsd To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 pkgsrc/audio/libsndfile/Makefile cvs rdiff -u -r1.50 -r1.51 pkgsrc/audio/libsndfile/distinfo cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/libsndfile/options.mk cvs rdiff -u -r0 -r1.3 \ pkgsrc/audio/libsndfile/patches/patch-programs_sndfile-play.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1631189683127840 Content-Disposition: inline Content-Length: 5284 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/libsndfile/Makefile diff -u pkgsrc/audio/libsndfile/Makefile:1.87 pkgsrc/audio/libsndfile/Makefile:1.88 --- pkgsrc/audio/libsndfile/Makefile:1.87 Thu Sep 9 12:03:09 2021 +++ pkgsrc/audio/libsndfile/Makefile Thu Sep 9 12:14:42 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.87 2021/09/09 12:03:09 nia Exp $ +# $NetBSD: Makefile,v 1.88 2021/09/09 12:14:42 nia Exp $ DISTNAME= libsndfile-1.0.31 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=libsndfile/} GITHUB_PROJECT= libsndfile Index: pkgsrc/audio/libsndfile/distinfo diff -u pkgsrc/audio/libsndfile/distinfo:1.50 pkgsrc/audio/libsndfile/distinfo:1.51 --- pkgsrc/audio/libsndfile/distinfo:1.50 Thu Sep 9 12:03:09 2021 +++ pkgsrc/audio/libsndfile/distinfo Thu Sep 9 12:14:42 2021 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.50 2021/09/09 12:03:09 nia Exp $ +$NetBSD: distinfo,v 1.51 2021/09/09 12:14:42 nia Exp $ SHA1 (libsndfile-1.0.31.tar.bz2) = f16a88e7223baef7c4497536dc1b55b56811debc RMD160 (libsndfile-1.0.31.tar.bz2) = ae3fc5bbcb10a034f3edc1240acacd9f1ec349a7 SHA512 (libsndfile-1.0.31.tar.bz2) = 62202092e5cac6346fd3c0a977380e9bf888fc59d08c9c9707dc254a8ef6ed6356da2ab0430bb970c7b06ba5bb1dafa5d7b0fe13898834c1fe4acb16f409f0e1 Size (libsndfile-1.0.31.tar.bz2) = 875335 bytes SHA1 (patch-CVE-2021-3246) = 08620e24b8a41afd7c164781bf6088028ffc97ed +SHA1 (patch-programs_sndfile-play.c) = 974cf854b9ae4e8be631583edb3da5e41791d9a7 SHA1 (patch-src_wavlike.c) = b2524c62d8dad9959ff7a50c412b0e85bf433f47 Index: pkgsrc/audio/libsndfile/options.mk diff -u pkgsrc/audio/libsndfile/options.mk:1.10 pkgsrc/audio/libsndfile/options.mk:1.11 --- pkgsrc/audio/libsndfile/options.mk:1.10 Sat Nov 2 21:09:14 2019 +++ pkgsrc/audio/libsndfile/options.mk Thu Sep 9 12:14:42 2021 @@ -1,43 +1,30 @@ -# $NetBSD: options.mk,v 1.10 2019/11/02 21:09:14 rillig Exp $ +# $NetBSD: options.mk,v 1.11 2021/09/09 12:14:42 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libsndfile -PKG_SUPPORTED_OPTIONS= octave -PKG_OPTIONS_OPTIONAL_GROUPS= output -PKG_OPTIONS_GROUP.output= oss sun -SNDFILE_OUTPUT.NetBSD= sun -SNDFILE_OUTPUT.OpenBSD= sun -SNDFILE_OUTPUT.SunOS= sun - -.include "../../mk/bsd.fast.prefs.mk" - -.if !defined(SNDFILE_OUTPUT.${OPSYS}) -CHECK_BUILTIN.oss:= yes -. include "../../mk/oss.builtin.mk" -CHECK_BUILTIN.oss:= no -. if defined(IS_BUILTIN.oss) && !empty(IS_BUILTIN.oss:M[yY][eE][sS]) -SNDFILE_OUTPUT.${OPSYS}?= oss -. endif -.endif +.include "../../mk/bsd.prefs.mk" -PKG_SUGGESTED_OPTIONS= ${SNDFILE_OUTPUT.${OPSYS}} +.if ${OPSYS} == "Linux" +PKG_SUPPORTED_OPTIONS= alsa octave +PKG_SUGGESTED_OPTIONS= alsa +.else +PKG_SUPPORTED_OPTIONS= octave +.endif .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Malsa) +CONFIGURE_ARGS+= --enable-alsa +.include "../../audio/alsa-lib/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-alsa +.endif + .if !empty(PKG_OPTIONS:Moctave) USE_LANGUAGES= c c++ fortran USE_TOOLS+= gmake +CONFIGURE_ARGS+= --enable-octave .include "../../math/octave/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-octave .endif - -.if !empty(PKG_OPTIONS:Moss) -.include "../../mk/oss.buildlink3.mk" -OSS_DEFS= -DDEV_DSP=\"${DEVOSSAUDIO:Q}\" -DUSE_OSS=1 -MAKE_ENV+= AM_CFLAGS=${OSS_DEFS:Q} -.elif !empty(PKG_OPTIONS:Msun) -DEVSUNAUDIO?= /dev/audio -SUN_DEFS= -DUSE_SUN -DDEV_SUN=\"${DEVSUNAUDIO:Q}\" -MAKE_ENV+= AM_CFLAGS=${SUN_DEFS:Q} -.endif Added files: Index: pkgsrc/audio/libsndfile/patches/patch-programs_sndfile-play.c diff -u /dev/null pkgsrc/audio/libsndfile/patches/patch-programs_sndfile-play.c:1.3 --- /dev/null Thu Sep 9 12:14:43 2021 +++ pkgsrc/audio/libsndfile/patches/patch-programs_sndfile-play.c Thu Sep 9 12:14:42 2021 @@ -0,0 +1,43 @@ +$NetBSD: patch-programs_sndfile-play.c,v 1.3 2021/09/09 12:14:42 nia Exp $ + +Add support for NetBSD sun-like audio devices. +Do not change mixing parameters in the sun code. + +--- programs/sndfile-play.c.orig 2020-10-04 10:00:49.000000000 +0000 ++++ programs/sndfile-play.c +@@ -64,7 +64,7 @@ + #elif HAVE_SNDIO_H + #include + +-#elif (defined (sun) && defined (unix)) ++#elif (defined (sun) && defined (unix)) || defined(__NetBSD__) + #include + #include + #include +@@ -727,7 +727,7 @@ sndio_play (int argc, char *argv []) + ** Solaris. + */ + +-#if (defined (sun) && defined (unix)) /* ie Solaris */ ++#if (defined (sun) && defined (unix)) || defined(__NetBSD__) /* ie Solaris */ + + static void + solaris_play (int argc, char *argv []) +@@ -764,8 +764,6 @@ solaris_play (int argc, char *argv []) + audio_info.play.channels = sfinfo.channels ; + audio_info.play.precision = 16 ; + audio_info.play.encoding = AUDIO_ENCODING_LINEAR ; +- audio_info.play.gain = AUDIO_MAX_GAIN ; +- audio_info.play.balance = AUDIO_MID_BALANCE ; + + if ((error = ioctl (audio_fd, AUDIO_SETINFO, &audio_info))) + { perror ("ioctl (AUDIO_SETINFO) failed") ; +@@ -845,7 +843,7 @@ main (int argc, char *argv []) + opensoundsys_play (argc, argv) ; + #elif HAVE_SNDIO_H + sndio_play (argc, argv) ; +-#elif (defined (sun) && defined (unix)) ++#elif (defined (sun) && defined (unix)) || defined(__NetBSD__) + solaris_play (argc, argv) ; + #elif (OS_IS_WIN32 == 1) + win32_play (argc, argv) ; --_----------=_1631189683127840--