Ticket #28935: ffmpeg-Portfile.2.diff

Portfile

@@ -3 +3 @@
 
 PortSystem 1.0
 PortGroup xcodeversion 1.0
+PortGroup muniversal 1.0
 
 name            ffmpeg
 conflicts       ffmpeg-devel
@@ -119 +120 @@
 
 #add --enable-libopenjpeg when problems with openjpeg.h are resolved
 
-if {$build_arch != ""} {
-    configure.args-append --arch=${build_arch}
-}
-
 test.run        yes
 
 #
 # configure isn't autoconf and they do use a dep cache
 #
 
-universal_variant no
+if { [variant_isset universal] } {
+    configure.universal_args-delete             --disable-dependency-tracking
+
+    foreach arch ${universal_archs_supported} {
+        lappend merger_configure_args($arch)    --arch=${arch}
+    }
+} else {
+    configure.args-append --arch=${configure.build_arch}
+}
 
 post-destroot {
     file mkdir ${destroot}${prefix}/share/doc/${name}
@@ -139 +144 @@
     }
 }
 
+set disable_mmx_config_args {--disable-mmx --disable-mmx2 \
+                             --disable-sse --disable-ssse3 \
+                             --disable-amd3dnow --disable-amd3dnowext}
+
 platform darwin 10 {
     # ticket #20938 -- disable mmx for 32 bit intel only
-    if { $build_arch == "i386" } {
+    # universal variant implicitly includes 32 bit intel
+    if { [variant_isset universal] || ${configure.build_arch} == "i386" } {
         # swscale is no longer GPL only
         configure.args-delete --enable-swscale
+
+        # restore swscale for architectures other than 32 bit intel
+        foreach arch ${universal_archs_supported} {
+            if { $arch != "i386" } {
+                lappend merger_configure_args($arch) --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 universal] } {
+                eval lappend merger_configure_args(i386)     ${disable_mmx_config_args}
+            } else {
+                eval configure.args-append                   ${disable_mmx_config_args}
+            }
         }
     }
 }
@@ -158 +180 @@
 }
 
 variant no_mmx description {disable all x86 asm optimizations} {
-    configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
+    eval configure.args-append ${disable_mmx_config_args}
 }
 
 variant no_gpl description {disallow use of GPL code, license will be LGPL} {