[56643] trunk/dports/multimedia/ffmpeg-devel

[devans at macports.org]

Revision: 56643
          http://trac.macports.org/changeset/56643
Author:   devans at macports.org
Date:     2009-08-31 07:43:10 -0700 (Mon, 31 Aug 2009)
Log Message:
-----------
ffmpeg-devel: merge r56642 from ffmpeg (workaround for #20938).

Revision Links:
--------------
    http://trac.macports.org/changeset/56642

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

Property Changed:
----------------
    trunk/dports/multimedia/ffmpeg-devel/


Property changes on: trunk/dports/multimedia/ffmpeg-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/multimedia/ffmpeg:56509
   + /trunk/dports/multimedia/ffmpeg:56509,56642

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-08-31 14:39:08 UTC (rev 56642)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-08-31 14:43:10 UTC (rev 56643)
@@ -140,6 +140,13 @@
     # ticket #20235
     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_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} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090831/1cd5ead0/attachment.html>