[94317] trunk/dports/multimedia/VLC/Portfile

[jeremyhu at macports.org]

Revision: 94317
          https://trac.macports.org/changeset/94317
Author:   jeremyhu at macports.org
Date:     2012-06-15 01:19:04 -0700 (Fri, 15 Jun 2012)
Log Message:
-----------
VLC: In the interest of port simplicity, move some default variants (dvd, x264, theora, twolame) to always-on

Modified Paths:
--------------
    trunk/dports/multimedia/VLC/Portfile

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2012-06-15 04:42:03 UTC (rev 94316)
+++ trunk/dports/multimedia/VLC/Portfile	2012-06-15 08:19:04 UTC (rev 94317)
@@ -46,7 +46,9 @@
                 port:libdca port:libcddb port:libcdio port:libmad \
                 port:libvorbis port:libmatroska port:libid3tag \
                 port:ncurses port:lua port:libpng port:jpeg \
-                port:gnutls port:taglib port:libxml2 port:faad2
+                port:gnutls port:taglib port:libxml2 port:faad2 \
+                port:x264 port:libtheora port:twolame \
+                port:libdvdnav port:libdvdread
 
 # TODO: port:live555
 
@@ -112,7 +114,7 @@
 
 # Input Plugins
 configure.args-append \
-    --disable-dvdnav --disable-dvdread --disable-smb --disable-vcdx \
+    --enable-dvdnav --enable-dvdread --disable-smb --disable-vcdx \
     --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
     --enable-sftp
 
@@ -125,8 +127,8 @@
 configure.args-append \
     --enable-a52 --enable-faad --enable-flac --disable-live555 \
     --enable-vorbis --enable-ogg --enable-mad --disable-libass \
-    --enable-dca --enable-png --disable-quicktime --disable-twolame \
-    --disable-speex --disable-theora --disable-x264 --disable-postproc \
+    --enable-dca --enable-png --disable-quicktime --enable-twolame \
+    --disable-speex --enable-theora --enable-x264 --disable-postproc \
     --disable-avcodec --disable-avformat --disable-swscale 
 
 # Video Plugins
@@ -174,24 +176,6 @@
     configure.args-append --enable-macosx-eyetv
 }
 
-variant x264 description {Enable H.264 en/decoding} {
-    depends_lib-append      port:x264
-    configure.args-delete   --disable-x264
-    configure.args-append   --enable-x264
-}
-
-variant theora description {Enable OggTheora support} {
-    depends_lib-append      port:libtheora
-    configure.args-delete   --disable-theora
-    configure.args-append   --enable-theora
-}
-
-variant twolame description {Enable MPEG Audio Layer 2 encoding} {
-    depends_lib-append      port:twolame
-    configure.args-delete   --disable-twolame
-    configure.args-append   --enable-twolame
-}
-
 variant speex description {Enable Speex decoder support} {
     depends_lib-append      path:lib/libspeex.dylib:speex
     configure.args-delete   --disable-speex
@@ -265,12 +249,6 @@
     configure.ldflags-append    -L${prefix}/lib/samba3
 }
 
-variant dvd description {Enable DVD and DeCSS support} {
-    depends_lib-append      port:libdvdnav port:libdvdread
-    configure.args-delete   --disable-dvdnav --disable-dvdread
-    configure.args-append   --enable-dvdnav --enable-dvdread
-}
-
 variant ffmpeg description {Enable FFmpeg support} {
     depends_lib-append      path:lib/libavcodec.dylib:ffmpeg
     configure.args-delete   --disable-avcodec --disable-avformat \
@@ -312,10 +290,10 @@
     configure.args-append   --enable-macosx --enable-macosx-dialog-provider
 }
 
-default_variants +dvd +ffmpeg +mod +mpc +osd +theora +twolame +x264 +quartz
+default_variants +ffmpeg +mod +mpc +osd +quartz
 
 variant huge \
-    requires bonjour dvb dvd eyetv ffmpeg fribidi jack mod mpc osd sdl shout speex svg theora twolame vcd x264 \
+    requires bonjour dvb eyetv ffmpeg fribidi jack mod mpc osd sdl shout speex svg vcd \
     description {Enable all variants except quartz, qt4, smb, and x11} {}
 
 variant full \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120615/d5afa68d/attachment.html>