Ticket #19314: patch-ffmpeg.diff

Portfile

@@ -5 +5 @@
 
 name            ffmpeg
 version         0.5
-revision        1
+revision        2
 epoch           1
 categories      multimedia
 maintainers     devans openmaintainer
@@ -74 +74 @@
 build.cmd       gmake
 configure.compiler gcc-4.0
 
+#
+# enable auto configure of mmx and related Intel optimizations by default
+# requires XCode 3.1.2 or better on Leopard
+#
+
+pre-extract {
+    if {"darwin" == ${os.platform} && 9 == ${os.major}} {
+        set minimum_xcodeversion 3.1.2
+        set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
+        if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
+            ui_error "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+            return -code error "incompatible Xcode version"
+        }
+    }
+}
+
 configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
 configure.args \
         --disable-vhook \
@@ -90 +106 @@
         --enable-libx264 \
         --mandir=${prefix}/share/man \
         --enable-shared --enable-pthreads \
-        --disable-mmx \
         --cc=gcc-4.0
 
 #add --enable-libopenjpeg when problems with openjpeg.h are resolved
@@ -111 +126 @@
     }
 }
 
-#
-# comments concerning mmx problems may be out of date
-# needs testing on i386 platform to verify
-#
-
-variant mmx description {enable mmx optimizations ; may not build in gcc-4.2 or xcode 3.0 gcc-4.0} {
-# make no-mmx default and allow mmx enabling for the brave.
-    configure.args-delete --disable-mmx
-# Fix Leopard problems by disabling the cavs decoder for now (is this still required?)
-    configure.args-append --disable-decoder=cavs
+variant no_mmx description {disable mmx optimizations} {
+    configure.args-append --disable-mmx
 }
 
 variant no_gpl description {disallow use of GPL code, license will be LGPL} {