diff options
| author | drochner <drochner@pkgsrc.org> | 2007-02-01 10:21:57 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2007-02-01 10:21:57 +0000 |
| commit | 3d27141edbc9d5f68b69e5d55855fa8919e492ef (patch) | |
| tree | 6e5d325b92f5c89c55d590d72fd1b5012fe2491e | |
| parent | fe5d9ab78ef77785202a8867b311d0a72f31a117 (diff) | |
| download | pkgsrc-3d27141edbc9d5f68b69e5d55855fa8919e492ef.tar.gz | |
Revert the update to mpcdec - this breaks both bmp-musepack and
xmms-musepack. libmusepack (1.0.x) and libmpcdec (1.2.x) are
incompatible and don't conflict, so we can have both for the time being.
| -rw-r--r-- | audio/libmusepack/Makefile | 9 | ||||
| -rw-r--r-- | audio/libmusepack/PLIST | 20 | ||||
| -rw-r--r-- | audio/libmusepack/buildlink3.mk | 4 | ||||
| -rw-r--r-- | audio/libmusepack/distinfo | 10 | ||||
| -rw-r--r-- | audio/libmusepack/patches/patch-aa | 22 |
5 files changed, 30 insertions, 35 deletions
diff --git a/audio/libmusepack/Makefile b/audio/libmusepack/Makefile index 97d4e1bce50..3a17a116e58 100644 --- a/audio/libmusepack/Makefile +++ b/audio/libmusepack/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2007/01/31 21:33:31 cbiere Exp $ +# $NetBSD: Makefile,v 1.6 2007/02/01 10:21:57 drochner Exp $ # -DISTNAME= libmpcdec-1.2.4 -PKGNAME= ${DISTNAME:S/mpcdec/musepack/} +DISTNAME= libmusepack-1.0.3 CATEGORIES= audio -MASTER_SITES= http://files.musepack.net/source/ +MASTER_SITES= http://www.saunalahti.fi/grimmel/musepack.net/source/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -12,8 +11,6 @@ HOMEPAGE= http://www.musepack.net/ COMMENT= Portable Musepack decoder library USE_LANGUAGES= c c++ -USE_LIBTOOL= yes GNU_CONFIGURE= yes -INSTALLATION_DIRS+= include/mpcdec .include "../../mk/bsd.pkg.mk" diff --git a/audio/libmusepack/PLIST b/audio/libmusepack/PLIST index 9c661eec974..e54db8e19f1 100644 --- a/audio/libmusepack/PLIST +++ b/audio/libmusepack/PLIST @@ -1,11 +1,9 @@ -@comment $NetBSD: PLIST,v 1.2 2007/01/31 21:33:31 cbiere Exp $ -include/mpcdec/config_types.h -include/mpcdec/decoder.h -include/mpcdec/huffman.h -include/mpcdec/math.h -include/mpcdec/mpcdec.h -include/mpcdec/reader.h -include/mpcdec/requant.h -include/mpcdec/streaminfo.h -lib/libmpcdec.la -@dirrm include/mpcdec +@comment $NetBSD: PLIST,v 1.3 2007/02/01 10:21:57 drochner Exp $ +include/musepack/config_types.h +include/musepack/mpc_dec.h +include/musepack/mpc_math.h +include/musepack/requant.h +include/musepack/stdafx.h +include/musepack/streaminfo.h +lib/libmusepack.la +@dirrm include/musepack diff --git a/audio/libmusepack/buildlink3.mk b/audio/libmusepack/buildlink3.mk index d1c7d13062e..4bdcbd55108 100644 --- a/audio/libmusepack/buildlink3.mk +++ b/audio/libmusepack/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2007/01/31 21:33:31 cbiere Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2007/02/01 10:21:57 drochner Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBMUSEPACK_BUILDLINK3_MK:= ${LIBMUSEPACK_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= libmusepack BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libmusepack .if !empty(LIBMUSEPACK_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.libmusepack+= libmusepack>=1.2.4 +BUILDLINK_API_DEPENDS.libmusepack+= libmusepack>=1.0.3 BUILDLINK_PKGSRCDIR.libmusepack?= ../../audio/libmusepack .endif # LIBMUSEPACK_BUILDLINK3_MK diff --git a/audio/libmusepack/distinfo b/audio/libmusepack/distinfo index b68d34aa3bf..60b2e411330 100644 --- a/audio/libmusepack/distinfo +++ b/audio/libmusepack/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2007/01/31 21:33:31 cbiere Exp $ +$NetBSD: distinfo,v 1.5 2007/02/01 10:21:58 drochner Exp $ -SHA1 (libmpcdec-1.2.4.tar.bz2) = 2522288ac1baf12854b92c219662bfc9bd88067b -RMD160 (libmpcdec-1.2.4.tar.bz2) = d2414d1cbfacbdbcd479ce6855e3e439ccb6098a -Size (libmpcdec-1.2.4.tar.bz2) = 259859 bytes -SHA1 (patch-aa) = 396ca2866b81f1e2ff106d0746e199a72635b4dd +SHA1 (libmusepack-1.0.3.tar.bz2) = 2c2bc15f960c4593bee209fed939829e82ad030c +RMD160 (libmusepack-1.0.3.tar.bz2) = 532a982c6e4af68d802812661c396a50db523c23 +Size (libmusepack-1.0.3.tar.bz2) = 226099 bytes +SHA1 (patch-aa) = e4842ead0a8eced96b59cb4ce4062557464e49bb diff --git a/audio/libmusepack/patches/patch-aa b/audio/libmusepack/patches/patch-aa index 65b6e95dac4..f98c8fcb846 100644 --- a/audio/libmusepack/patches/patch-aa +++ b/audio/libmusepack/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2007/01/31 21:33:31 cbiere Exp $ +$NetBSD: patch-aa,v 1.3 2007/02/01 10:21:58 drochner Exp $ ---- src/Makefile.in.orig 2007-01-27 03:06:04.000000000 +0100 -+++ src/Makefile.in 2007-01-27 03:06:41.000000000 +0100 -@@ -209,7 +209,7 @@ - streaminfo.c \ - synth_filter.c - --libmpcdec_la_LDFLAGS = -no-undefined -version-info 5:1:2 -+libmpcdec_la_LDFLAGS = -version-info 5:1:2 +--- src/Makefile.in.orig 2004-11-29 03:42:18.000000000 +1100 ++++ src/Makefile.in +@@ -190,7 +190,7 @@ AUTOMAKE_OPTIONS = foreign + INCLUDES = -I$(top_builddir)/include + lib_LTLIBRARIES = libmusepack.la + libmusepack_la_SOURCES = mpc_dec.cpp bitstream.cpp huffsv7.cpp stdafx.cpp synth_filter.cpp huffsv46.cpp idtag.cpp requant.cpp streaminfo.cpp +-libmusepack_la_LDFLAGS = -no-undefined -version-info 1:3:0 ++libmusepack_la_LDFLAGS = -version-info 1:3:0 sample_SOURCES = sample.cpp - sample_LDADD = libmpcdec.la - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src + sample_LDADD = libmusepack.la + all: all-am |