[56646] trunk/dports/multimedia/ffmpeg/Portfile

[devans at macports.org]

Revision: 56646
          http://trac.macports.org/changeset/56646
Author:   devans at macports.org
Date:     2009-08-31 09:05:29 -0700 (Mon, 31 Aug 2009)
Log Message:
-----------
ffmpeg: add variant +no_sl_20938 to disable workaround for testing.

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

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2009-08-31 15:33:01 UTC (rev 56645)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2009-08-31 16:05:29 UTC (rev 56646)
@@ -134,12 +134,14 @@
     depends_lib-delete path:lib/pkgconfig/sdl.pc:libsdl
     depends_lib-append path:lib/pkgconfig/sdl.pc:libsdl-devel
     # ticket #20938
-    if { ![variant_isset no_gpl] } {
-        configure.args-delete --enable-swscale
+    if { ![variant_isset no_sl_20938] } {
+        if { ![variant_isset no_gpl] } {
+            configure.args-delete --enable-swscale
+        }
+        if { ![variant_isset no_mmx] } {
+            configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
+        }
     }
-    if { ![variant_isset no_mmx] } {
-        configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
-    }
 }
 
 variant no_mmx description {disable all x86 asm optimizations} {
@@ -158,6 +160,9 @@
     depends_lib-delete      port:XviD
 }
 
+variant no_sl_20938 description {Disable Snow Leopard work around for #20938 for testing} {
+}
+
 #
 # make speex a variant since it requires speex version 1.2
 # which is currently only available via port speex-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090831/5a84df46/attachment-0001.html>