Changeset 79084

Timestamp:

06/01/11 16:33:04 (4 years ago)

Author:

jmr@…

Message:

x264:

• remove unrecognised configure arg
• avoid linking against ffmpeg when it's installed
• convert build_arch i386 to i686 in --host configure arg
• add -msse2 to cflags when building for i386 on 10.4 (#24893)

File:

• trunk/dports/multimedia/x264/Portfile (modified) (2 diffs)

trunk/dports/multimedia/x264/Portfile

@@ -30 +30 @@
 minimum_xcodeversions {9 3.1}
 
-configure.args   --enable-pthread \
-                 --enable-pic \
+configure.args   --enable-pic \
                  --enable-shared \
+                 --disable-lavf-input \
                  --disable-asm
 
@@ -42 +42 @@
 }
 if {${os.platform} == "darwin" && $build_arch != "" && ![variant_isset universal]} {
-    configure.args-append   --host=${build_arch}-apple-darwin${os.major}
+    if {$build_arch == "i386"} {
+        configure.args-append   --host=i686-apple-darwin${os.major}
+    } else {
+        configure.args-append   --host=${build_arch}-apple-darwin${os.major}
+    }
     eval configure.ldflags-append ${configure.cc_archflags}
 }
 foreach arch ${universal_archs} {
-    set merger_configure_args(${arch}) --host=${arch}-apple-darwin${os.major}
+    if {$arch == "i386"} {
+        set merger_configure_args(${arch}) --host=i686-apple-darwin${os.major}
+    } else {
+        set merger_configure_args(${arch}) --host=${arch}-apple-darwin${os.major}
+    }
 }
 configure.universal_args-delete --disable-dependency-tracking
 
+platform darwin 8 {
+    # https://trac.macports.org/ticket/24893
+    if {$build_arch == "i386" && ![variant_isset universal]} {
+        configure.cflags-append -msse2
+    }
+    set merger_configure_cflags(i386) -msse2
+}
 
+# sets its own optflags
+configure.optflags
 configure.cflags-append -I. -fno-common -read_only_relocs suppress