Subject: Re: MOC and musepack
To: None <pkgsrc-users@netbsd.org>
From: Christian Biere <christianbiere@gmx.de>
List: pkgsrc-users
Date: 01/27/2007 04:50:16
--TakKZr9L6Hm6aLOc
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Christian Biere wrote:
> Gergo Szakal wrote:
> > Damn, audio/musicpd builds without musepack support as well. I don't even see
> > any musepack-related dependency in pkgsrc. Why is this?
> Nobody missed it, I guess. The attached patches
I meant this one.
--
Christian
--TakKZr9L6Hm6aLOc
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="mpc.udif"
Index: audio/libmusepack/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libmusepack/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- audio/libmusepack/Makefile 22 Jul 2006 04:46:14 -0000 1.4
+++ audio/libmusepack/Makefile 27 Jan 2007 03:34:33 -0000
@@ -1,9 +1,10 @@
# $NetBSD: Makefile,v 1.4 2006/07/22 04:46:14 rillig Exp $
#
-DISTNAME= libmusepack-1.0.3
+DISTNAME= libmpcdec-1.2.4
+PKGNAME= ${DISTNAME:S/mpcdec/musepack/}
CATEGORIES= audio
-MASTER_SITES= http://www.saunalahti.fi/grimmel/musepack.net/source/
+MASTER_SITES= http://files.musepack.net/source/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -11,6 +12,8 @@ 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"
Index: audio/libmusepack/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libmusepack/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- audio/libmusepack/PLIST 4 Dec 2004 20:28:31 -0000 1.1.1.1
+++ audio/libmusepack/PLIST 27 Jan 2007 03:34:33 -0000
@@ -1,9 +1,11 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/04 20:28:31 wiz 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
+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
Index: audio/libmusepack/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libmusepack/buildlink3.mk,v
retrieving revision 1.5
diff -u -p -r1.5 buildlink3.mk
--- audio/libmusepack/buildlink3.mk 8 Jul 2006 23:10:36 -0000 1.5
+++ audio/libmusepack/buildlink3.mk 27 Jan 2007 03:34:33 -0000
@@ -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.0.3
+BUILDLINK_API_DEPENDS.libmusepack+= libmusepack>=1.2.4
BUILDLINK_PKGSRCDIR.libmusepack?= ../../audio/libmusepack
.endif # LIBMUSEPACK_BUILDLINK3_MK
Index: audio/libmusepack/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libmusepack/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- audio/libmusepack/distinfo 31 Jul 2005 03:29:50 -0000 1.3
+++ audio/libmusepack/distinfo 27 Jan 2007 03:34:33 -0000
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.3 2005/07/31 03:29:50 grant Exp $
-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
+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
Index: audio/libmusepack/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libmusepack/patches/patch-aa,v
retrieving revision 1.1
diff -u -p -r1.1 patch-aa
--- audio/libmusepack/patches/patch-aa 31 Jul 2005 03:29:50 -0000 1.1
+++ audio/libmusepack/patches/patch-aa 27 Jan 2007 03:34:33 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2005/07/31 03:29:50 grant Exp $
+$NetBSD$
---- 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
+--- 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
sample_SOURCES = sample.cpp
- sample_LDADD = libmusepack.la
- all: all-am
+ sample_LDADD = libmpcdec.la
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
Index: audio/musicpd/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/musicpd/options.mk,v
retrieving revision 1.5
diff -u -p -r1.5 options.mk
--- audio/musicpd/options.mk 22 Nov 2005 00:01:40 -0000 1.5
+++ audio/musicpd/options.mk 27 Jan 2007 03:34:43 -0000
@@ -1,8 +1,8 @@
# $NetBSD: options.mk,v 1.5 2005/11/22 00:01:40 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS= aac audiofile flac iconv id3 libmikmod ogg
-PKG_SUGGESTED_OPTIONS= aac audiofile flac iconv id3 libmikmod ogg
+PKG_SUPPORTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg
+PKG_SUGGESTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg
.include "../../mk/bsd.options.mk"
@@ -49,6 +49,14 @@ CONFIGURE_ARGS+= --with-libmikmod=${BUIL
CONFIGURE_ARGS+= --disable-libmikmod
.endif
+.if !empty(PKG_OPTIONS:Mmusepack)
+. include "../../audio/libmusepack/buildlink3.mk"
+CONFIGURE_ENV+= mpcdec_prefix=${BUILDLINK_PREFIX.libmusepack}
+CONFIGURE_ARGS+= --enable-mpc
+.else
+CONFIGURE_ARGS+= --disable-mpc
+.endif
+
.if !empty(PKG_OPTIONS:Mogg)
. include "../../audio/libvorbis/buildlink3.mk"
CONFIGURE_ARGS+= --with-ogg=${BUILDLINK_PREFIX.libvorbis}
--TakKZr9L6Hm6aLOc--