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

3 Mar 2014

Revision: 117551
          https://trac.macports.org/changeset/117551
Author:   devans@macports.org
Date:     2014-03-03 08:48:17 -0800 (Mon, 03 Mar 2014)
Log Message:
-----------
x264: update to build 142, make +asm default for x86_64, SL and up.

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

Modified: trunk/dports/multimedia/x264/Portfile
===================================================================

--- trunk/dports/multimedia/x264/Portfile	2014-03-03 16:23:52 UTC (rev 117550)
+++ trunk/dports/multimedia/x264/Portfile	2014-03-03 16:48:17 UTC (rev 117551)
@@ -6,8 +6,8 @@
 PortGroup       xcodeversion 1.0
 
 name            x264
-version         20130823
-set git_branch  3361d59a0a83dcb8b321cc0eb8e6ba68ca49c7d4
+version         20140124
+set git_branch  956c8d8c2a3c2fb1f2f17807532321e492c75efc
 categories      multimedia
 license         GPL-2+
 platforms       darwin
@@ -31,8 +31,8 @@
     error "git branch hash must be at least 7 characters long."
 }
 
-checksums        rmd160  6d59dac4066c6cf1f7eb68d42aa25124bec6a765 \
-                 sha256  5d9d5bbbf3db3e3af70dbceecf4b2efd25e59ef8054362f91350fa751670cc5e
+checksums        rmd160  a8d693295ea3f84cdc23b29874d79dd729441e5d \
+                 sha256  ef2ff1c71659dca4712c4a789c3313fa656b413818a00849057fc69e53655b38
 
 minimum_xcodeversions {9 3.1}
 
@@ -46,13 +46,6 @@
                  --disable-ffms \
                  --disable-gpac
 
-# asm works with a 64-bit snow leopard build
-
-if {[variant_isset asm] || (${os.platform} eq "darwin" && ${os.major} == 10 && ${build_arch} eq "x86_64" && ![variant_isset universal])} {
-        depends_build-append    port:yasm
-        configure.args-delete   --disable-asm
-}
-
 if {${os.platform} eq "darwin" && ${build_arch} ne "" && ![variant_isset universal]} {
     if {${build_arch} eq "i386"} {
         configure.args-append   --host=i686-apple-darwin${os.major}
@@ -88,13 +81,16 @@
 
 build.target    default
 
-#
-# intel assembler optimizations using yasm continue
-# to exhibit problems in some cases (see #19835)
-# disable by default but can be enabled using +asm variant for the adventurous
-#
+# as of this build (142) +asm is believed to work with 64-bit Intel Snow Leopard and up including Mavericks
+# please file a ticket if you have evidence to the contrary
 
-variant asm description {enable intel assembler optimizations (experimental)} {
+variant asm description {enable intel assembler optimizations} {
+        depends_build-append    port:yasm
+        configure.args-delete   --disable-asm
 }
 
+if {(${os.platform} eq "darwin" && ${os.major} >= 10 && ${build_arch} eq "x86_64" && ![variant_isset universal])} {
+    default_variants +asm
+}
+
 livecheck.type  none

    

devans＠macports.org

tags

participants (1)