Changeset 82651

Timestamp:

08/17/11 09:08:11 (4 years ago)

Author:

ryandesign@…

Message:

ffmpeg: fix i386 build and add universal variant based on #28935

File:

• trunk/dports/multimedia/ffmpeg/Portfile (modified) (4 diffs)

trunk/dports/multimedia/ffmpeg/Portfile

@@ -4 +4 @@
 PortSystem 1.0
 PortGroup xcodeversion 1.0
+PortGroup muniversal 1.0
 
 name            ffmpeg
@@ -110 +111 @@
 #add --enable-libopenjpeg when problems with openjpeg.h are resolved
 
-if {$build_arch != ""} {
-    configure.args-append --arch=${build_arch}
-    if {$build_arch == "i386" || $build_arch == "x86_64"} {
-        depends_build-append port:yasm
-        configure.args-append --enable-yasm
-    }
-}
-
 test.run        yes
 
@@ -123 +116 @@
 # configure isn't autoconf and they do use a dep cache
 #
-
-universal_variant no
 
 post-destroot {
@@ -134 +125 @@
 }
 
-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
-        }
-    }
-}
-
 platform powerpc {
     # absence of altivec is not automatically detected
     if {[catch {sysctl hw.vectorunit} result] || $result == 0} {
         configure.args-append --disable-altivec
+    }
+}
+
+configure.universal_args-delete --disable-dependency-tracking
+
+if {[variant_isset universal]} {
+    foreach arch ${configure.universal_archs} {
+        lappend merger_configure_args($arch) --arch=${arch}
+        lappend merger_configure_env($arch)  ASFLAGS='-arch ${arch}'
+    }
+    if {[string match "*86*" ${configure.universal_archs}]} {
+        depends_build-append port:yasm
+    }
+    lappend merger_configure_args(i386) --enable-yasm
+    lappend merger_configure_args(x86_64) --enable-yasm
+} else {
+    configure.args-append --arch=${configure.build_arch}
+    configure.env-append  ASFLAGS='[get_canonical_archflags]'
+    if {$build_arch == "i386" || $build_arch == "x86_64"} {
+        depends_build-append port:yasm
+        configure.args-append --enable-yasm
     }
 }