diff options
| author | drochner <drochner> | 2012-01-10 12:37:32 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2012-01-10 12:37:32 +0000 |
| commit | 940e5a2909f9f84ec47f495134c2f3e7a523b7f1 (patch) | |
| tree | fefc93831bb313aca7b66839179ca63d9327752f /multimedia/vlc | |
| parent | 25f124993e25f1b89b03287882050545fc693369 (diff) | |
| download | pkgsrc-940e5a2909f9f84ec47f495134c2f3e7a523b7f1.tar.gz | |
fix PLIST in the !x11 case, from B.ICT A.P. deBROUWER Jr. per PR pkg/45810
Thomas's problem might be modular-vs-native-x11 related. To address this,
I've explicitely disabled freetype in the !x11 case so that a native
one doesn't get picked up.
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/PLIST | 4 | ||||
| -rw-r--r-- | multimedia/vlc/options.mk | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST index 2a569db9905..bfb9a17f81e 100644 --- a/multimedia/vlc/PLIST +++ b/multimedia/vlc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.48 2012/01/09 17:12:57 drochner Exp $ +@comment $NetBSD: PLIST,v 1.49 2012/01/10 12:37:32 drochner Exp $ bin/cvlc ${PLIST.x11}bin/qvlc bin/rvlc @@ -319,7 +319,7 @@ lib/vlc/plugins/video_filter/libmosaic_plugin.la lib/vlc/plugins/video_filter/libmotionblur_plugin.la lib/vlc/plugins/video_filter/libmotiondetect_plugin.la lib/vlc/plugins/video_filter/libnoise_plugin.la -lib/vlc/plugins/video_filter/libosdmenu_plugin.la +${PLIST.x11}lib/vlc/plugins/video_filter/libosdmenu_plugin.la ${PLIST.x11}lib/vlc/plugins/video_filter/libpanoramix_plugin.la lib/vlc/plugins/video_filter/libpostproc_plugin.la lib/vlc/plugins/video_filter/libpsychedelic_plugin.la diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk index 1a3b2b9ebe6..578c8a7da25 100644 --- a/multimedia/vlc/options.mk +++ b/multimedia/vlc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.22 2011/09/12 21:50:38 shattered Exp $ +# $NetBSD: options.mk,v 1.23 2012/01/10 12:37:32 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vlc PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl pulseaudio x11 gnome dts @@ -119,6 +119,7 @@ CONFIGURE_ARGS+= --without-x \ --disable-xcb \ --disable-qt4 \ --disable-glx \ + --disable-freetype \ --disable-snapshot .endif @@ -135,9 +136,9 @@ CONFIGURE_ARGS+= --disable-faad ## DTS support (libdca is non-redistributable) .if !empty(PKG_OPTIONS:Mdts) -CONFIGURE_ARGS+= --enable-libdca +CONFIGURE_ARGS+= --enable-dca PLIST.dts= yes . include "../../audio/libdca/buildlink3.mk" .else -CONFIGURE_ARGS+= --enable-libdca=no +CONFIGURE_ARGS+= --enable-dca=no .endif |