audio/mbrolavox-*: Add new license, ready to include them in pkgsrc audio/pcaudiolib: Fix configure options and remove AC3 for now in sun.c

[adr <adr%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	adr <adr%sdf.org@localhost>
Pushed By:	adr
Date:		Fri Jan 26 05:04:07 2024 +0000
Changeset:	2bfc06cc9412fe2f017a5bb321f302e12e32924d

Modified Files:
	mbrolavox-en1/Makefile
	mbrolavox-us1/Makefile
	mbrolavox-us2/Makefile
	mbrolavox-us3/Makefile
	pcaudiolib/distinfo
	pcaudiolib/patches/patch-configure.ac
	pcaudiolib/patches/patch-src_sun.c

Log Message:
audio/mbrolavox-*: Add new license, ready to include them in pkgsrc
audio/pcaudiolib: Fix configure options and remove AC3 for now in sun.c

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2bfc06cc9412fe2f017a5bb321f302e12e32924d

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

diffstat:
 mbrolavox-en1/Makefile                | 2 +-
 mbrolavox-us1/Makefile                | 2 +-
 mbrolavox-us2/Makefile                | 2 +-
 mbrolavox-us3/Makefile                | 2 +-
 pcaudiolib/distinfo                   | 4 ++--
 pcaudiolib/patches/patch-configure.ac | 2 +-
 pcaudiolib/patches/patch-src_sun.c    | 9 ++-------
 7 files changed, 9 insertions(+), 14 deletions(-)

diffs:
diff --git a/mbrolavox-en1/Makefile b/mbrolavox-en1/Makefile
index 2b4f83a37d..48becba7ae 100644
--- a/mbrolavox-en1/Makefile
+++ b/mbrolavox-en1/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/numediart/MBROLA-voices
 COMMENT=	British English male voice for MBROLA
 # the particular license of this voice is included in ${DESTDIR}${MHOME}${VOX}
-LICENSE=	no-commercial-use
+LICENSE=	mbrola-voices-license
 
 DEPENDS=	mbrola-[0-9]*:../../audio/mbrola
 
diff --git a/mbrolavox-us1/Makefile b/mbrolavox-us1/Makefile
index 19fb7935eb..818e819c3e 100644
--- a/mbrolavox-us1/Makefile
+++ b/mbrolavox-us1/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/numediart/MBROLA-voices
 COMMENT=	British English male voice for MBROLA
 # the particular license of this voice is included in ${DESTDIR}${MHOME}${VOX}
-LICENSE=	no-commercial-use
+LICENSE=	mbrola-voices-license
 
 DEPENDS=	mbrola-[0-9]*:../../audio/mbrola
 
diff --git a/mbrolavox-us2/Makefile b/mbrolavox-us2/Makefile
index 75d1969a37..9794d8d168 100644
--- a/mbrolavox-us2/Makefile
+++ b/mbrolavox-us2/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/numediart/MBROLA-voices
 COMMENT=	British English male voice for MBROLA
 # the particular license of this voice is included in ${DESTDIR}${MHOME}${VOX}
-LICENSE=	no-commercial-use
+LICENSE=	mbrola-voices-license
 
 DEPENDS=	mbrola-[0-9]*:../../audio/mbrola
 
diff --git a/mbrolavox-us3/Makefile b/mbrolavox-us3/Makefile
index d005d715bf..31229c9e10 100644
--- a/mbrolavox-us3/Makefile
+++ b/mbrolavox-us3/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/numediart/MBROLA-voices
 COMMENT=	British English male voice for MBROLA
 # the particular license of this voice is included in ${DESTDIR}${MHOME}${VOX}
-LICENSE=	no-commercial-use
+LICENSE=	mbrola-voices-license
 
 DEPENDS=	mbrola-[0-9]*:../../audio/mbrola
 
diff --git a/pcaudiolib/distinfo b/pcaudiolib/distinfo
index 08e811b09e..a655b2fd98 100644
--- a/pcaudiolib/distinfo
+++ b/pcaudiolib/distinfo
@@ -4,7 +4,7 @@ BLAKE2s (pcaudiolib-1.2.tar.gz) = 11dc27e944fb2edba51c0b4f1da100e7279e44e2482194
 SHA512 (pcaudiolib-1.2.tar.gz) = 803e8c36646f780b9e9a98600092af366ad47ecf9cb447b9b6c82b75eb316ee65674832fc0cbfa56ee4d508ae1d0f69890f5885817e6df3e2ecef54571b936d6
 Size (pcaudiolib-1.2.tar.gz) = 377066 bytes
 SHA1 (patch-Makefile.am) = 880ffb94a684952451b40aa34db94300119cbeeb
-SHA1 (patch-configure.ac) = 4e62afeab13d00de11fa80c4f1ff47aff20acb6b
+SHA1 (patch-configure.ac) = 88238b7703d6ced3f7ed0934d507364d174941c3
 SHA1 (patch-src_audio.c) = b15ab14dac93cf10a282e488a17585f2999e58fe
 SHA1 (patch-src_audio__priv.h) = d9712a2d0a66e4f4f96ca8f8de4020beeffac828
-SHA1 (patch-src_sun.c) = 4e713a2157cff64420b1b7b38720a855757f5f0a
+SHA1 (patch-src_sun.c) = f6f83d11f39f8c6d43894210813dcd5f551aa8a4
diff --git a/pcaudiolib/patches/patch-configure.ac b/pcaudiolib/patches/patch-configure.ac
index 37c0896559..732c2deba3 100644
--- a/pcaudiolib/patches/patch-configure.ac
+++ b/pcaudiolib/patches/patch-configure.ac
@@ -12,7 +12,7 @@ Add Sun audio support
 +dnl ================================================================
 +
 +AC_ARG_WITH([sun],
-+    [AS_HELP_STRING([--with-sun], [support for Sun audio output @<:@default=yes@:>@])],
++    [AS_HELP_STRING([--with-sun], [support for Sun audio output @<:@default=no@:>@])],
 +    [])
 +
 +if test "$with_sun" = "no"; then
diff --git a/pcaudiolib/patches/patch-src_sun.c b/pcaudiolib/patches/patch-src_sun.c
index 03637074f0..7f6eb806cd 100644
--- a/pcaudiolib/patches/patch-src_sun.c
+++ b/pcaudiolib/patches/patch-src_sun.c
@@ -2,9 +2,9 @@ $NetBSD$
 
 Add Sun audio support
 
---- src/sun.c.orig	2024-01-25 07:46:34.728325542 +0000
+--- src/sun.c.orig	2024-01-26 01:42:30.586543911 +0000
 +++ src/sun.c
-@@ -0,0 +1,200 @@
+@@ -0,0 +1,195 @@
 +/* Sun Output.
 + *
 + * Based on Oss Output by Reece H. Dunn
@@ -86,16 +86,11 @@ Add Sun audio support
 +		{AUDIO_OBJECT_FORMAT_S24BE, AUDIO_ENCODING_SLINEAR_BE, 24},
 +		{AUDIO_OBJECT_FORMAT_U24LE, AUDIO_ENCODING_ULINEAR_LE, 24},
 +		{AUDIO_OBJECT_FORMAT_U24BE, AUDIO_ENCODING_ULINEAR_BE, 24},
-+		{AUDIO_OBJECT_FORMAT_S24_32LE, AUDIO_ENCODING_SLINEAR_LE, 32},
-+		{AUDIO_OBJECT_FORMAT_S24_32BE, AUDIO_ENCODING_SLINEAR_BE, 32},
-+		{AUDIO_OBJECT_FORMAT_U24_32LE, AUDIO_ENCODING_ULINEAR_LE, 32},
-+		{AUDIO_OBJECT_FORMAT_U24_32BE, AUDIO_ENCODING_ULINEAR_BE, 32},
 +		{AUDIO_OBJECT_FORMAT_S32LE, AUDIO_ENCODING_SLINEAR_LE, 32},
 +		{AUDIO_OBJECT_FORMAT_S32BE, AUDIO_ENCODING_SLINEAR_BE, 32},
 +		{AUDIO_OBJECT_FORMAT_U32LE, AUDIO_ENCODING_ULINEAR_LE, 32},
 +		{AUDIO_OBJECT_FORMAT_U32BE, AUDIO_ENCODING_ULINEAR_BE, 32},
 +		{AUDIO_OBJECT_FORMAT_ADPCM, AUDIO_ENCODING_ADPCM, 8},
-+		{AUDIO_OBJECT_FORMAT_AC3, AUDIO_ENCODING_AC3, 32},
 +	};
 +#define SUNFORMATS (sizeof(aformat_sun_tbl)/sizeof(aformat_sun_tbl[0]))
 +	int i;