Attachment 109480 Details for Bug 150510 – patch-musepack-2.txt

[patch] patch-musepack-2.txt

patch-musepack-2.txt (text/plain), 8.78 KB, created by Ganael Laplanche on 2010-09-14 20:20:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael Laplanche

Created: 2010-09-14 20:20:17 UTC

Size: 8.78 KB

patch

obsolete

>diff -aurN multimedia/mplayer.orig/Makefile multimedia/mplayer/Makefile
>--- multimedia/mplayer.orig/Makefile	2010-09-14 06:06:11.242186646 +0000
>+++ multimedia/mplayer/Makefile	2010-09-14 06:07:50.575775901 +0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	mplayer
> PORTVERSION=	${MPLAYER_PORT_VERSION}
>-PORTREVISION=	1
>+PORTREVISION=	2
> COMMENT=	High performance media player supporting many formats
> 
> .include "${.CURDIR}/Makefile.shared"
>@@ -43,7 +43,6 @@
> OPTIONS+=	LIBDV "Enable libdv support" off
> OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
> OPTIONS+=	AMR "Enable opencore AMR audio codec support" off
>-OPTIONS+=	LIBMPCDEC "Enable libmpcdec support" off
> OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
> OPTIONS+=	SPEEX "Enable speex audio codec support" on
> OPTIONS+=	THEORA "Enable ogg theora video support" off
>@@ -84,7 +83,8 @@
> 			--disable-x264 \
> 			--disable-xvid \
> 			--disable-libdirac-lavc \
>-			--disable-mencoder
>+			--disable-mencoder \
>+			--disable-musepack
> 
> .include "${.CURDIR}/Makefile.options"
> 
>diff -aurN multimedia/mplayer.orig/Makefile.options multimedia/mplayer/Makefile.options
>--- multimedia/mplayer.orig/Makefile.options	2010-09-14 06:06:11.273189539 +0000
>+++ multimedia/mplayer/Makefile.options	2010-09-14 06:07:10.542748100 +0000
>@@ -96,12 +96,6 @@
> CONFIGURE_ARGS+=	--disable-libschroedinger-lavc
> .endif
> 
>-.if defined(WITH_LIBMPCDEC)
>-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
>-.else
>-CONFIGURE_ARGS+=	--disable-musepack
>-.endif
>-
> .if !defined(WITHOUT_SPEEX)
> LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
> .else
>diff -aurN sysutils/k3b.orig/Makefile sysutils/k3b/Makefile
>--- sysutils/k3b.orig/Makefile	2010-09-14 06:09:45.327751781 +0000
>+++ sysutils/k3b/Makefile	2010-09-14 06:18:39.362674515 +0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	k3b
> PORTVERSION=	1.0.5
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	sysutils multimedia kde
> MASTER_SITES=	SF
> 
>@@ -20,7 +20,10 @@
> 
> USE_BZIP2=	yes
> USE_AUTOTOOLS=	libtool:22
>-CONFIGURE_ARGS=	--with-k3bsetup=no --without-resmgr --without-hal
>+CONFIGURE_ARGS=	--with-k3bsetup=no \
>+			--without-resmgr \
>+			--without-hal \
>+			--without-musepack
> USE_GMAKE=	yes
> USE_CDRTOOLS=	yes
> USE_LDCONFIG=	yes
>@@ -30,7 +33,6 @@
> 		LAME "Add audio/lame encoder (for mp3 files)" On \
> 		FFMPEG "Add multimedia/ffmpeg decoder (for wma files)" Off \
> 		MUSICBRAINZ "Use audio/libmusicbrainz music meta database" Off \
>-		MPC "Add audio/libmpcdec decoder (for musepack file)" Off \
> 		LIBDVDREAD "Use libdvdread (for video dvd ripping)" On \
> 		DVDPLUSRW "Add DVD+RW Tools (for DVD+/-R(W) burning)" On \
> 		TRANSCODE "Add Transcode (for DVD ripping)" Off \
>@@ -88,14 +90,6 @@
> CONFIGURE_ARGS+=	--without-musicbrainz
> .endif
> 
>-.if defined(WITH_MPC)
>-PLIST_SUB+=	MPC=""
>-LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/libmpcdec
>-.else
>-PLIST_SUB+=	MPC="@comment "
>-CONFIGURE_ARGS+=	--without-musepack
>-.endif
>-
> .if defined(WITH_LIBDVDREAD)
> PLIST_SUB+=	LIBDVDREAD=""
> LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
>diff -aurN sysutils/k3b.orig/pkg-plist sysutils/k3b/pkg-plist
>--- sysutils/k3b.orig/pkg-plist	2010-09-14 06:09:45.361752121 +0000
>+++ sysutils/k3b/pkg-plist	2010-09-14 06:11:23.421328339 +0000
>@@ -160,9 +160,6 @@
> lib/kde3/libk3bmaddecoder.a
> lib/kde3/libk3bmaddecoder.la
> lib/kde3/libk3bmaddecoder.so
>-%%MPC%%lib/kde3/libk3bmpcdecoder.a
>-%%MPC%%lib/kde3/libk3bmpcdecoder.la
>-%%MPC%%lib/kde3/libk3bmpcdecoder.so
> lib/kde3/libk3boggvorbisdecoder.a
> lib/kde3/libk3boggvorbisdecoder.la
> lib/kde3/libk3boggvorbisdecoder.so
>@@ -365,7 +362,6 @@
> %%LAME%%share/apps/k3b/plugins/k3blameencoder.plugin
> share/apps/k3b/plugins/k3blibsndfiledecoder.plugin
> share/apps/k3b/plugins/k3bmaddecoder.plugin
>-%%MPC%%share/apps/k3b/plugins/k3bmpcdecoder.plugin
> share/apps/k3b/plugins/k3boggvorbisdecoder.plugin
> share/apps/k3b/plugins/k3boggvorbisencoder.plugin
> share/apps/k3b/plugins/k3bsoxencoder.plugin
>diff -aurN multimedia/gmerlin-avdecoder.orig/Makefile multimedia/gmerlin-avdecoder/Makefile
>--- multimedia/gmerlin-avdecoder.orig/Makefile	2010-09-14 06:14:11.154766457 +0000
>+++ multimedia/gmerlin-avdecoder/Makefile	2010-09-14 06:16:03.316649113 +0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	gmerlin-avdecoder
> PORTVERSION=	1.0.1
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
> 
>@@ -18,7 +18,9 @@
> 
> GNU_CONFIGURE=	yes
> USE_GETTEXT=	yes
>-CONFIGURE_ARGS=	--without-cpuflags --without-doxygen
>+CONFIGURE_ARGS=	--without-cpuflags \
>+			--without-doxygen \
>+			--disable-musepack
> USE_GNOME=	gnomehack pkgconfig
> USE_LDCONFIG=	yes
> 
>@@ -39,7 +41,6 @@
> 		FAAD	"Enabled FAAD2 support" on \
> 		DVDREAD "Enable libdvdread support" on \
> 		FLAC	"Enable FLAC support" on \
>-		MUSEPACK "Enable musepack (mpc) support" on \
> 		MAD	"Enable mp3 support" on \
> 		A52	"Enable A52 support" on \
> 		DCA	"Enable DTS Coherent Acoustics decoder" on \
>@@ -144,12 +145,6 @@
> CONFIGURE_ARGS+=--disable-flac
> .endif
> 
>-.if !defined(WITHOUT_MUSEPACK)
>-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
>-.else
>-CONFIGURE_ARGS+=--disable-musepack
>-.endif
>-
> .if !defined(WITHOUT_MAD)
> LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
> .else
>diff -aurN audio/cynthiune.orig/Makefile audio/cynthiune/Makefile
>--- audio/cynthiune.orig/Makefile	2010-09-14 06:21:22.728276778 +0000
>+++ audio/cynthiune/Makefile	2010-09-14 06:26:07.327540790 +0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	cynthiune
> PORTVERSION=	0.9.5
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	audio gnustep
> MASTER_SITES=	${MASTER_SITE_DEBIAN}
> MASTER_SITE_SUBDIR=	pool/main/c/cynthiune.app
>@@ -18,7 +18,6 @@
> 
> LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
> LIB_DEPENDS+=	tag.1:${PORTSDIR}/audio/taglib
>-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
> LIB_DEPENDS+=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
> LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug
> LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
>@@ -37,6 +36,6 @@
> ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include/libmodplug
> ADDITIONAL_LIB_DIRS+=	-L${WRKSRC}/Frameworks/Cynthiune/Cynthiune.framework/Versions/Current
> MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
>-MAKE_FLAGS=	disable-windowsmedia=yes debug=no
>+MAKE_FLAGS=	disable-windowsmedia=yes disable-musepack=yes debug=no
> 
> .include <bsd.port.mk>
>diff -aurN audio/cynthiune.orig/pkg-plist audio/cynthiune/pkg-plist
>--- audio/cynthiune.orig/pkg-plist	2010-09-14 06:21:22.745277332 +0000
>+++ audio/cynthiune/pkg-plist	2010-09-14 06:28:20.867151970 +0000
>@@ -99,9 +99,6 @@
> GNUstep/Local/Library/Cynthiune/Mod.format/Mod
> GNUstep/Local/Library/Cynthiune/Mod.format/Resources/Info-gnustep.plist
> GNUstep/Local/Library/Cynthiune/Mod.format/stamp.make
>-GNUstep/Local/Library/Cynthiune/Musepack.format/Musepack
>-GNUstep/Local/Library/Cynthiune/Musepack.format/Resources/Info-gnustep.plist
>-GNUstep/Local/Library/Cynthiune/Musepack.format/stamp.make
> GNUstep/Local/Library/Cynthiune/OSS.output/OSS
> GNUstep/Local/Library/Cynthiune/OSS.output/Resources/English.lproj/Localizable.strings
> GNUstep/Local/Library/Cynthiune/OSS.output/Resources/French.lproj/Localizable.strings
>@@ -173,8 +170,6 @@
> @dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources/English.lproj
> @dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources
> @dirrm GNUstep/Local/Library/Cynthiune/OSS.output
>-@dirrm GNUstep/Local/Library/Cynthiune/Musepack.format/Resources
>-@dirrm GNUstep/Local/Library/Cynthiune/Musepack.format
> @dirrm GNUstep/Local/Library/Cynthiune/Mod.format/Resources
> @dirrm GNUstep/Local/Library/Cynthiune/Mod.format
> @dirrm GNUstep/Local/Library/Cynthiune/MP3.format/Resources
>diff -aurN audio/bmp-musepack.orig/Makefile audio/bmp-musepack/Makefile
>--- audio/bmp-musepack.orig/Makefile	2010-09-14 07:38:00.408208724 +0000
>+++ audio/bmp-musepack/Makefile	2010-09-14 07:41:50.764376058 +0000
>@@ -15,6 +15,9 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Musepack decoder for beep-media-player
> 
>+DEPRECATED=	Does not build with audio/musepack
>+EXPIRATION_DATE=2010-11-15
>+
> LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player \
> 		mpcdec:${PORTSDIR}/audio/libmpcdec \
> 		tag:${PORTSDIR}/audio/taglib
>diff -aurN audio/py-musepack.orig/Makefile audio/py-musepack/Makefile
>--- audio/py-musepack.orig/Makefile	2010-09-14 07:38:07.523411075 +0000
>+++ audio/py-musepack/Makefile	2010-09-14 07:42:07.621840624 +0000
>@@ -15,6 +15,9 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Python module that provides the Musepack decoding interface
> 
>+DEPRECATED=	Does not build with audio/musepack
>+EXPIRATION_DATE=2010-11-15
>+
> LIB_DEPENDS=	mpcdec:${PORTSDIR}/audio/libmpcdec
> 
> USE_PYTHON=	yes
>diff -aurN audio/libmpcdec.orig/Makefile audio/libmpcdec/Makefile
>--- audio/libmpcdec.orig/Makefile	2010-09-14 07:38:20.182750461 +0000
>+++ audio/libmpcdec/Makefile	2010-09-14 07:41:02.546017859 +0000
>@@ -13,6 +13,9 @@
> MAINTAINER=	multimedia@FreeBSD.org
> COMMENT=	High quality audio compression format
> 
>+DEPRECATED=	Replaced by audio/musepack
>+EXPIRATION_DATE=2010-11-15
>+
> CONFLICTS=	musepack-[0-9]*
> 
> USE_BZIP2=	yes

Actions: View | Diff

Attachments on bug 150510: 109479 | 109480 | 109481 | 109482