From owner-svn-ports-head@freebsd.org Fri Jul 14 23:41:37 2017 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 CC049DAE8C3; Fri, 14 Jul 2017 23:41:37 +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 9C35A7ED36; Fri, 14 Jul 2017 23:41:37 +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 v6ENfaHt043014; Fri, 14 Jul 2017 23:41:36 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6ENfaEF043011; Fri, 14 Jul 2017 23:41:36 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201707142341.v6ENfaEF043011@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 14 Jul 2017 23:41:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445836 - in head/multimedia/x264: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/multimedia/x264: . files X-SVN-Commit-Revision: 445836 X-SVN-Commit-Repository: ports 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, 14 Jul 2017 23:41:37 -0000 Author: jbeich Date: Fri Jul 14 23:41:36 2017 New Revision: 445836 URL: https://svnweb.freebsd.org/changeset/ports/445836 Log: multimedia/{lib,}x264: update to 0.148.2795 Changes: https://git.videolan.org/?p=x264.git;a=shortlog;h=aaa9aa83a111ed6f1db253d5afa91c5fc844583f ABI: https://abi-laboratory.pro/tracker/timeline/x264/ PR: 220694 Approved by: koobs (maintainer) MFH: 2017Q3 (bug fixes, minor SIMD optimizations) Differential Revision: https://reviews.freebsd.org/D11566 Deleted: head/multimedia/x264/files/patch-armv6 Modified: head/multimedia/x264/Makefile (contents, props changed) head/multimedia/x264/distinfo (contents, props changed) head/multimedia/x264/files/patch-configure (contents, props changed) Modified: head/multimedia/x264/Makefile ============================================================================== --- head/multimedia/x264/Makefile Fri Jul 14 23:21:28 2017 (r445835) +++ head/multimedia/x264/Makefile Fri Jul 14 23:41:36 2017 (r445836) @@ -39,10 +39,10 @@ BUILD_DEPENDS= yasm>=1.2.0:devel/yasm \ LIB_DEPENDS?= libx264.so:multimedia/libx264 X264_BUILD= 148 -X264_REV= 2768 -X264_COMMIT= d32d7bf1c6923a42cbd5ac2fd540ecbb009ba681 +X264_REV= 2795 +X264_COMMIT= aaa9aa83a111ed6f1db253d5afa91c5fc844583f X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g} -X264_SNAPSHOT= 20170522 +X264_SNAPSHOT= 20170626 USES?= pkgconfig USES+= gmake localbase shebangfix tar:bzip2 Modified: head/multimedia/x264/distinfo ============================================================================== --- head/multimedia/x264/distinfo Fri Jul 14 23:21:28 2017 (r445835) +++ head/multimedia/x264/distinfo Fri Jul 14 23:41:36 2017 (r445836) @@ -1,5 +1,5 @@ -TIMESTAMP = 1495485905 -SHA256 (x264/x264-snapshot-20170522-2245-stable.tar.bz2) = f73d5006d69024d11ef457e430ea046966deb908670a183b93ba1866d4afcb20 -SIZE (x264/x264-snapshot-20170522-2245-stable.tar.bz2) = 735558 +TIMESTAMP = 1498509905 +SHA256 (x264/x264-snapshot-20170626-2245-stable.tar.bz2) = 0fe3e49eb8861b8fc429436070fb2dd525d141904a44487c48d1c2d6ad778eae +SIZE (x264/x264-snapshot-20170626-2245-stable.tar.bz2) = 736446 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7 SIZE (x264/example.y4m.bz2) = 4910029 Modified: head/multimedia/x264/files/patch-configure ============================================================================== --- head/multimedia/x264/files/patch-configure Fri Jul 14 23:21:28 2017 (r445835) +++ head/multimedia/x264/files/patch-configure Fri Jul 14 23:41:36 2017 (r445836) @@ -1,6 +1,6 @@ ---- configure.orig 2015-06-29 20:45:09 UTC +--- configure.orig 2017-06-26 20:45:05 UTC +++ configure -@@ -677,12 +677,6 @@ case $host_cpu in +@@ -682,12 +682,6 @@ case $host_cpu in AS_EXT=".asm" ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" if [ $compiler = GNU ]; then @@ -13,16 +13,16 @@ CFLAGS="-m32 $CFLAGS" LDFLAGS="-m32 $LDFLAGS" fi -@@ -697,7 +691,7 @@ case $host_cpu in +@@ -702,7 +696,7 @@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf32" fi ;; - x86_64) -+ x86_64|amd64) ++ amd64|x86_64) ARCH="X86_64" AS="${AS-yasm}" AS_EXT=".asm" -@@ -761,7 +755,7 @@ case $host_cpu in +@@ -776,7 +770,7 @@ case $host_cpu in AS="${AS-${CC}}" fi ;; @@ -30,32 +30,42 @@ + aarch64|arm64) ARCH="AARCH64" stack_alignment=16 - if [ "$SYS" = MACOSX ] ; then -@@ -882,9 +876,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then + AS="${AS-${CC}}" +@@ -889,9 +883,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \ + fi + + if [ $asm = auto -a $ARCH = ARM ] ; then +- # set flags so neon is built by default +- [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" +- + cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM + if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then + define HAVE_ARMV6 +@@ -902,9 +893,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON ASFLAGS="$ASFLAGS -c" else - echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS." - echo "If you really want to run on such a CPU, configure with --disable-asm." - exit 1 -+ echo "No usable SIMD found, adding --disable-asm." ++ echo "No usable SIMD found, assuming --disable-asm." + asm="no" fi fi -@@ -911,9 +904,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the +@@ -931,9 +921,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then define HAVE_MSA else - echo "You specified a pre-MSA CPU in your CFLAGS." - echo "If you really want to run on such a CPU, configure with --disable-asm." - exit 1 -+ echo "No usable SIMD found, adding --disable-asm." ++ echo "No usable SIMD found, assuming --disable-asm." + asm="no" fi fi -@@ -1225,10 +1217,6 @@ if cc_check '' -Wshadow ; then +@@ -1245,10 +1234,6 @@ if cc_check '' -Wshadow ; then CFLAGS="-Wshadow $CFLAGS" fi @@ -66,7 +76,7 @@ if [ $compiler = ICC -o $compiler = ICL ] ; then if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then define HAVE_INTEL_DISPATCHER -@@ -1128,6 +1118,9 @@ if [ "$opencl" = "yes" ]; then +@@ -1284,6 +1269,9 @@ if [ "$opencl" = "yes" ]; then opencl="yes" define HAVE_OPENCL libdl="-ldl"