CVS commit: pkgsrc/audio

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Feb 11 12:39:17 UTC 2023

Modified Files:
        pkgsrc/audio/mpg123: Makefile Makefile.common distinfo options.mk
        pkgsrc/audio/mpg123-jack: PLIST
        pkgsrc/audio/mpg123-nas: PLIST
        pkgsrc/audio/mpg123-pulse: PLIST

Log Message:
mpg123: updated to 1.31.2

1.31.2
------
- Fix build --with-network=internal only (configure logic error, bug 348).
- Fix OS/2 build with getaddrinfo() (which may support IPv6 eventually, thanks
  to Dave Yeo).


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/audio/mpg123/Makefile \
    pkgsrc/audio/mpg123/Makefile.common
cvs rdiff -u -r1.69 -r1.70 pkgsrc/audio/mpg123/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/mpg123/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/mpg123-jack/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/mpg123-nas/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/mpg123-pulse/PLIST

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

Modified files:

Index: pkgsrc/audio/mpg123/Makefile
diff -u pkgsrc/audio/mpg123/Makefile:1.68 pkgsrc/audio/mpg123/Makefile:1.69
--- pkgsrc/audio/mpg123/Makefile:1.68   Sat Oct 29 19:16:04 2022
+++ pkgsrc/audio/mpg123/Makefile        Sat Feb 11 12:39:17 2023
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.68 2022/10/29 19:16:04 triaxx Exp $
+# $NetBSD: Makefile,v 1.69 2023/02/11 12:39:17 adam Exp $
 
 PKGNAME=       ${DISTNAME:C/[^[:alnum:]]*//}
 COMMENT=       MPEG layer 1, 2, and 3 audio player
 
+TEST_TARGET=   check
+
 PKGCONFIG_OVERRIDE+=   libmpg123.pc.in libout123.pc.in libsyn123.pc.in
 
 MPG123_BUILDING_BASE=  # empty
Index: pkgsrc/audio/mpg123/Makefile.common
diff -u pkgsrc/audio/mpg123/Makefile.common:1.68 pkgsrc/audio/mpg123/Makefile.common:1.69
--- pkgsrc/audio/mpg123/Makefile.common:1.68    Tue Nov  1 09:51:36 2022
+++ pkgsrc/audio/mpg123/Makefile.common Sat Feb 11 12:39:17 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.68 2022/11/01 09:51:36 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.69 2023/02/11 12:39:17 adam Exp $
 #
 # used by audio/mpg123-jack/Makefile
 # used by audio/mpg123-nas/Makefile
 # used by audio/mpg123-pulse/Makefile
 
-DISTNAME=      mpg123-1.31.1
+DISTNAME=      mpg123-1.31.2
 PKGNAME?=      ${DISTNAME:C/[[:alnum:]]*/&-${MPG123_MODULE}/}
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mpg123/}
@@ -19,7 +19,8 @@ USE_LANGUAGES=                c
 USE_LIBTOOL?=          yes
 USE_TOOLS+=            pkg-config gmake
 GNU_CONFIGURE?=                yes
-CONFIGURE_ARGS+=       --enable-modules=yes --with-audio=${MPG123_MODULE}
+CONFIGURE_ARGS+=       --enable-modules=yes
+CONFIGURE_ARGS+=       --with-audio=${MPG123_MODULE}
 
 # Be prepared for installing things like mpg123-pulse, mpg123-jack,
 # to have the modules picked up automatically. On a system with pulse,
@@ -37,16 +38,12 @@ INSTALLATION_DIRS+= lib/mpg123
 LIBS+=                 -lmpg123
 BUILD_TARGET=          src/libout123/modules/output_${MPG123_MODULE}.la
 PATCHDIR=              ${.CURDIR}/../../audio/mpg123/patches
-.include "../../mk/bsd.prefs.mk"
-.  if ${OPSYS} == "Darwin"
-SOEXT=  dylib
-.  else
-SOEXT=  so
-.  endif
+
 do-install:
-       mkdir -p ${DESTDIR}${PREFIX}/lib/mpg123
-       install ${WRKSRC}/src/libout123/modules/.libs/output_${MPG123_MODULE}.${SOEXT} \
-         ${DESTDIR}${PREFIX}/lib/mpg123
+       ${MKDIR} ${DESTDIR}${PREFIX}/lib/mpg123
+       cd ${WRKSRC}/src/libout123/modules && \
+       ${LIBTOOL} --mode=install ${INSTALL_LIB} output_${MPG123_MODULE}.la \
+               ${DESTDIR}${PREFIX}/lib/mpg123
 .endif
 
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/audio/mpg123/distinfo
diff -u pkgsrc/audio/mpg123/distinfo:1.69 pkgsrc/audio/mpg123/distinfo:1.70
--- pkgsrc/audio/mpg123/distinfo:1.69   Tue Nov  1 09:51:36 2022
+++ pkgsrc/audio/mpg123/distinfo        Sat Feb 11 12:39:17 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.69 2022/11/01 09:51:36 jperkin Exp $
+$NetBSD: distinfo,v 1.70 2023/02/11 12:39:17 adam Exp $
 
-BLAKE2s (mpg123-1.31.1.tar.bz2) = d557adb1c34549a20fee88b54d5d1d6cf5e79f500eeb74adc825b88e07084ec6
-SHA512 (mpg123-1.31.1.tar.bz2) = d007ea94a99fde60919a173320e124c9f0079a28452533eeceb9c7bfed43810b46384ae45459ef6ac185e27ec06e153723bb588aaa4955ee2ad1c51dc58eb132
-Size (mpg123-1.31.1.tar.bz2) = 1093324 bytes
+BLAKE2s (mpg123-1.31.2.tar.bz2) = 80c4c4d2e8aac4c012e6fa68bf9132cf0db873ffed6e5799a26a32d2a7afdbf5
+SHA512 (mpg123-1.31.2.tar.bz2) = eca285382ee3e780353834addf1336c4a2f8f11256af22f95e11efa243de669761c083c86ddfc6ac8c02a920a3c4ab4ad767efa2739fb052e9719f35ef407bc3
+Size (mpg123-1.31.2.tar.bz2) = 1093881 bytes
 SHA1 (patch-ad) = f07b637c3fc1d3ea0426013fc25bca8e3aecba56
 SHA1 (patch-src_libout123_modules_sun.c) = aa11e1420fd07f2e1c4a0d911d1642f0fd50b916

Index: pkgsrc/audio/mpg123/options.mk
diff -u pkgsrc/audio/mpg123/options.mk:1.10 pkgsrc/audio/mpg123/options.mk:1.11
--- pkgsrc/audio/mpg123/options.mk:1.10 Sun Apr 25 07:51:24 2021
+++ pkgsrc/audio/mpg123/options.mk      Sat Feb 11 12:39:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2021/04/25 07:51:24 mrg Exp $
+# $NetBSD: options.mk,v 1.11 2023/02/11 12:39:17 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.mpg123
 PKG_OPTIONS_OPTIONAL_GROUPS=   fpu
@@ -16,7 +16,7 @@ PKG_OPTIONS_GROUP.fpu+=               mpg123-altivec
 PKG_SUGGESTED_OPTIONS+=                mpg123-altivec
 .else
 # Avoid using floating point on softfloat ARM.
-.  if !(!empty(MACHINE_ARCH:M*arm*) && empty(MACHINE_ARCH:M*hf*))
+.  if !(${MACHINE_ARCH:M*arm*} && !${MACHINE_ARCH:M*hf*})
 PKG_SUGGESTED_OPTIONS+=                mpg123-with-fpu
 .  endif
 .endif

Index: pkgsrc/audio/mpg123-jack/PLIST
diff -u pkgsrc/audio/mpg123-jack/PLIST:1.2 pkgsrc/audio/mpg123-jack/PLIST:1.3
--- pkgsrc/audio/mpg123-jack/PLIST:1.2  Tue May 25 10:44:22 2021
+++ pkgsrc/audio/mpg123-jack/PLIST      Sat Feb 11 12:39:17 2023
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2021/05/25 10:44:22 thor Exp $
-lib/mpg123/output_jack.so
+@comment $NetBSD: PLIST,v 1.3 2023/02/11 12:39:17 adam Exp $
+lib/mpg123/output_jack.la

Index: pkgsrc/audio/mpg123-nas/PLIST
diff -u pkgsrc/audio/mpg123-nas/PLIST:1.5 pkgsrc/audio/mpg123-nas/PLIST:1.6
--- pkgsrc/audio/mpg123-nas/PLIST:1.5   Tue May 25 10:44:22 2021
+++ pkgsrc/audio/mpg123-nas/PLIST       Sat Feb 11 12:39:17 2023
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.5 2021/05/25 10:44:22 thor Exp $
-lib/mpg123/output_nas.so
+@comment $NetBSD: PLIST,v 1.6 2023/02/11 12:39:17 adam Exp $
+lib/mpg123/output_nas.la

Index: pkgsrc/audio/mpg123-pulse/PLIST
diff -u pkgsrc/audio/mpg123-pulse/PLIST:1.2 pkgsrc/audio/mpg123-pulse/PLIST:1.3
--- pkgsrc/audio/mpg123-pulse/PLIST:1.2 Tue May 25 10:44:22 2021
+++ pkgsrc/audio/mpg123-pulse/PLIST     Sat Feb 11 12:39:17 2023
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2021/05/25 10:44:22 thor Exp $
-lib/mpg123/output_pulse.so
+@comment $NetBSD: PLIST,v 1.3 2023/02/11 12:39:17 adam Exp $
+lib/mpg123/output_pulse.la