View | Details | Raw Unified | Return to bug 150510 | Differences between
and this patch

Collapse All | Expand All

(-)multimedia/mplayer/Makefile (-3 / +3 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	mplayer
8
PORTNAME=	mplayer
9
PORTVERSION=	${MPLAYER_PORT_VERSION}
9
PORTVERSION=	${MPLAYER_PORT_VERSION}
10
PORTREVISION=	1
10
PORTREVISION=	2
11
COMMENT=	High performance media player supporting many formats
11
COMMENT=	High performance media player supporting many formats
12
12
13
.include "${.CURDIR}/Makefile.shared"
13
.include "${.CURDIR}/Makefile.shared"
Lines 43-49 Link Here
43
OPTIONS+=	LIBDV "Enable libdv support" off
43
OPTIONS+=	LIBDV "Enable libdv support" off
44
OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
44
OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
45
OPTIONS+=	AMR "Enable opencore AMR audio codec support" off
45
OPTIONS+=	AMR "Enable opencore AMR audio codec support" off
46
OPTIONS+=	LIBMPCDEC "Enable libmpcdec support" off
47
OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
46
OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
48
OPTIONS+=	SPEEX "Enable speex audio codec support" on
47
OPTIONS+=	SPEEX "Enable speex audio codec support" on
49
OPTIONS+=	THEORA "Enable ogg theora video support" off
48
OPTIONS+=	THEORA "Enable ogg theora video support" off
Lines 84-90 Link Here
84
			--disable-x264 \
83
			--disable-x264 \
85
			--disable-xvid \
84
			--disable-xvid \
86
			--disable-libdirac-lavc \
85
			--disable-libdirac-lavc \
87
			--disable-mencoder
86
			--disable-mencoder \
87
			--disable-musepack
88
88
89
.include "${.CURDIR}/Makefile.options"
89
.include "${.CURDIR}/Makefile.options"
90
90
(-)multimedia/mplayer/Makefile.options (-6 lines)
Lines 96-107 Link Here
96
CONFIGURE_ARGS+=	--disable-libschroedinger-lavc
96
CONFIGURE_ARGS+=	--disable-libschroedinger-lavc
97
.endif
97
.endif
98
98
99
.if defined(WITH_LIBMPCDEC)
100
LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
101
.else
102
CONFIGURE_ARGS+=	--disable-musepack
103
.endif
104
105
.if !defined(WITHOUT_SPEEX)
99
.if !defined(WITHOUT_SPEEX)
106
LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
100
LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
107
.else
101
.else
(-)sysutils/k3b/Makefile (-11 / +5 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	k3b
8
PORTNAME=	k3b
9
PORTVERSION=	1.0.5
9
PORTVERSION=	1.0.5
10
PORTREVISION=	8
10
PORTREVISION=	9
11
CATEGORIES=	sysutils multimedia kde
11
CATEGORIES=	sysutils multimedia kde
12
MASTER_SITES=	SF
12
MASTER_SITES=	SF
13
13
Lines 20-26 Link Here
20
20
21
USE_BZIP2=	yes
21
USE_BZIP2=	yes
22
USE_AUTOTOOLS=	libtool:22
22
USE_AUTOTOOLS=	libtool:22
23
CONFIGURE_ARGS=	--with-k3bsetup=no --without-resmgr --without-hal
23
CONFIGURE_ARGS=	--with-k3bsetup=no \
24
			--without-resmgr \
25
			--without-hal \
26
			--without-musepack
24
USE_GMAKE=	yes
27
USE_GMAKE=	yes
25
USE_CDRTOOLS=	yes
28
USE_CDRTOOLS=	yes
26
USE_LDCONFIG=	yes
29
USE_LDCONFIG=	yes
Lines 30-36 Link Here
30
		LAME "Add audio/lame encoder (for mp3 files)" On \
33
		LAME "Add audio/lame encoder (for mp3 files)" On \
31
		FFMPEG "Add multimedia/ffmpeg decoder (for wma files)" Off \
34
		FFMPEG "Add multimedia/ffmpeg decoder (for wma files)" Off \
32
		MUSICBRAINZ "Use audio/libmusicbrainz music meta database" Off \
35
		MUSICBRAINZ "Use audio/libmusicbrainz music meta database" Off \
33
		MPC "Add audio/libmpcdec decoder (for musepack file)" Off \
34
		LIBDVDREAD "Use libdvdread (for video dvd ripping)" On \
36
		LIBDVDREAD "Use libdvdread (for video dvd ripping)" On \
35
		DVDPLUSRW "Add DVD+RW Tools (for DVD+/-R(W) burning)" On \
37
		DVDPLUSRW "Add DVD+RW Tools (for DVD+/-R(W) burning)" On \
36
		TRANSCODE "Add Transcode (for DVD ripping)" Off \
38
		TRANSCODE "Add Transcode (for DVD ripping)" Off \
Lines 88-101 Link Here
88
CONFIGURE_ARGS+=	--without-musicbrainz
90
CONFIGURE_ARGS+=	--without-musicbrainz
89
.endif
91
.endif
90
92
91
.if defined(WITH_MPC)
92
PLIST_SUB+=	MPC=""
93
LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/libmpcdec
94
.else
95
PLIST_SUB+=	MPC="@comment "
96
CONFIGURE_ARGS+=	--without-musepack
97
.endif
98
99
.if defined(WITH_LIBDVDREAD)
93
.if defined(WITH_LIBDVDREAD)
100
PLIST_SUB+=	LIBDVDREAD=""
94
PLIST_SUB+=	LIBDVDREAD=""
101
LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
95
LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
(-)sysutils/k3b/pkg-plist (-4 lines)
Lines 160-168 Link Here
160
lib/kde3/libk3bmaddecoder.a
160
lib/kde3/libk3bmaddecoder.a
161
lib/kde3/libk3bmaddecoder.la
161
lib/kde3/libk3bmaddecoder.la
162
lib/kde3/libk3bmaddecoder.so
162
lib/kde3/libk3bmaddecoder.so
163
%%MPC%%lib/kde3/libk3bmpcdecoder.a
164
%%MPC%%lib/kde3/libk3bmpcdecoder.la
165
%%MPC%%lib/kde3/libk3bmpcdecoder.so
166
lib/kde3/libk3boggvorbisdecoder.a
163
lib/kde3/libk3boggvorbisdecoder.a
167
lib/kde3/libk3boggvorbisdecoder.la
164
lib/kde3/libk3boggvorbisdecoder.la
168
lib/kde3/libk3boggvorbisdecoder.so
165
lib/kde3/libk3boggvorbisdecoder.so
Lines 365-371 Link Here
365
%%LAME%%share/apps/k3b/plugins/k3blameencoder.plugin
362
%%LAME%%share/apps/k3b/plugins/k3blameencoder.plugin
366
share/apps/k3b/plugins/k3blibsndfiledecoder.plugin
363
share/apps/k3b/plugins/k3blibsndfiledecoder.plugin
367
share/apps/k3b/plugins/k3bmaddecoder.plugin
364
share/apps/k3b/plugins/k3bmaddecoder.plugin
368
%%MPC%%share/apps/k3b/plugins/k3bmpcdecoder.plugin
369
share/apps/k3b/plugins/k3boggvorbisdecoder.plugin
365
share/apps/k3b/plugins/k3boggvorbisdecoder.plugin
370
share/apps/k3b/plugins/k3boggvorbisencoder.plugin
366
share/apps/k3b/plugins/k3boggvorbisencoder.plugin
371
share/apps/k3b/plugins/k3bsoxencoder.plugin
367
share/apps/k3b/plugins/k3bsoxencoder.plugin
(-)multimedia/gmerlin-avdecoder/Makefile (-9 / +4 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	gmerlin-avdecoder
8
PORTNAME=	gmerlin-avdecoder
9
PORTVERSION=	1.0.1
9
PORTVERSION=	1.0.1
10
PORTREVISION=	8
10
PORTREVISION=	9
11
CATEGORIES=	multimedia
11
CATEGORIES=	multimedia
12
MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
12
MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
13
13
Lines 18-24 Link Here
18
18
19
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
20
USE_GETTEXT=	yes
20
USE_GETTEXT=	yes
21
CONFIGURE_ARGS=	--without-cpuflags --without-doxygen
21
CONFIGURE_ARGS=	--without-cpuflags \
22
			--without-doxygen \
23
			--disable-musepack
22
USE_GNOME=	gnomehack pkgconfig
24
USE_GNOME=	gnomehack pkgconfig
23
USE_LDCONFIG=	yes
25
USE_LDCONFIG=	yes
24
26
Lines 39-45 Link Here
39
		FAAD	"Enabled FAAD2 support" on \
41
		FAAD	"Enabled FAAD2 support" on \
40
		DVDREAD "Enable libdvdread support" on \
42
		DVDREAD "Enable libdvdread support" on \
41
		FLAC	"Enable FLAC support" on \
43
		FLAC	"Enable FLAC support" on \
42
		MUSEPACK "Enable musepack (mpc) support" on \
43
		MAD	"Enable mp3 support" on \
44
		MAD	"Enable mp3 support" on \
44
		A52	"Enable A52 support" on \
45
		A52	"Enable A52 support" on \
45
		DCA	"Enable DTS Coherent Acoustics decoder" on \
46
		DCA	"Enable DTS Coherent Acoustics decoder" on \
Lines 144-155 Link Here
144
CONFIGURE_ARGS+=--disable-flac
145
CONFIGURE_ARGS+=--disable-flac
145
.endif
146
.endif
146
147
147
.if !defined(WITHOUT_MUSEPACK)
148
LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
149
.else
150
CONFIGURE_ARGS+=--disable-musepack
151
.endif
152
153
.if !defined(WITHOUT_MAD)
148
.if !defined(WITHOUT_MAD)
154
LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
149
LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
155
.else
150
.else
(-)audio/cynthiune/Makefile (-3 / +2 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	cynthiune
8
PORTNAME=	cynthiune
9
PORTVERSION=	0.9.5
9
PORTVERSION=	0.9.5
10
PORTREVISION=	8
10
PORTREVISION=	9
11
CATEGORIES=	audio gnustep
11
CATEGORIES=	audio gnustep
12
MASTER_SITES=	${MASTER_SITE_DEBIAN}
12
MASTER_SITES=	${MASTER_SITE_DEBIAN}
13
MASTER_SITE_SUBDIR=	pool/main/c/cynthiune.app
13
MASTER_SITE_SUBDIR=	pool/main/c/cynthiune.app
Lines 18-24 Link Here
18
18
19
LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
19
LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
20
LIB_DEPENDS+=	tag.1:${PORTSDIR}/audio/taglib
20
LIB_DEPENDS+=	tag.1:${PORTSDIR}/audio/taglib
21
LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
22
LIB_DEPENDS+=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
21
LIB_DEPENDS+=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
23
LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug
22
LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug
24
LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
23
LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
Lines 37-42 Link Here
37
ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include/libmodplug
36
ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include/libmodplug
38
ADDITIONAL_LIB_DIRS+=	-L${WRKSRC}/Frameworks/Cynthiune/Cynthiune.framework/Versions/Current
37
ADDITIONAL_LIB_DIRS+=	-L${WRKSRC}/Frameworks/Cynthiune/Cynthiune.framework/Versions/Current
39
MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
38
MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
40
MAKE_FLAGS=	disable-windowsmedia=yes debug=no
39
MAKE_FLAGS=	disable-windowsmedia=yes disable-musepack=yes debug=no
41
40
42
.include <bsd.port.mk>
41
.include <bsd.port.mk>
(-)audio/cynthiune/pkg-plist (-5 lines)
Lines 99-107 Link Here
99
GNUstep/Local/Library/Cynthiune/Mod.format/Mod
99
GNUstep/Local/Library/Cynthiune/Mod.format/Mod
100
GNUstep/Local/Library/Cynthiune/Mod.format/Resources/Info-gnustep.plist
100
GNUstep/Local/Library/Cynthiune/Mod.format/Resources/Info-gnustep.plist
101
GNUstep/Local/Library/Cynthiune/Mod.format/stamp.make
101
GNUstep/Local/Library/Cynthiune/Mod.format/stamp.make
102
GNUstep/Local/Library/Cynthiune/Musepack.format/Musepack
103
GNUstep/Local/Library/Cynthiune/Musepack.format/Resources/Info-gnustep.plist
104
GNUstep/Local/Library/Cynthiune/Musepack.format/stamp.make
105
GNUstep/Local/Library/Cynthiune/OSS.output/OSS
102
GNUstep/Local/Library/Cynthiune/OSS.output/OSS
106
GNUstep/Local/Library/Cynthiune/OSS.output/Resources/English.lproj/Localizable.strings
103
GNUstep/Local/Library/Cynthiune/OSS.output/Resources/English.lproj/Localizable.strings
107
GNUstep/Local/Library/Cynthiune/OSS.output/Resources/French.lproj/Localizable.strings
104
GNUstep/Local/Library/Cynthiune/OSS.output/Resources/French.lproj/Localizable.strings
Lines 173-180 Link Here
173
@dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources/English.lproj
170
@dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources/English.lproj
174
@dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources
171
@dirrm GNUstep/Local/Library/Cynthiune/OSS.output/Resources
175
@dirrm GNUstep/Local/Library/Cynthiune/OSS.output
172
@dirrm GNUstep/Local/Library/Cynthiune/OSS.output
176
@dirrm GNUstep/Local/Library/Cynthiune/Musepack.format/Resources
177
@dirrm GNUstep/Local/Library/Cynthiune/Musepack.format
178
@dirrm GNUstep/Local/Library/Cynthiune/Mod.format/Resources
173
@dirrm GNUstep/Local/Library/Cynthiune/Mod.format/Resources
179
@dirrm GNUstep/Local/Library/Cynthiune/Mod.format
174
@dirrm GNUstep/Local/Library/Cynthiune/Mod.format
180
@dirrm GNUstep/Local/Library/Cynthiune/MP3.format/Resources
175
@dirrm GNUstep/Local/Library/Cynthiune/MP3.format/Resources
(-)audio/bmp-musepack/Makefile (+3 lines)
Lines 15-20 Link Here
15
MAINTAINER=	ports@FreeBSD.org
15
MAINTAINER=	ports@FreeBSD.org
16
COMMENT=	Musepack decoder for beep-media-player
16
COMMENT=	Musepack decoder for beep-media-player
17
17
18
DEPRECATED=	Does not build with audio/musepack
19
EXPIRATION_DATE=2010-11-15
20
18
LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player \
21
LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player \
19
		mpcdec:${PORTSDIR}/audio/libmpcdec \
22
		mpcdec:${PORTSDIR}/audio/libmpcdec \
20
		tag:${PORTSDIR}/audio/taglib
23
		tag:${PORTSDIR}/audio/taglib
(-)audio/py-musepack/Makefile (+3 lines)
Lines 15-20 Link Here
15
MAINTAINER=	ports@FreeBSD.org
15
MAINTAINER=	ports@FreeBSD.org
16
COMMENT=	Python module that provides the Musepack decoding interface
16
COMMENT=	Python module that provides the Musepack decoding interface
17
17
18
DEPRECATED=	Does not build with audio/musepack
19
EXPIRATION_DATE=2010-11-15
20
18
LIB_DEPENDS=	mpcdec:${PORTSDIR}/audio/libmpcdec
21
LIB_DEPENDS=	mpcdec:${PORTSDIR}/audio/libmpcdec
19
22
20
USE_PYTHON=	yes
23
USE_PYTHON=	yes
(-)audio/libmpcdec/Makefile (+3 lines)
Lines 13-18 Link Here
13
MAINTAINER=	multimedia@FreeBSD.org
13
MAINTAINER=	multimedia@FreeBSD.org
14
COMMENT=	High quality audio compression format
14
COMMENT=	High quality audio compression format
15
15
16
DEPRECATED=	Replaced by audio/musepack
17
EXPIRATION_DATE=2010-11-15
18
16
CONFLICTS=	musepack-[0-9]*
19
CONFLICTS=	musepack-[0-9]*
17
20
18
USE_BZIP2=	yes
21
USE_BZIP2=	yes

Return to bug 150510