Date: Fri, 23 Sep 2016 13:12:07 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422670 - in head/multimedia: libx264 x264 x264/files Message-ID: <201609231312.u8NDC7BS063201@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Sep 23 13:12:07 2016 New Revision: 422670 URL: https://svnweb.freebsd.org/changeset/ports/422670 Log: multimedia/x264: don't require SSE on i386 with ASM=on (default) Remove "-march=i686 -mfpmath=sse -msse" and "-msse2" on later versions when building C files. This doesn't affect hand-written assembly which relies on CPUID but may pessimize compiler (around 2.3 % on Skylake). Differential Revision: https://reviews.freebsd.org/D7958 Approved by: koobs (maintainer) Modified: head/multimedia/libx264/Makefile (contents, props changed) head/multimedia/x264/Makefile (contents, props changed) head/multimedia/x264/files/patch-configure (contents, props changed) Modified: head/multimedia/libx264/Makefile ============================================================================== --- head/multimedia/libx264/Makefile Fri Sep 23 13:00:07 2016 (r422669) +++ head/multimedia/libx264/Makefile Fri Sep 23 13:12:07 2016 (r422670) @@ -3,7 +3,7 @@ # # Updating notes: see multimedia/x264/Makefile. -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMEPREFIX= lib COMMENT= H.264/MPEG-4 AVC Video Encoding (Library) MASTERDIR= ${.CURDIR}/../x264 Modified: head/multimedia/x264/Makefile ============================================================================== --- head/multimedia/x264/Makefile Fri Sep 23 13:00:07 2016 (r422669) +++ head/multimedia/x264/Makefile Fri Sep 23 13:12:07 2016 (r422670) @@ -19,7 +19,7 @@ PORTNAME= x264 PORTVERSION= 0.${X264_BUILD}.${X264_REV} -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo Modified: head/multimedia/x264/files/patch-configure ============================================================================== --- head/multimedia/x264/files/patch-configure Fri Sep 23 13:00:07 2016 (r422669) +++ head/multimedia/x264/files/patch-configure Fri Sep 23 13:12:07 2016 (r422670) @@ -1,5 +1,18 @@ --- configure.orig 2015-06-29 20:45:09 UTC +++ configure +@@ -604,12 +604,6 @@ case $host_cpu in + AS_EXT=".asm" + ASFLAGS="$ASFLAGS -O2 -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" + if [ $compiler = GNU ]; then +- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then +- CFLAGS="$CFLAGS -march=i686" +- fi +- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then +- CFLAGS="$CFLAGS -mfpmath=sse -msse" +- fi + CFLAGS="-m32 $CFLAGS" + LDFLAGS="-m32 $LDFLAGS" + elif [ $compiler = ICC ]; then @@ -639,7 +639,7 @@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf" fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609231312.u8NDC7BS063201>