diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-09-23 13:12:07 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-09-23 13:12:07 +0000 |
| commit | c50fea9186669942eda67e49df9d788d6c5a071f (patch) | |
| tree | a48436cc2d24ff239101d9dbc135ba758bc3bb33 | |
| parent | security/openssl: Update to 1.0.2i (diff) | |
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)
| -rw-r--r-- | multimedia/libx264/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/x264/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/x264/files/patch-configure | 13 |
3 files changed, 15 insertions, 2 deletions
diff --git a/multimedia/libx264/Makefile b/multimedia/libx264/Makefile index 29a0b07f74e9..4fe9a02fbf0b 100644 --- a/multimedia/libx264/Makefile +++ b/multimedia/libx264/Makefile @@ -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 diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 95fee1c5707f..2a6024456d55 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -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 diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure index 61414cdd63db..100545e7c280 100644 --- a/multimedia/x264/files/patch-configure +++ b/multimedia/x264/files/patch-configure @@ -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 |