summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsborrill <sborrill>2011-12-06 22:01:06 +0000
committersborrill <sborrill>2011-12-06 22:01:06 +0000
commit020559ab81a916a818c43745610d788b63657914 (patch)
tree5867413283ee78a9383bddc2fcb1b532448aef12
parent0a60f56dc92625d91c14bd3b85a33ebb7aaefef7 (diff)
downloadpkgsrc-020559ab81a916a818c43745610d788b63657914.tar.gz
Make x264 an option
-rw-r--r--multimedia/vlc08/PLIST4
-rw-r--r--multimedia/vlc08/options.mk14
2 files changed, 13 insertions, 5 deletions
diff --git a/multimedia/vlc08/PLIST b/multimedia/vlc08/PLIST
index 8d8a35f6cb2..9d8f64bd803 100644
--- a/multimedia/vlc08/PLIST
+++ b/multimedia/vlc08/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:08:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2011/12/06 22:01:06 sborrill Exp $
${PLIST.skins}bin/svlc
bin/vlc
bin/vlc-config
@@ -94,7 +94,7 @@ lib/vlc/codec/libsubsdec_plugin.so
lib/vlc/codec/libsvcdsub_plugin.so
lib/vlc/codec/libtelx_plugin.so
lib/vlc/codec/libvorbis_plugin.so
-lib/vlc/codec/libx264_plugin.so
+${PLIST.x264}lib/vlc/codec/libx264_plugin.so
lib/vlc/control/libgestures_plugin.so
lib/vlc/control/libhotkeys_plugin.so
lib/vlc/control/libhttp_plugin.so
diff --git a/multimedia/vlc08/options.mk b/multimedia/vlc08/options.mk
index 5a8c35fcd57..13933fc61e7 100644
--- a/multimedia/vlc08/options.mk
+++ b/multimedia/vlc08/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2009/03/13 20:11:23 kefren Exp $
+# $NetBSD: options.mk,v 1.5 2011/12/06 22:01:06 sborrill Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vlc
-PKG_SUPPORTED_OPTIONS= skins wxwidgets faad arts esound sdl x11
-PKG_SUGGESTED_OPTIONS= wxwidgets faad x11 sdl
+PKG_SUPPORTED_OPTIONS= skins wxwidgets faad arts esound sdl x11 x264
+PKG_SUGGESTED_OPTIONS= wxwidgets faad x11 sdl x264
.include "../../mk/bsd.options.mk"
@@ -39,6 +39,14 @@ PLIST.arts= yes
CONFIGURE_ARGS+= --disable-arts
.endif
+.if !empty(PKG_OPTIONS:Mx264)
+CONFIGURE_ARGS+= --enable-x264
+PLIST.x264= yes
+.include "../../multimedia/x264-devel/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-x264
+.endif
+
.if !empty(PKG_OPTIONS:Mesound)
CONFIGURE_ARGS+= --enable-esd
PLIST.esound= yes