pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio Update mpg123 to version 1.10.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/0656d81f1819
branches: trunk
changeset: 573179:0656d81f1819
user: martin <martin%pkgsrc.org@localhost>
date: Sun Mar 14 14:19:19 2010 +0000
description:
Update mpg123 to version 1.10.1.
Thanks to <wiz> for answering lots of stupid questions and general guidance.
diffstat:
audio/Makefile | 4 +-
audio/mpg123-oss/DESCR | 1 +
audio/mpg123-oss/Makefile | 19 +
audio/mpg123-oss/PLIST | 2 +
audio/mpg123-sun/DESCR | 1 +
audio/mpg123-sun/Makefile | 13 +
audio/mpg123-sun/PLIST | 2 +
audio/mpg123/Makefile | 43 +-
audio/mpg123/Makefile.common | 123 +----
audio/mpg123/PLIST | 7 +-
audio/mpg123/buildlink3.mk | 12 +
audio/mpg123/distinfo | 38 +-
audio/mpg123/options.mk | 41 ++
audio/mpg123/patches/patch-aa | 321 +---------------
audio/mpg123/patches/patch-ab | 23 -
audio/mpg123/patches/patch-ac | 31 -
audio/mpg123/patches/patch-ad | 95 +---
audio/mpg123/patches/patch-ae | 16 -
audio/mpg123/patches/patch-af | 46 +-
audio/mpg123/patches/patch-ag | 123 ------
audio/mpg123/patches/patch-ah | 31 +-
audio/mpg123/patches/patch-ai | 842 ------------------------------------------
audio/mpg123/patches/patch-aj | 120 -----
audio/mpg123/patches/patch-ak | 40 -
audio/mpg123/patches/patch-al | 40 -
audio/mpg123/patches/patch-am | 13 -
audio/mpg123/patches/patch-an | 19 -
audio/mpg123/patches/patch-ao | 24 -
audio/mpg123/patches/patch-ap | 13 -
audio/mpg123/patches/patch-aq | 91 ----
audio/mpg123/patches/patch-ar | 26 -
audio/mpg123/patches/patch-as | 13 -
audio/mpg123/patches/patch-at | 17 -
audio/mpg123/patches/patch-au | 157 -------
audio/mpg123/patches/patch-av | 29 -
audio/mpg123/patches/patch-aw | 13 -
36 files changed, 252 insertions(+), 2197 deletions(-)
diffs (truncated from 2629 to 300 lines):
diff -r 47d16225bda0 -r 0656d81f1819 audio/Makefile
--- a/audio/Makefile Sun Mar 14 14:07:58 2010 +0000
+++ b/audio/Makefile Sun Mar 14 14:19:19 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.432 2010/03/03 22:30:20 wiz Exp $
+# $NetBSD: Makefile,v 1.433 2010/03/14 14:19:19 martin Exp $
#
COMMENT= Audio tools
@@ -261,6 +261,8 @@
SUBDIR+= mpc
SUBDIR+= mpegaudio
SUBDIR+= mpg123
+SUBDIR+= mpg123-sun
+SUBDIR+= mpg123-oss
SUBDIR+= mpg123-esound
SUBDIR+= mpg123-nas
SUBDIR+= mpg321
diff -r 47d16225bda0 -r 0656d81f1819 audio/mpg123-oss/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mpg123-oss/DESCR Sun Mar 14 14:19:19 2010 +0000
@@ -0,0 +1,1 @@
+OSS output module for the mpg123 audio player.
diff -r 47d16225bda0 -r 0656d81f1819 audio/mpg123-oss/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mpg123-oss/Makefile Sun Mar 14 14:19:19 2010 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2010/03/14 14:19:19 martin Exp $
+#
+
+MPG123_MODULE= oss
+# this is builtin with ../mpg123 on all other architectures
+ONLY_FOR_PLATFORM+= NetBSD-*-* FreeBSD-*-* OpenBSD-*-* SunOS-*-*
+ONLY_FOR_PLATFORM+= DragonFly-*-*
+
+.include "${.CURDIR}/../../audio/mpg123/Makefile.common"
+
+LIBS+= -lossaudio
+CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
+CPPFLAGS+= -DDEVOSSSOUND="\"${DEVOSSSOUND}\""
+
+.include "../../mk/oss.buildlink3.mk"
+
+.include "../../audio/mpg123/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff -r 47d16225bda0 -r 0656d81f1819 audio/mpg123-oss/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mpg123-oss/PLIST Sun Mar 14 14:19:19 2010 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2010/03/14 14:19:19 martin Exp $
+lib/mpg123/output_oss.la
diff -r 47d16225bda0 -r 0656d81f1819 audio/mpg123-sun/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mpg123-sun/DESCR Sun Mar 14 14:19:19 2010 +0000
@@ -0,0 +1,1 @@
+sun audio output module for the mpg123 audio player.
diff -r 47d16225bda0 -r 0656d81f1819 audio/mpg123-sun/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mpg123-sun/Makefile Sun Mar 14 14:19:19 2010 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2010/03/14 14:19:20 martin Exp $
+#
+
+MPG123_MODULE= sun
+# this is builtin with ../mpg123 on these architectures
+NOT_FOR_PLATFORM+= NetBSD-*-* FreeBSD-*-* OpenBSD-*-* SunOS-*-*
+NOT_FOR_PLATFORM+= DragonFly-*-*
+
+.include "${.CURDIR}/../../audio/mpg123/Makefile.common"
+
+.include "../../audio/mpg123/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff -r 47d16225bda0 -r 0656d81f1819 audio/mpg123-sun/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mpg123-sun/PLIST Sun Mar 14 14:19:19 2010 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2010/03/14 14:19:20 martin Exp $
+lib/mpg123/output_sun.la
diff -r 47d16225bda0 -r 0656d81f1819 audio/mpg123/Makefile
--- a/audio/mpg123/Makefile Sun Mar 14 14:07:58 2010 +0000
+++ b/audio/mpg123/Makefile Sun Mar 14 14:19:19 2010 +0000
@@ -1,13 +1,40 @@
-# $NetBSD: Makefile,v 1.43 2009/05/19 22:16:08 abs Exp $
+# $NetBSD: Makefile,v 1.44 2010/03/14 14:19:19 martin Exp $
+
+PKGNAME= ${DISTNAME:C/[^[:alnum:]]*//}
+COMMENT= MPEG layer 1, 2, and 3 audio player
+
+PKGCONFIG_OVERRIDE+= libmpg123.pc.in
+
+MPG123_SUBDIRS= src doc
+MPG123_SUBDIRS.src= output libmpg123
-PKGNAME= mpg123-${MPG123_VERSION}
-PKGREVISION= 9
-COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio
+MAKE_ENV+= MPG123_PROGRAM=mpg123
+MAKE_ENV+= EXTRA_INSTALL_TARGETS="install-exec-am install-data-am"
+
+MPG123_BUILDING_BASE= # empty
+
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+= oss
+PLIST_VARS+= sun
-CONFLICTS+= mpg123-nas-[0-9]*
-
-PKG_DESTDIR_SUPPORT= user-destdir
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" \
+ || ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly"
+MPG123_DEFAULT_MODULE= sun
+PLIST.sun = yes
+.else
+MPG123_DEFAULT_MODULE= oss
+PLIST.oss = yes
+.endif
-PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123
+# MPG123_MODULE is not finally set yet, to avoid NOT_FOR_PLATFORM triggers
.include "Makefile.common"
+
+.include "options.mk"
.include "../../mk/bsd.pkg.mk"
+
+# now we can set the default module
+MPG123_MODULE= ${MPG123_DEFAULT_MODULE}
+
+#post-extract:
+# ${RUN} cp ${FILESDIR}/debug.c ${WRKSRC}/src/libmpg123
diff -r 47d16225bda0 -r 0656d81f1819 audio/mpg123/Makefile.common
--- a/audio/mpg123/Makefile.common Sun Mar 14 14:07:58 2010 +0000
+++ b/audio/mpg123/Makefile.common Sun Mar 14 14:19:19 2010 +0000
@@ -1,93 +1,46 @@
-# $NetBSD: Makefile.common,v 1.31 2009/05/19 08:59:04 wiz Exp $
+# $NetBSD: Makefile.common,v 1.32 2010/03/14 14:19:19 martin Exp $
+#
+# used by audio/mpg123-oss/Makefile
+# used by audio/mpg123-sun/Makefile
-DISTNAME= mpg123-0.59r
-MPG123_VERSION= 0.59.18
+DISTNAME= mpg123-1.10.1
+PKGNAME?= ${DISTNAME:C/[[:alnum:]]*/&-${MPG123_MODULE}/}
CATEGORIES= audio
-MASTER_SITES= http://www.mpg123.de/mpg123/ \
- http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
+EXTRACT_SUFX= .tar.bz2
+DISTINFO_FILE=${.CURDIR}/../../audio/mpg123/distinfo
+LICENSE= gnu-lgpl-v2.1
+
+MAINTAINER= martin%NetBSD.org@localhost
+HOMEPAGE= http://www.mpg123.org/
+COMMENT?= Contains the ${MPG123_MODULE} module for mpg123
-PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES= mpg123-059r-v6-20000713b.diff.gz
+PKG_DESTDIR_SUPPORT= user-destdir
+
+GNU_CONFIGURE?= yes
+USE_LIBTOOL?= yes
+USE_TOOLS+= pkg-config gmake
+
+CONFIGURE_ARGS+= --enable-modules=yes
+MPG123_SUBDIRS?= src
+MPG123_SUBDIRS.src?= output
-MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.mpg123.de/
-LICENSE= mpg123-license
+CONFIGURE_ENV+= BUILD_${MPG123_MODULE:tu}=yes
+CONFIGURE_ENV+= MPG123_MODULE=${MPG123_MODULE:Q}
+MAKE_ENV+= MPG123_SUBDIRS=${MPG123_SUBDIRS:Q}
+MAKE_ENV+= MPG123_SUBDIRS.src=${MPG123_SUBDIRS.src:Q}
-DIST_SUBDIR= mpg123
+.if !defined(MPG123_BUILDING_BASE)
+INSTALLATION_DIRS+= lib/mpg123
+LIBS+= -lmpg123
+BUILD_DIRS= src/output
PATCHDIR= ${.CURDIR}/../../audio/mpg123/patches
-FILESDIR= ${.CURDIR}/../../audio/mpg123/files
-DISTINFO_FILE= ${.CURDIR}/../../audio/mpg123/distinfo
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-.include "../../mk/bsd.prefs.mk"
-
-TARGET_SUFFIX?=
-
-# PKG_OPTIONS_VAR must be set in the including Makefile
-PKG_SUPPORTED_OPTIONS= inet6 mpg123-arm-fixed64
-PKG_SUGGESTED_OPTIONS= inet6
-PKG_OPTIONS_LEGACY_VARS+= MPG123_ARM_FIXED64:mpg123-arm-fixed64
-.include "../../mk/bsd.options.mk"
-
-###
-### IPv6 support
-###
-.if !empty(PKG_OPTIONS:Minet6)
-CPPFLAGS+= -DINET6
+do-install:
+ ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+ ${WRKSRC}/src/output/output_${MPG123_MODULE}.la \
+ ${DESTDIR}${PREFIX}/lib/mpg123
.endif
-.include "../../mk/compiler.mk"
-.if ${OPSYS} == "SunOS"
-. if !empty(PKGSRC_COMPILER:Msunpro)
-BUILD_TARGET= solaris
-. else
-BUILD_TARGET= solaris-gcc${TARGET_SUFFIX}
-. endif
-.elif ${OPSYS} == "IRIX"
-BUILD_TARGET= sgi
-.elif ${OPSYS} == "Linux"
-. if ${TARGET_SUFFIX} == "-nas"
-BUILD_TARGET= linux-nas
-. elif ${MACHINE_ARCH} == "i386"
-BUILD_TARGET= linux
-. elif ${MACHINE_ARCH} == "powerpc"
-BUILD_TARGET= linux-ppc
-. else
-BUILD_TARGET= ${LOWER_OPSYS}-${MACHINE_ARCH}
-. endif
-.elif ${OPSYS} == "NetBSD"
-. if ${MACHINE_ARCH} == "i386"
-. if ${OBJECT_FMT} == "ELF"
-BUILD_TARGET= netbsd-i386-elf${TARGET_SUFFIX}
-. else
-BUILD_TARGET= netbsd-i386${TARGET_SUFFIX}
-. endif # ELF
-. elif ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-###
-### Optionally enable 64-bit calculations to avoid glitches on ARM.
-###
-. if !empty(PKG_OPTIONS:Mmpg123-arm-fixed64)
-BUILD_TARGET= netbsd-arm-64${TARGET_SUFFIX}
-. else
-BUILD_TARGET= netbsd-arm${TARGET_SUFFIX}
-. endif
-. elif ${MACHINE_ARCH} == "m68k"
-BUILD_TARGET= netbsd-m68k${TARGET_SUFFIX}
-. else
-BUILD_TARGET= netbsd${TARGET_SUFFIX}
-. endif
-.else
-BUILD_TARGET= ${LOWER_OPSYS}${TARGET_SUFFIX}
-.endif
-
-MAKE_FLAGS+= PREFIX=${PREFIX:Q}
-
-pre-patch:
- ${LN} -s . ${WRKSRC}/mpg123
-
-post-patch:
- ${RM} -f ${WRKSRC}/mpg123
- ${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}
- cd ${WRKSRC} && ${MV} decode_i586.s decode_i586.s.orig; \
- ${SED} -e 's@^/@#/@g' decode_i586.s.orig > decode_i586.s
+# .include "../../devel/libltdl/convenience.mk"
+.include "../../devel/libltdl/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
diff -r 47d16225bda0 -r 0656d81f1819 audio/mpg123/PLIST
--- a/audio/mpg123/PLIST Sun Mar 14 14:07:58 2010 +0000
+++ b/audio/mpg123/PLIST Sun Mar 14 14:19:19 2010 +0000
@@ -1,3 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:31 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/03/14 14:19:19 martin Exp $
bin/mpg123
+include/mpg123.h
+lib/libmpg123.la
+lib/pkgconfig/libmpg123.pc
man/man1/mpg123.1
+${PLIST.sun}lib/mpg123/output_sun.la
+${PLIST.oss}lib/mpg123/output_oss.la
diff -r 47d16225bda0 -r 0656d81f1819 audio/mpg123/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/mpg123/buildlink3.mk Sun Mar 14 14:19:19 2010 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2010/03/14 14:19:19 martin Exp $
+
+BUILDLINK_TREE+= mpg123
+
+.if !defined(MPG123_BUILDLINK3_MK)
+MPG123_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.mpg123+= mpg123>=1.0.0
+BUILDLINK_PKGSRCDIR.mpg123?= ../../audio/mpg123
+.endif # MPG123_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -mpg123
diff -r 47d16225bda0 -r 0656d81f1819 audio/mpg123/distinfo
--- a/audio/mpg123/distinfo Sun Mar 14 14:07:58 2010 +0000
+++ b/audio/mpg123/distinfo Sun Mar 14 14:19:19 2010 +0000
@@ -1,31 +1,9 @@
Home |
Main Index |
Thread Index |
Old Index