Revision: 117612 https://trac.macports.org/changeset/117612 Author: devans@macports.org Date: 2014-03-05 11:40:10 -0800 (Wed, 05 Mar 2014) Log Message: ----------- x264: remove +asm variant, assert --disable-asm for all i386 builds, increment revision (#42672). Modified Paths: -------------- trunk/dports/multimedia/x264/Portfile Modified: trunk/dports/multimedia/x264/Portfile =================================================================== --- trunk/dports/multimedia/x264/Portfile 2014-03-05 19:27:19 UTC (rev 117611) +++ trunk/dports/multimedia/x264/Portfile 2014-03-05 19:40:10 UTC (rev 117612) @@ -7,6 +7,7 @@ name x264 version 20140124 +revision 1 set git_branch 956c8d8c2a3c2fb1f2f17807532321e492c75efc categories multimedia license GPL-2+ @@ -36,19 +37,27 @@ minimum_xcodeversions {9 3.1} +depends_build port:yasm + configure.args --enable-pic \ --enable-shared \ --enable-static \ - --disable-asm \ --disable-avs \ --disable-swscale \ --disable-lavf \ --disable-ffms \ --disable-gpac +# as of this build (142) asm optimizations are believed to work with x86_64 Snow Leopard and up including Mavericks +# please file a ticket if you have evidence to the contrary +# i386 clang build issues remain which break i386 build when asm optimizations are enabled +# assert configure option --disable-asm for all i386 builds +# see https://mailman.videolan.org/pipermail/x264-devel/2014-February/010371.html, #42672. + 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} + configure.args-append --host=i686-apple-darwin${os.major} \ + --disable-asm } else { configure.args-append --host=${build_arch}-apple-darwin${os.major} } @@ -57,7 +66,7 @@ foreach arch ${universal_archs} { if {${arch} eq "i386"} { - set merger_configure_args(${arch}) --host=i686-apple-darwin${os.major} + set merger_configure_args(${arch}) "--host=i686-apple-darwin${os.major} --disable-asm" } else { set merger_configure_args(${arch}) --host=${arch}-apple-darwin${os.major} } @@ -81,20 +90,6 @@ build.target default -# 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 -# i386 clang build issues remain which break +asm +universal. Mark +asm conflicting with +universal. -# see https://mailman.videolan.org/pipermail/x264-devel/2014-February/010371.html, #42672. - -variant asm conflicts universal 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 -} - post-patch { if {[string match "*clang*" ${configure.compiler}]} { reinplace "s|-falign-loops=16||g" ${worksrcpath}/configure