[59993] trunk/dports/multimedia/mplayer-devel/Portfile

[ecronin at macports.org]

Revision: 59993
          http://trac.macports.org/changeset/59993
Author:   ecronin at macports.org
Date:     2009-10-28 15:10:43 -0700 (Wed, 28 Oct 2009)
Log Message:
-----------
multimedia/mplayer-devel: clean up number of variants (step 1)

Modified Paths:
--------------
    trunk/dports/multimedia/mplayer-devel/Portfile

Modified: trunk/dports/multimedia/mplayer-devel/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer-devel/Portfile	2009-10-28 22:10:18 UTC (rev 59992)
+++ trunk/dports/multimedia/mplayer-devel/Portfile	2009-10-28 22:10:43 UTC (rev 59993)
@@ -6,7 +6,7 @@
 
 name                mplayer-devel
 version             29701
-revision            0
+revision            1
 categories          multimedia
 maintainers         acho openmaintainer
 platforms           darwin
@@ -28,8 +28,8 @@
 depends_build       port:pkgconfig port:yasm
 depends_lib \
     port:jpeg port:lame port:libiconv port:libmad \
-    port:libogg port:libpng port:libvorbis port:lzo2 \
-    port:ncurses port:zlib port:bzip2 port:liboil
+    port:libogg port:libpng port:libtheora port:libvorbis \
+    port:lzo2 port:ncurses port:zlib port:bzip2 port:liboil
 
 fetch.type          svn
 #svn.revision        ${version}
@@ -64,7 +64,7 @@
     --confdir=${prefix}/etc/${name} \
     --mandir=${prefix}/share/man \
     --enable-png --enable-jpeg --enable-liblzo \
-    --enable-libvorbis --enable-mad \
+    --enable-theora --enable-libvorbis --enable-mad \
     --enable-largefiles
 
 configure.args-append \
@@ -72,7 +72,7 @@
     --disable-dvdread --disable-cdparanoia --disable-freetype \
     --disable-fontconfig --disable-fribidi \
     --disable-enca --disable-libcdio --disable-xvid \
-    --disable-x264 --disable-speex --disable-theora \
+    --disable-x264 --disable-speex \
     --disable-faac --disable-libdv \
     --disable-toolame --disable-twolame --disable-xmms \
     --disable-musepack --disable-sdl --disable-aa \
@@ -152,49 +152,35 @@
 
 ##### External codecs
 
-variant theora \
-    description {Enable OggTheora support} {
-    depends_lib-append      port:libtheora
-    configure.args-delete   --disable-theora
-    configure.args-append   --enable-theora
-}
+variant mencoder_extras \
+    description {Enable extra codecs for encoding (XviD, x264, aac, DV, MP2)} {
 
-variant xvid \
-    description {Enable XviD encoding} {
-    depends_lib-append      port:XviD
+    depends_lib-append      port:XviD port:x264 port:faac port:libdv \
+        port:twolame
     configure.args-delete   --disable-xvid
-}
-
-variant x264 \
-    description {Enable H.264 encoding} {
-    depends_lib-append      port:x264
     configure.args-delete   --disable-x264
+    configure.args-delete   --disable-faac
+    configure.args-delete   --disable-libdv
+    configure.args-delete   --disable-twolame
 }
+variant xvid requires mencoder_extras \
+    description {deprecated: use +mencoder_extras instead} {}
+variant x264 requires mencoder_extras \
+    description {deprecated: use +mencoder_extras instead} {}
+variant faac requires mencoder_extras \
+    description {deprecated: use +mencoder_extras instead} {}
+variant dv requires mencoder_extras \
+    description {deprecated: use +mencoder_extras instead} {}
+variant twolame requires mencoder_extras \
+    description {deprecated: use +mencoder_extras instead} {}
 
+
 variant speex \
     description {Enable Speex playback} {
     depends_lib-append      port:speex-devel
     configure.args-delete   --disable-speex
 }
 
-variant faac \
-    description {Enable AAC encoding} {
-    depends_lib-append      port:faac
-    configure.args-delete   --disable-faac
-}
-
-variant dv \
-    description {Enable DV encoding} {
-    depends_lib-append      port:libdv
-    configure.args-delete   --disable-libdv
-}
-
-variant twolame \
-    description {Enable MPEG Audio Layer 2 encoding} {
-    depends_lib-append      port:twolame
-    configure.args-delete   --disable-twolame
-}
-
 variant dts \
     description {Enable non-passthrough DTS playback} {
     depends_lib-append      port:libdca
@@ -252,8 +238,7 @@
 }
 
 platform macosx {
-    configure.args-append   --enable-macosx-bundle \
-                            --enable-qtx
+    configure.args-append   --enable-qtx
 }
 
 variant glx requires x11 description {Enable glx output support.  Due to a bug in mplayer, this disables corevideo support} {
@@ -291,5 +276,5 @@
         configure.args-append   --target=i386-Darwin
     }
     configure.args-append   --disable-qtx
-    configure.args-delete   --enable-macosx-bundle --enable-qtx
+    configure.args-delete   --enable-qtx
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091028/67fe1a8f/attachment.html>