pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/libmpg123 Change PKGNAME to libmpg123, and set t...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b1f185fe11d6
branches: trunk
changeset: 548426:b1f185fe11d6
user: bjs <bjs%pkgsrc.org@localhost>
date: Wed Oct 15 01:58:53 2008 +0000
description:
Change PKGNAME to libmpg123, and set the version to that of the
library's soname. Split Makefile.common out from Makefile in preparation
for the addition of the mpg123 program and output module packages.
Change buildlink3.mk to reflect this, and rename options.mk
to mpg123-options.mk in adherence with convention, e.g.
gecko-options.mk.
diffstat:
audio/libmpg123/Makefile | 45 +++++++++-----------------------------
audio/libmpg123/Makefile.common | 35 ++++++++++++++++++++++++++++++
audio/libmpg123/Makefile.version | 8 +++++-
audio/libmpg123/buildlink3.mk | 20 ++++++++--------
audio/libmpg123/mpg123-options.mk | 38 ++++++++++++++++++++++++++++++++
audio/libmpg123/options.mk | 38 --------------------------------
6 files changed, 100 insertions(+), 84 deletions(-)
diffs (236 lines):
diff -r e087d0375df2 -r b1f185fe11d6 audio/libmpg123/Makefile
--- a/audio/libmpg123/Makefile Wed Oct 15 00:57:49 2008 +0000
+++ b/audio/libmpg123/Makefile Wed Oct 15 01:58:53 2008 +0000
@@ -1,51 +1,28 @@
-# $NetBSD: Makefile,v 1.3 2008/09/19 17:49:26 ahoka Exp $
+# $NetBSD: Makefile,v 1.4 2008/10/15 01:58:53 bjs Exp $
#
-.include "../../audio/libmpg123/Makefile.version"
+.include "../../audio/libmpg123/Makefile.common"
-DISTNAME= mpg123-${MPG123_VERSION}
-PKGREVISION= 1
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= bjs%NetBSD.org@localhost
-HOMEPAGE= http://mpg123.sourceforge.net/
+PKGNAME= libmpg123-${LIBMPG123_VERSION}
COMMENT= MPEG layer 1, 2, and 3 decoder library
PKG_DESTDIR_SUPPORT= user-destdir
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-USE_LIBTOOL= yes
+PKGCONFIG_OVERRIDE+= libmpg123.pc.in
-PKGCONFIG_OVERRIDE+= libmpg123.pc.in
+AUTO_MKDIRS= yes
BUILD_DIRS= src/libmpg123
INSTALL_DIRS= src/libmpg123
-CONFIGURE_ARGS+= --enable-fifo=yes
-CONFIGURE_ARGS+= --enable-modules=yes
-CONFIGURE_ARGS+= --enable-network=yes
-CONFIGURE_ARGS+= --enable-gapless=yes
-###
-### XXX Use pkgsrc-provided CFLAGS.
-###
-CONFIGURE_ARGS+= --with-optimization=0
-CFLAGS+= ${COPTS.mpg123:U${COPTS}}
-###
-### XXX This should be set to 'no' for platforms where it is required.
-### It's easier doing this here than patching configure.
-MPG123_XFERMEM?= yes
-.if !empty(MPG123_XFERMEM:tl:Myes)
-BUILDLINK_TRANSFORM+= rm:-DNO_XFERMEM
-.endif
-
-INSTALLATION_DIRS= lib/pkgconfig
+post-extract:
+ ${ECHO} "#!${CONFIG_SHELL}${.newline}${TRUE}" > \
+ ${WRKSRC:Q}/libltdl/configure
post-install:
- ${INSTALL_DATA} ${WRKSRC}/libmpg123.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKSRC:Q}/libmpg123.pc \
+ ${DESTDIR:Q}${PREFIX:Q}/lib/pkgconfig
-.include "options.mk"
+.include "mpg123-options.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e087d0375df2 -r b1f185fe11d6 audio/libmpg123/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libmpg123/Makefile.common Wed Oct 15 01:58:53 2008 +0000
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile.common,v 1.1 2008/10/15 01:58:53 bjs Exp $
+#
+# used by audio/libmpg123/Makefile
+
+.include "../../audio/libmpg123/Makefile.version"
+
+DISTNAME= mpg123-${MPG123_DISTVERSION}
+CATEGORIES= audio
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= bjs%NetBSD.org@localhost
+HOMEPAGE= http://mpg123.sourceforge.net/
+
+
+GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
+USE_LIBTOOL= yes
+
+CONFIGURE_ARGS+= --enable-fifo=yes
+CONFIGURE_ARGS+= --enable-modules=yes
+CONFIGURE_ARGS+= --enable-network=yes
+CONFIGURE_ARGS+= --enable-gapless=yes
+###
+### XXX Use pkgsrc-provided CFLAGS.
+###
+CONFIGURE_ARGS+= --with-optimization=0
+CFLAGS+= ${COPTS.mpg123:U${COPTS}}
+###
+### XXX This should be set to 'no' for platforms where it is required.
+### It's easier doing this here than patching configure.
+MPG123_XFERMEM?= yes
+.if !empty(MPG123_XFERMEM:tl:Myes)
+BUILDLINK_TRANSFORM+= rm:-DNO_XFERMEM
+.endif
diff -r e087d0375df2 -r b1f185fe11d6 audio/libmpg123/Makefile.version
--- a/audio/libmpg123/Makefile.version Wed Oct 15 00:57:49 2008 +0000
+++ b/audio/libmpg123/Makefile.version Wed Oct 15 01:58:53 2008 +0000
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile.version,v 1.1.1.1 2008/09/07 00:56:15 bjs Exp $
+# $NetBSD: Makefile.version,v 1.2 2008/10/15 01:58:53 bjs Exp $
#
-MPG123_VERSION= 1.5.1
+MPG123_DISTVERSION= 1.5.1
+###
+### This version number is found as LIBMPG123_VERSION in configure.ac.
+###
+LIBMPG123_VERSION= 0.7.0
diff -r e087d0375df2 -r b1f185fe11d6 audio/libmpg123/buildlink3.mk
--- a/audio/libmpg123/buildlink3.mk Wed Oct 15 00:57:49 2008 +0000
+++ b/audio/libmpg123/buildlink3.mk Wed Oct 15 01:58:53 2008 +0000
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/07 00:56:15 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/15 01:58:53 bjs Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-MPG123_BUILDLINK3_MK:= ${MPG123_BUILDLINK3_MK}+
+LIBMPG123_BUILDLINK3_MK:= ${LIBMPG123_BUILDLINK3_MK}+
.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= mpg123
+BUILDLINK_DEPENDS+= libmpg123
.endif
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmpg123}
-BUILDLINK_PACKAGES+= mpg123
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mpg123
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmpg123}
+BUILDLINK_PACKAGES+= libmpg123
+BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmpg123
-.if ${MPG123_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.mpg123+= mpg123>=1.5.1
-BUILDLINK_PKGSRCDIR.mpg123?= ../../audio/libmpg123
-.endif # MPG123_BUILDLINK3_MK
+.if ${LIBMPG123_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.libmpg123+= libmpg123>=0.7.0
+BUILDLINK_PKGSRCDIR.libmpg123?= ../../audio/libmpg123
+.endif # LIBMPG123_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r e087d0375df2 -r b1f185fe11d6 audio/libmpg123/mpg123-options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libmpg123/mpg123-options.mk Wed Oct 15 01:58:53 2008 +0000
@@ -0,0 +1,38 @@
+# $NetBSD: mpg123-options.mk,v 1.1 2008/10/15 01:58:53 bjs Exp $
+#
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.mpg123
+PKG_SUPPORTED_OPTIONS= inet6 debug
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "i386"
+PKG_SUPPORTED_OPTIONS+= simd
+.elif !empty(MACHINE_ARCH:Marm*)
+PKG_SUPPORTED_OPTIONS+= mpg123-arm-fixed64
+.endif
+
+PKG_SUGGESTED_OPTIONS= ${PKG_SUPPORTED_OPTIONS:S/debug//}
+
+.include "../../mk/bsd.options.mk"
+
+SIMD_CONFIGURE_ARGS.powerpc= altvec
+SIMD_CONFIGURE_ARGS.i386= x86_dither
+
+.if empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+= --with-ipv6=no
+.endif
+
+.if !empty(PKG_OPTIONS:Msimd)
+CONFIGURE_ARGS+= --with-cpu=${SIMD_CONFIGURE_ARGS.${MACHINE_ARCH}}
+.elif !empty(PKG_OPTIONS:Mmpg123-arm-fixed64)
+CONFIGURE_ARGS+= --with-cpu=generic_nofpu
+.else
+CONFIGURE_ARGS+= --with-cpu=generic_fpu
+.endif
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+= --enable-debug=yes
+.else
+CONFIGURE_ARGS+= --enable-debug=no
+.endif
diff -r e087d0375df2 -r b1f185fe11d6 audio/libmpg123/options.mk
--- a/audio/libmpg123/options.mk Wed Oct 15 00:57:49 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2008/09/19 17:49:26 ahoka Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.libmp123
-PKG_SUPPORTED_OPTIONS= inet6 debug
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "i386"
-PKG_SUPPORTED_OPTIONS+= simd
-.elif !empty(MACHINE_ARCH:Marm*)
-PKG_SUPPORTED_OPTIONS+= mpg123-arm-fixed64
-.endif
-
-PKG_SUGGESTED_OPTIONS= ${PKG_SUPPORTED_OPTIONS:S/debug//}
-
-.include "../../mk/bsd.options.mk"
-
-SIMD_CONFIGURE_ARGS.powerpc= altvec
-SIMD_CONFIGURE_ARGS.i386= x86_dither
-
-.if empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --with-ipv6=no
-.endif
-
-.if !empty(PKG_OPTIONS:Msimd)
-CONFIGURE_ARGS+= --with-cpu=${SIMD_CONFIGURE_ARGS.${MACHINE_ARCH}}
-.elif !empty(PKG_OPTIONS:Mmpg123-arm-fixed64)
-CONFIGURE_ARGS+= --with-cpu=generic_nofpu
-.else
-CONFIGURE_ARGS+= --with-cpu=generic_fpu
-.endif
-
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+= --enable-debug=yes
-.else
-CONFIGURE_ARGS+= --enable-debug=no
-.endif
Home |
Main Index |
Thread Index |
Old Index