pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio audio/mpg123*: update to 1.27.2, simplify things
details: https://anonhg.NetBSD.org/pkgsrc/rev/c7b482fc3527
branches: trunk
changeset: 453206:c7b482fc3527
user: thor <thor%pkgsrc.org@localhost>
date: Tue May 25 10:44:22 2021 +0000
description:
audio/mpg123*: update to 1.27.2, simplify things
This updates the mpg123 version and also removes packaging cruft.
Among that, a never-working patch for madvise and a very old i586
assembly source are gone. The output modules are now installed without
libtool files, just as .so (or .dylib). A future update to 1.28 will
probably also get rid of the static libraries (upstream fixed the build
to work around pkgsrc's wrapped libtool which ignores the autoconf
macros to trigger non-static default build).
These are the upstream changes:
1.27.2
------
(Trying some svn tag discipline: 1.27.1 has been tagged before, but
not released. Let's increment for any change.)
- Removed ports/Xcode, ports/cmake should handle that case.
- Ensure debug.h is included last where it matters to avoid
conflicts with debug/warning macros in system headers
(bug 308).
- Fix some debug/printf integer casts for 32 bit platforms (bug 309).
1.27.0
------
- libmpg123:
-- Running on precomputed tables now, no need to call
mpg123_init() anymore. That and mpg123_exit() are both just
empty shells. You can omit them if you do not care about earlier
libmpg123. You can check for MPG123_API_VERSION >= 46.
-- Added API that avoids enums, mapped-to by default unless
MPG123_ENUM_API is defined.
- libout123:
-- Added API that avoids enums, mapped-to by default unless
MPG123_ENUM_API is defined.
-- Added device enumeration for win32, win32_wasapi, alsa, pulse.
This increments the output module ABI version to 3.
-- You can choose output devices now on Windows.
-- Changed default output module order to put pulse before alsa since
we now ensure that pulse is not inadvertedly started by the
autospawn feature. This improves the experience on desktop
systems with pulse where the alsa to pulse use causes glitches.
Note that on a modern Linux desktop (Ubuntu), you will not
escape an instance of pulseaudio being started, with even the
enumeration of the ALSA default device summoning the daemon.
If you _want_ sound daemon autospawn behaviour on other platforms,
you need to trigger it outside of libout123.
- examples: Update for dropped mpg123_init(), more sensible
copyright notes.
- out123:
-- safer limiting of maximum playback rate
-- Added --list-devices.
- mpg123:
-- Fix --continue output to print track_count+1 as continue
position after hitting the end of playlist. Makes scripts/conplay
go to back to the beginning again (regression in 1.24.0, bug 250).
-- Remote control API version 9 with @I { .. @I } wrapping of ID3 and
playlist display.
-- Added --list-devices.
-- Fix console printout on Windows.
-- Fix terminal control logic to better handle cases where stdin or
stderr is not a terminal, also avoid enabling control if you specify
stdin as input file.
- Updated debugging/warning/error message macros to include the function
name.
diffstat:
audio/mpg123-jack/PLIST | 4 +-
audio/mpg123-nas/PLIST | 4 +-
audio/mpg123-oss/PLIST | 4 +-
audio/mpg123-pulse/PLIST | 4 +-
audio/mpg123-sun/PLIST | 4 +-
audio/mpg123/Makefile | 19 +-
audio/mpg123/Makefile.common | 28 +-
audio/mpg123/PLIST | 10 +-
audio/mpg123/distinfo | 14 +-
audio/mpg123/files/decode_i586_.s | 320 ---------------------------------
audio/mpg123/patches/patch-Makefile.in | 20 --
audio/mpg123/patches/patch-aa | 15 -
audio/mpg123/patches/patch-af | 29 --
audio/mpg123/patches/patch-configure | 20 ++
14 files changed, 73 insertions(+), 422 deletions(-)
diffs (truncated from 613 to 300 lines):
diff -r 23f82c6f324a -r c7b482fc3527 audio/mpg123-jack/PLIST
--- a/audio/mpg123-jack/PLIST Tue May 25 10:32:20 2021 +0000
+++ b/audio/mpg123-jack/PLIST Tue May 25 10:44:22 2021 +0000
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2021/04/17 09:17:45 nia Exp $
-lib/mpg123/output_jack.la
+@comment $NetBSD: PLIST,v 1.2 2021/05/25 10:44:22 thor Exp $
+lib/mpg123/output_jack.so
diff -r 23f82c6f324a -r c7b482fc3527 audio/mpg123-nas/PLIST
--- a/audio/mpg123-nas/PLIST Tue May 25 10:32:20 2021 +0000
+++ b/audio/mpg123-nas/PLIST Tue May 25 10:44:22 2021 +0000
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 2021/04/17 09:20:47 nia Exp $
-lib/mpg123/output_nas.la
+@comment $NetBSD: PLIST,v 1.5 2021/05/25 10:44:22 thor Exp $
+lib/mpg123/output_nas.so
diff -r 23f82c6f324a -r c7b482fc3527 audio/mpg123-oss/PLIST
--- a/audio/mpg123-oss/PLIST Tue May 25 10:32:20 2021 +0000
+++ b/audio/mpg123-oss/PLIST Tue May 25 10:44:22 2021 +0000
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2010/03/14 14:19:19 martin Exp $
-lib/mpg123/output_oss.la
+@comment $NetBSD: PLIST,v 1.2 2021/05/25 10:44:22 thor Exp $
+lib/mpg123/output_oss.so
diff -r 23f82c6f324a -r c7b482fc3527 audio/mpg123-pulse/PLIST
--- a/audio/mpg123-pulse/PLIST Tue May 25 10:32:20 2021 +0000
+++ b/audio/mpg123-pulse/PLIST Tue May 25 10:44:22 2021 +0000
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2010/03/14 16:28:02 martin Exp $
-lib/mpg123/output_pulse.la
+@comment $NetBSD: PLIST,v 1.2 2021/05/25 10:44:22 thor Exp $
+lib/mpg123/output_pulse.so
diff -r 23f82c6f324a -r c7b482fc3527 audio/mpg123-sun/PLIST
--- a/audio/mpg123-sun/PLIST Tue May 25 10:32:20 2021 +0000
+++ b/audio/mpg123-sun/PLIST Tue May 25 10:44:22 2021 +0000
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2010/03/14 14:19:20 martin Exp $
-lib/mpg123/output_sun.la
+@comment $NetBSD: PLIST,v 1.2 2021/05/25 10:44:23 thor Exp $
+lib/mpg123/output_sun.so
diff -r 23f82c6f324a -r c7b482fc3527 audio/mpg123/Makefile
--- a/audio/mpg123/Makefile Tue May 25 10:32:20 2021 +0000
+++ b/audio/mpg123/Makefile Tue May 25 10:44:22 2021 +0000
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.60 2021/01/03 15:06:00 adam Exp $
+# $NetBSD: Makefile,v 1.61 2021/05/25 10:44:22 thor Exp $
PKGNAME= ${DISTNAME:C/[^[:alnum:]]*//}
COMMENT= MPEG layer 1, 2, and 3 audio player
-PKGCONFIG_OVERRIDE+= libmpg123.pc.in
-
-MAKE_ENV+= MPG123_PROGRAM=mpg123
-MAKE_ENV+= EXTRA_INSTALL_TARGETS="install-exec-am install-data-am"
+PKGCONFIG_OVERRIDE+= libmpg123.pc.in libout123.pc.in libsyn123.pc.in
MPG123_BUILDING_BASE= # empty
.include "../../mk/bsd.prefs.mk"
-PLIST_VARS+= coreaudio oss sun
+PLIST_VARS+= coreaudio oss sun alsa
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "SunOS"
MPG123_DEFAULT_MODULE= sun
@@ -20,9 +17,17 @@
.elif ${OPSYS} == "Darwin"
MPG123_DEFAULT_MODULE= coreaudio
PLIST.coreaudio= yes
+.elif ${OPSYS} == "Linux"
+MPG123_DEFAULT_MODULE= alsa,oss
+PLIST.alsa= yes
+PLIST.oss= yes
+.include "../../audio/alsa-lib/buildlink3.mk"
.else
MPG123_DEFAULT_MODULE= oss
PLIST.oss= yes
+.endif
+
+.if ${PLIST.oss} == "yes"
.include "../../mk/oss.buildlink3.mk"
LIBS+= ${LIBOSSAUDIO}
CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
@@ -36,4 +41,4 @@
.include "../../mk/bsd.pkg.mk"
# now we can set the default module
-MPG123_MODULE= ${MPG123_DEFAULT_MODULE}
+MPG123_MODULE= ${MPG123_DEFAULT_MODULE}
diff -r 23f82c6f324a -r c7b482fc3527 audio/mpg123/Makefile.common
--- a/audio/mpg123/Makefile.common Tue May 25 10:32:20 2021 +0000
+++ b/audio/mpg123/Makefile.common Tue May 25 10:44:22 2021 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.57 2021/03/25 23:53:13 thor Exp $
+# $NetBSD: Makefile.common,v 1.58 2021/05/25 10:44:22 thor Exp $
#
# 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.26.5
+DISTNAME= mpg123-1.27.2
PKGNAME?= ${DISTNAME:C/[[:alnum:]]*/&-${MPG123_MODULE}/}
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
@@ -20,9 +20,14 @@
USE_LIBTOOL?= yes
USE_TOOLS+= pkg-config gmake
GNU_CONFIGURE?= yes
-CONFIGURE_ARGS+= --enable-modules=yes
-CONFIGURE_ENV+= BUILD_${MPG123_MODULE:tu}=yes
-CONFIGURE_ENV+= MPG123_MODULE=${MPG123_MODULE:Q}
+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 @:'
DISTINFO_FILE= ${.CURDIR}/../../audio/mpg123/distinfo
@@ -33,11 +38,16 @@
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:
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/src/libout123/modules/output_${MPG123_MODULE}.la \
- ${DESTDIR}${PREFIX}/lib/mpg123
+ mkdir -p ${DESTDIR}${PREFIX}/lib/mpg123
+ install ${WRKSRC}/src/libout123/modules/.libs/output_${MPG123_MODULE}.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib/mpg123
.endif
-#.include "../../devel/libltdl/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
diff -r 23f82c6f324a -r c7b482fc3527 audio/mpg123/PLIST
--- a/audio/mpg123/PLIST Tue May 25 10:32:20 2021 +0000
+++ b/audio/mpg123/PLIST Tue May 25 10:44:22 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2020/06/02 08:06:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/05/25 10:44:22 thor Exp $
bin/mpg123
bin/mpg123-id3dump
bin/mpg123-strip
@@ -10,9 +10,11 @@
lib/libmpg123.la
lib/libout123.la
lib/libsyn123.la
-${PLIST.coreaudio}lib/mpg123/output_coreaudio.la
-${PLIST.oss}lib/mpg123/output_oss.la
-${PLIST.sun}lib/mpg123/output_sun.la
+${PLIST.alsa}lib/mpg123/output_alsa.so
+${PLIST.coreaudio}lib/mpg123/output_coreaudio.so
+lib/mpg123/output_dummy.so
+${PLIST.oss}lib/mpg123/output_oss.so
+${PLIST.sun}lib/mpg123/output_sun.so
lib/pkgconfig/libmpg123.pc
lib/pkgconfig/libout123.pc
lib/pkgconfig/libsyn123.pc
diff -r 23f82c6f324a -r c7b482fc3527 audio/mpg123/distinfo
--- a/audio/mpg123/distinfo Tue May 25 10:32:20 2021 +0000
+++ b/audio/mpg123/distinfo Tue May 25 10:44:22 2021 +0000
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.56 2021/03/25 23:53:13 thor Exp $
+$NetBSD: distinfo,v 1.57 2021/05/25 10:44:22 thor Exp $
-SHA1 (mpg123-1.26.5.tar.bz2) = c4ed8d5b0c5400c28198e32b1175c8dac898e569
-RMD160 (mpg123-1.26.5.tar.bz2) = 5b433e97f34d2ce5f347bc952671601aaea034bc
-SHA512 (mpg123-1.26.5.tar.bz2) = 0c2b3174c834e4bd459a3324b825d9bf9341a3486c0af815773b00cb007578cb718522ac4e983c7ad7e3bb5df9fdd342a03cb51345c41f68971145196ac04b7a
-Size (mpg123-1.26.5.tar.bz2) = 1051356 bytes
-SHA1 (patch-Makefile.in) = e1b529e9468994e25c2567df7e64a2905b0cf529
-SHA1 (patch-aa) = 4b2761219dd8fb92079d7f96872e56beb702696a
+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 (patch-ad) = f07b637c3fc1d3ea0426013fc25bca8e3aecba56
-SHA1 (patch-af) = ba9ccddda15f0e711675b1bbad72b082b34b15f5
+SHA1 (patch-configure) = 1c6256cf420974193f71fec7d4e2b4686923ab53
diff -r 23f82c6f324a -r c7b482fc3527 audio/mpg123/files/decode_i586_.s
--- a/audio/mpg123/files/decode_i586_.s Tue May 25 10:32:20 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,320 +0,0 @@
-/
-/ synth_1to1 works the same way as the c version of this
-/ file. only two types of changes have been made:
-/ - reordered floating point instructions to
-/ prevent pipline stalls
-/ - made WRITE_SAMPLE use integer instead of
-/ (slower) floating point
-/ all kinds of x86 processors should benefit from these
-/ modifications.
-/
-/ useful sources of information on optimizing x86 code include:
-/
-/ Intel Architecture Optimization Manual
-/ http://www.intel.com/design/pentium/manuals/242816.htm
-/
-/ Cyrix 6x86 Instruction Set Summary
-/ ftp://ftp.cyrix.com/6x86/6x-dbch6.pdf
-/
-/ AMD-K5 Processor Software Development
-/ http://www.amd.com/products/cpg/techdocs/appnotes/20007e.pdf
-/
-/ Stefan Bieschewski <stb%acm.org@localhost>
-/
-/ $Id: decode_i586_.s,v 1.2 2005/05/31 22:13:24 rillig Exp $
-/
-.bss
- .comm buffs,4352
-.data
- .align 2
-bo:
- .long 1
-.text
- .align 3
-.LC0:
- .long 0x0,0x40dfffc0
- .align 3
-.LC1:
- .long 0x0,0xc0e00000
-.text
- .align 3
-.globl _synth_1to1_pent
-_synth_1to1_pent:
- subl $12,%esp
- pushl %ebp
- pushl %edi
- pushl %esi
- pushl %ebx
- movl 32(%esp),%eax
- movl 40(%esp),%esi
- xorl %edi,%edi
- movl bo,%ebp
- cmpl %edi,36(%esp)
- jne .L48
- decl %ebp
- andl $15,%ebp
- movl %ebp,bo
- movl $buffs,%ecx
- jmp .L49
-.L48:
- addl $2,%esi
- movl $buffs+2176,%ecx
-.L49:
- testl $1,%ebp
- je .L50
- movl %ecx,%ebx
- movl %ebp,16(%esp)
- pushl %eax
- movl 20(%esp),%edx
- leal (%ebx,%edx,4),%eax
- pushl %eax
- movl 24(%esp),%eax
- incl %eax
- andl $15,%eax
- leal 1088(,%eax,4),%eax
- addl %ebx,%eax
- jmp .L74
-.L50:
- leal 1088(%ecx),%ebx
- leal 1(%ebp),%edx
- movl %edx,16(%esp)
- pushl %eax
- leal 1092(%ecx,%ebp,4),%eax
- pushl %eax
- leal (%ecx,%ebp,4),%eax
-.L74:
- pushl %eax
- call _dct64
- addl $12,%esp
- movl 16(%esp),%edx
- leal 0(,%edx,4),%edx
- movl $_decwin+64,%eax
- movl %eax,%ecx
- subl %edx,%ecx
- movl $16,%ebp
-.L55:
- flds (%ecx)
- fmuls (%ebx)
- flds 4(%ecx)
- fmuls 4(%ebx)
- fxch %st(1)
- flds 8(%ecx)
- fmuls 8(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 12(%ecx)
- fmuls 12(%ebx)
- fxch %st(2)
Home |
Main Index |
Thread Index |
Old Index