diff options
| author | shattered <shattered@pkgsrc.org> | 2011-09-12 21:50:38 +0000 |
|---|---|---|
| committer | shattered <shattered@pkgsrc.org> | 2011-09-12 21:50:38 +0000 |
| commit | d2370867eb293a02f7adba184f4c389a9fb13572 (patch) | |
| tree | ec4720f3a73491c8754e4dd39214fad9b795d84a /multimedia | |
| parent | be07c276c6b100962173d65498cf527e33e5632d (diff) | |
| download | pkgsrc-d2370867eb293a02f7adba184f4c389a9fb13572.tar.gz | |
PR/42810 -- make libdca support optional due to its RESTRICTED nature.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/vlc/PLIST | 4 | ||||
| -rw-r--r-- | multimedia/vlc/options.mk | 14 |
3 files changed, 17 insertions, 8 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index a8ffa0ba2bc..19b0fcab6a8 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.116 2011/09/12 17:25:28 drochner Exp $ +# $NetBSD: Makefile,v 1.117 2011/09/12 21:50:38 shattered Exp $ # DISTNAME= vlc-${VLC_VERSION} +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \ http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ @@ -44,8 +45,7 @@ BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch [1.2 in pkgsrc] CONFIGURE_ARGS+= --disable-smb -CONFIGURE_ARGS+= --enable-cddax \ - --enable-dvdread \ +CONFIGURE_ARGS+= --enable-dvdread \ --enable-flac \ --enable-live555 \ --enable-theora \ @@ -123,7 +123,6 @@ CHECK_WRKREF_SKIP= lib/libvlccore.a \ .include "../../audio/liba52/buildlink3.mk" .include "../../audio/libcddb/buildlink3.mk" .include "../../audio/libid3tag/buildlink3.mk" -.include "../../audio/libdca/buildlink3.mk" .include "../../audio/taglib/buildlink3.mk" .include "../../audio/libcddb/buildlink3.mk" .include "../../misc/libcdio/buildlink3.mk" diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST index ce776c55255..91f2c53e733 100644 --- a/multimedia/vlc/PLIST +++ b/multimedia/vlc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.42 2011/06/07 13:59:17 drochner Exp $ +@comment $NetBSD: PLIST,v 1.43 2011/09/12 21:50:38 shattered Exp $ bin/cvlc ${PLIST.x11}bin/qvlc bin/rvlc @@ -118,7 +118,7 @@ lib/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.la lib/vlc/plugins/audio_filter/libchorus_flanger_plugin.la lib/vlc/plugins/audio_filter/libconverter_fixed_plugin.la lib/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.la -lib/vlc/plugins/audio_filter/libdtstofloat32_plugin.la +${PLIST.dts}lib/vlc/plugins/audio_filter/libdtstofloat32_plugin.la lib/vlc/plugins/audio_filter/libdtstospdif_plugin.la lib/vlc/plugins/audio_filter/libequalizer_plugin.la lib/vlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.la diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk index 39782baca50..1a3b2b9ebe6 100644 --- a/multimedia/vlc/options.mk +++ b/multimedia/vlc/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.21 2011/04/06 08:14:21 sborrill Exp $ +# $NetBSD: options.mk,v 1.22 2011/09/12 21:50:38 shattered Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vlc -PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl pulseaudio x11 gnome +PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl pulseaudio x11 gnome dts PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" @@ -131,3 +131,13 @@ PLIST.faad= yes .else CONFIGURE_ARGS+= --disable-faad .endif + +## DTS support (libdca is non-redistributable) + +.if !empty(PKG_OPTIONS:Mdts) +CONFIGURE_ARGS+= --enable-libdca +PLIST.dts= yes +. include "../../audio/libdca/buildlink3.mk" +.else +CONFIGURE_ARGS+= --enable-libdca=no +.endif |