CVS commit: pkgsrc/audio

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Sat Jun  5 17:30:01 UTC 2021

Modified Files:
        pkgsrc/audio/mpg123: Makefile Makefile.common distinfo
        pkgsrc/audio/mpg123-pulse: Makefile
Removed Files:
        pkgsrc/audio/mpg123/patches: patch-configure

Log Message:
mpg123: update to 1.28.0

1.28.0
------
- build:
-- Fix up the build to actually build all library objects with libtool
   consistently, also ensuring no pointless static archives for output
   modules.
-- Adapted things to autoconf 2.71, requiring 2.69 now (the latter tested
   on Debian, with their patches).
-- Improved configure to be more useful --with-default-audio to define
   the search order, fix static build for --with-audio being a list
   (just choosing the first one).
-- Ensure consistent use of LINK_MPG123_DLL in headers.
- build (ports/cmake):
-- Thanks to Evgeni Poberezhnikov for working with us on that.
-- Fix up ports/cmake to really work in MSVC also for users of the lib
   (tested in vcpkg, bug 310).
-- Hardcode ports/cmake CPU detection for x64 and ARM as
   CMAKE_SYSTEM_PROCESSOR is useless crap (bug 298 for real).
-- Add missing io.h for _setmode() MSVC warned about (bug 311).
-- Added BUILD_NO_LARGENAME define to be used by MSVC builds. Note that
   an MSVC build of libmpg123 does not support 64 bit file offsets.
   That would need more morting to the explicit API. Thanks to MS for
   making off_t even more messy and less useful.
-- Added JACK output, fixed handling of compat_str there and in win32_wasapi.
- libsyn123: Fix syn123_mix() to actually do intermediate conversion
  when input and output encoding are the same but non-float. This makes
  out123 --mix work with s16 input and output, which is not that special!
- libmpg123: Fix misguided handling of part2_3_length checks in
  III_get_scale_factors_1() and III_get_scale_factors_2() which invalidated
  decoding of a mono source encoded as ms+i-stereo (bug 312). This was
  a regression introduced with version 1.25.7.
- libout123:
-- Print basic module loading errors only for last one in list.
   This enables use of an output module search list that anticipates module
   files not installed with the main package.
-- Fixes for win32_wasapi build with MSVC.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/audio/mpg123/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/audio/mpg123/Makefile.common
cvs rdiff -u -r1.57 -r1.58 pkgsrc/audio/mpg123/distinfo
cvs rdiff -u -r1.30 -r1.31 pkgsrc/audio/mpg123-pulse/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/mpg123/patches/patch-configure

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.63 pkgsrc/audio/mpg123/Makefile:1.64
--- pkgsrc/audio/mpg123/Makefile:1.63   Tue May 25 18:11:17 2021
+++ pkgsrc/audio/mpg123/Makefile        Sat Jun  5 17:30:01 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2021/05/25 18:11:17 thor Exp $
+# $NetBSD: Makefile,v 1.64 2021/06/05 17:30:01 thor Exp $
 
 PKGNAME=       ${DISTNAME:C/[^[:alnum:]]*//}
 COMMENT=       MPEG layer 1, 2, and 3 audio player
@@ -19,6 +19,7 @@ MPG123_DEFAULT_MODULE=        coreaudio
 PLIST.coreaudio=       yes
 .elif ${OPSYS} == "Linux"
 MPG123_DEFAULT_MODULE= alsa,oss
+MPG123_TRY_MODULES=    pulse,jack,alsa,oss
 PLIST.alsa=            yes
 PLIST.oss=             yes
 .include "../../audio/alsa-lib/buildlink3.mk"

Index: pkgsrc/audio/mpg123/Makefile.common
diff -u pkgsrc/audio/mpg123/Makefile.common:1.59 pkgsrc/audio/mpg123/Makefile.common:1.60
--- pkgsrc/audio/mpg123/Makefile.common:1.59    Tue May 25 18:15:11 2021
+++ pkgsrc/audio/mpg123/Makefile.common Sat Jun  5 17:30:01 2021
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.common,v 1.59 2021/05/25 18:15:11 thor Exp $
+# $NetBSD: Makefile.common,v 1.60 2021/06/05 17:30:01 thor Exp $
 #
+# used by audio/mpg123-jack/Makefile
 # used by audio/mpg123-nas/Makefile
-# used by audio/mpg123-oss/Makefile
 # used by audio/mpg123-pulse/Makefile
-# used by audio/mpg123-sun/Makefile
 
-DISTNAME=      mpg123-1.27.2
+DISTNAME=      mpg123-1.28.0
 PKGNAME?=      ${DISTNAME:C/[[:alnum:]]*/&-${MPG123_MODULE}/}
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mpg123/}
@@ -22,12 +21,12 @@ USE_TOOLS+=         pkg-config gmake
 GNU_CONFIGURE?=                yes
 CONFIGURE_ARGS+=       --enable-modules=yes --with-audio=${MPG123_MODULE}
 
-# To be removed on update > 1.27.2.
-SUBST_CLASSES+=                modules
-SUBST_STAGE.modules=   pre-configure
-SUBST_MESSAGE.modules= Avoid static module files with pkgsrc libtool.
-SUBST_FILES.modules=   Makefile.in
-SUBST_SED.modules=     -e 's:\(output_.*_la_CFLAGS = \)@:\1-shared @:'
+# Be prepared for installing things like mpg123-pulse, mpg123-jack,
+# to have the modules picked up automatically. On a system with pulse,
+# you do not want to go through alsa by default.
+.if !empty(MPG123_TRY_MODULES)
+CONFIGURE_ARGS+=       --with-default-audio=${MPG123_TRY_MODULES}
+.endif
 
 DISTINFO_FILE=         ${.CURDIR}/../../audio/mpg123/distinfo
 

Index: pkgsrc/audio/mpg123/distinfo
diff -u pkgsrc/audio/mpg123/distinfo:1.57 pkgsrc/audio/mpg123/distinfo:1.58
--- pkgsrc/audio/mpg123/distinfo:1.57   Tue May 25 10:44:22 2021
+++ pkgsrc/audio/mpg123/distinfo        Sat Jun  5 17:30:01 2021
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.57 2021/05/25 10:44:22 thor Exp $
+$NetBSD: distinfo,v 1.58 2021/06/05 17:30:01 thor Exp $
 
-SHA1 (mpg123-1.27.2.tar.bz2) = 058acbcb4b20609ef52a843cc95f45a0cdd7286a
-RMD160 (mpg123-1.27.2.tar.bz2) = ac103d7f9642283cd71239524fbdc5492eeead9c
-SHA512 (mpg123-1.27.2.tar.bz2) = b1c7de0c1b1d14cce3b3ba72e7454b7ce392443a3eaace0431381f1871e2fda1470b8efd07176057f8bf76d88f14c2b7ffae470ba34a3271c7e779277b86d6c0
-Size (mpg123-1.27.2.tar.bz2) = 1067102 bytes
+SHA1 (mpg123-1.28.0.tar.bz2) = ee3d6515c7ccf0b38f22c31bf4fca3a6c5f87dc3
+RMD160 (mpg123-1.28.0.tar.bz2) = d1df0d0c60559b3af23732219ff1dd0566de72e1
+SHA512 (mpg123-1.28.0.tar.bz2) = 4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77
+Size (mpg123-1.28.0.tar.bz2) = 1063321 bytes
 SHA1 (patch-ad) = f07b637c3fc1d3ea0426013fc25bca8e3aecba56
-SHA1 (patch-configure) = 1c6256cf420974193f71fec7d4e2b4686923ab53

Index: pkgsrc/audio/mpg123-pulse/Makefile
diff -u pkgsrc/audio/mpg123-pulse/Makefile:1.30 pkgsrc/audio/mpg123-pulse/Makefile:1.31
--- pkgsrc/audio/mpg123-pulse/Makefile:1.30     Sun Feb  7 06:30:14 2021
+++ pkgsrc/audio/mpg123-pulse/Makefile  Sat Jun  5 17:30:01 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2021/02/07 06:30:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.31 2021/06/05 17:30:01 thor Exp $
 
 MPG123_MODULE= pulse
 
-PKGREVISION= 1
 .include "../../audio/mpg123/Makefile.common"
 
 .include "../../audio/mpg123/buildlink3.mk"