Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1651094123248450"
MIME-Version: 1.0
Date: Wed, 27 Apr 2022 21:15:23 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio/mpg123
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20220427211523.D2724FB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	nia
Date:		Wed Apr 27 21:15:23 UTC 2022

Modified Files:
	pkgsrc/audio/mpg123: Makefile distinfo
Added Files:
	pkgsrc/audio/mpg123/patches: patch-src_libout123_modules_sun.c

Log Message:
mpg123: Fix device opening on NetBSD on rpi.  Normal applications setting
the audio output port in 2022 considered harmful.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/audio/mpg123/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/audio/mpg123/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/mpg123/patches/patch-src_libout123_modules_sun.c

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


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

Modified files:

Index: pkgsrc/audio/mpg123/Makefile
diff -u pkgsrc/audio/mpg123/Makefile:1.64 pkgsrc/audio/mpg123/Makefile:1.65
--- pkgsrc/audio/mpg123/Makefile:1.64	Sat Jun  5 17:30:01 2021
+++ pkgsrc/audio/mpg123/Makefile	Wed Apr 27 21:15:23 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2021/06/05 17:30:01 thor Exp $
+# $NetBSD: Makefile,v 1.65 2022/04/27 21:15:23 nia Exp $
 
 PKGNAME=	${DISTNAME:C/[^[:alnum:]]*//}
+PKGREVISION=	1
 COMMENT=	MPEG layer 1, 2, and 3 audio player
 
 PKGCONFIG_OVERRIDE+=	libmpg123.pc.in libout123.pc.in libsyn123.pc.in

Index: pkgsrc/audio/mpg123/distinfo
diff -u pkgsrc/audio/mpg123/distinfo:1.65 pkgsrc/audio/mpg123/distinfo:1.66
--- pkgsrc/audio/mpg123/distinfo:1.65	Fri Dec 17 17:11:31 2021
+++ pkgsrc/audio/mpg123/distinfo	Wed Apr 27 21:15:23 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.65 2021/12/17 17:11:31 thor Exp $
+$NetBSD: distinfo,v 1.66 2022/04/27 21:15:23 nia Exp $
 
 BLAKE2s (mpg123-1.29.3.tar.bz2) = 90efccc30568f2e56cd027b52fa12b16e806216ba861a164f0a5664b67f3f8a8
 SHA512 (mpg123-1.29.3.tar.bz2) = 0d8db63f9bae1507887bc5241a56abccfeb767b7ba8362eb0fce9de2f63369e57fdd6f25a953f8ef5f9ead4f400237db51914816e278566fdf8e6f205ebca5d6
 Size (mpg123-1.29.3.tar.bz2) = 1069979 bytes
 SHA1 (patch-ad) = f07b637c3fc1d3ea0426013fc25bca8e3aecba56
+SHA1 (patch-src_libout123_modules_sun.c) = aa11e1420fd07f2e1c4a0d911d1642f0fd50b916

Added files:

Index: pkgsrc/audio/mpg123/patches/patch-src_libout123_modules_sun.c
diff -u /dev/null pkgsrc/audio/mpg123/patches/patch-src_libout123_modules_sun.c:1.1
--- /dev/null	Wed Apr 27 21:15:23 2022
+++ pkgsrc/audio/mpg123/patches/patch-src_libout123_modules_sun.c	Wed Apr 27 21:15:23 2022
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_libout123_modules_sun.c,v 1.1 2022/04/27 21:15:23 nia Exp $
+
+Disable legacy code for fiddling with mixer parameters like volume
+and output port.  This is not really something we want done on
+modern Solaris on NetBSD where the device is abstracted, and
+setting the port can fail loudly on some hardware like
+Raspberry Pis.
+
+--- src/libout123/modules/sun.c.orig	2021-12-10 07:00:58.000000000 +0000
++++ src/libout123/modules/sun.c
+@@ -174,7 +174,8 @@ static int open_sun(out123_handle *ao)
+ #endif
+ 	
+ 	if(reset_parameters_sun(ao) < 0) return -1;
+-	
++
++#if 0	
+ 	AUDIO_INITINFO(&ainfo);
+ 	
+ 	if(ao->flags > 0)
+@@ -193,6 +194,7 @@ static int open_sun(out123_handle *ao)
+ 	
+ 	if(ioctl(ao->fn, AUDIO_SETINFO, &ainfo) == -1)
+ 		return -1;
++#endif
+ 	
+ 	return ao->fn;
+ }


--_----------=_1651094123248450--