Ticket #28935: ffmpeg-asflags-Portfile.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}
+        lappend merger_configure_env($arch)     ASFLAGS='-arch ${arch}'
+    }
+} else {
+    configure.args-append --arch=${configure.build_arch}
+    configure.env-append  ASFLAGS='-arch ${configure.build_arch}'
+}
 
 post-destroot {
     file mkdir ${destroot}${prefix}/share/doc/${name}
@@ -140 +147 @@
 }
 
 platform darwin 10 {
-    # ticket #20938 -- disable mmx for 32 bit intel only
-    if { $build_arch == "i386" } {
-        # swscale is no longer GPL only
-        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
-        }
-    }
+#    # ticket #20938 -- disable mmx for 32 bit intel only
+#    if { $build_arch == "i386" } {
+#        # swscale is no longer GPL only
+#        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
+#        }
+#    }
 }
 
 platform powerpc {