[59992] trunk/dports/multimedia/MPlayer/Portfile

[ecronin at macports.org]

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

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

Modified: trunk/dports/multimedia/MPlayer/Portfile
===================================================================
--- trunk/dports/multimedia/MPlayer/Portfile	2009-10-28 21:54:06 UTC (rev 59991)
+++ trunk/dports/multimedia/MPlayer/Portfile	2009-10-28 22:10:18 UTC (rev 59992)
@@ -6,7 +6,7 @@
 
 name                MPlayer
 version             1.0rc2
-revision            6
+revision            7
 categories          multimedia
 maintainers         ecronin \
                     openmaintainer
@@ -69,7 +69,8 @@
 
 depends_lib     port:jpeg port:lame port:libiconv port:libmad \
                 port:libogg port:libpng path:include/gif_lib.h:giflib \
-                port:libvorbis port:lzo2 port:ncurses port:zlib
+                port:libtheora port:libvorbis port:lzo2 port:ncurses \
+                port:zlib
 depends_build   port:pkgconfig
 
 # MPlayer's ./configure REALLY does not want you to use ENV for this
@@ -93,8 +94,8 @@
         --confdir=${prefix}/etc/${name} \
         --mandir=${prefix}/share/man \
         --enable-gif --enable-png --enable-jpeg --enable-liblzo \
-        --enable-libvorbis --enable-mad --disable-faad-external \
-        --enable-largefiles
+        --enable-theora --enable-libvorbis --enable-mad
+        --disable-faad-external --enable-largefiles
 
 # MPlayer autodetects many support libs.  To prevent undeclared
 # dependencies, explicitly disable everything optional first.
@@ -104,7 +105,7 @@
         --disable-dvdread --disable-cdparanoia --disable-freetype \
         --disable-fontconfig --disable-unrarlib --disable-fribidi \
         --disable-enca --disable-libcdio --disable-xvid \
-        --disable-x264 --disable-speex --disable-theora \
+        --disable-x264 --disable-speex \
         --disable-faac --disable-ladspa --disable-libdv \
         --disable-toolame --disable-twolame --disable-xmms \
         --disable-musepack --disable-sdl --disable-aa \
@@ -175,25 +176,27 @@
 
 ##### 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
-}
-
-## Needs 20070316 snapshot of x264 or later
-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} {
@@ -201,24 +204,6 @@
     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:libdts
@@ -263,8 +248,7 @@
 
 
 platform macosx {
-    configure.args-append   --enable-macosx \
-                            --enable-macosx-bundle
+    configure.args-append   --enable-macosx 
     if {([variant_isset universal] && ![string match *64* $universal_archs]) || (![variant_isset universal] && ![string match *64* $build_arch])} {
         configure.args-append --enable-qtx --enable-macosx-finder-support
     } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091028/e3c24248/attachment.html>