From owner-svn-ports-head@freebsd.org Fri Sep 23 13:12:08 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CA793BE6EBF; Fri, 23 Sep 2016 13:12:08 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7E51C758; Fri, 23 Sep 2016 13:12:08 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8NDC7YR063204; Fri, 23 Sep 2016 13:12:07 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8NDC7BS063201; Fri, 23 Sep 2016 13:12:07 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201609231312.u8NDC7BS063201@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 23 Sep 2016 13:12:07 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Sep 2016 13:12:08 -0000 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