[79084] trunk/dports/multimedia/x264/Portfile

[jmr at macports.org]

Revision: 79084
          http://trac.macports.org/changeset/79084
Author:   jmr at macports.org
Date:     2011-06-01 16:33:04 -0700 (Wed, 01 Jun 2011)
Log 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)

Modified Paths:
--------------
    trunk/dports/multimedia/x264/Portfile

Modified: trunk/dports/multimedia/x264/Portfile
===================================================================
--- trunk/dports/multimedia/x264/Portfile	2011-06-01 22:19:19 UTC (rev 79083)
+++ trunk/dports/multimedia/x264/Portfile	2011-06-01 23:33:04 UTC (rev 79084)
@@ -29,9 +29,9 @@
 
 minimum_xcodeversions {9 3.1}
 
-configure.args   --enable-pthread \
-                 --enable-pic \
+configure.args   --enable-pic \
                  --enable-shared \
+                 --disable-lavf-input \
                  --disable-asm
 
 # asm works with a 64-bit snow leopard build
@@ -41,15 +41,32 @@
         configure.args-delete   --disable-asm
 }
 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
 
 destroot.args	DIR_INSTALL=${destroot}${prefix}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110601/e018ff59/attachment.html>