Date: Fri, 14 Jul 2017 23:41:54 +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: r445837 - in head/multimedia: libx264 x264 x264/files Message-ID: <201707142341.v6ENfsRI043856@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Jul 14 23:41:54 2017 New Revision: 445837 URL: https://svnweb.freebsd.org/changeset/ports/445837 Log: multimedia/x264: yasm is only used by libx264, so move ASM option there PR: 220694 Approved by: koobs (maintainer) MFH: 2017Q3 (minor build optimization) Differential Revision: https://reviews.freebsd.org/D11566 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 Jul 14 23:41:36 2017 (r445836) +++ head/multimedia/libx264/Makefile Fri Jul 14 23:41:54 2017 (r445837) @@ -13,9 +13,11 @@ LIB_DEPENDS= # USES= pathfix -OPTIONS_DEFINE= HI10P OPENCL -OPTIONS_DEFAULT= OPENCL +OPTIONS_DEFINE= ASM HI10P OPENCL +OPTIONS_DEFAULT= ASM OPENCL OPTIONS_EXCLUDE= FFMS GPAC LAVF LSMASH SWSCALE + +ASM_BUILD_DEPENDS= yasm>=1.2.0:devel/yasm HI10P_DESC= Enable High 10 Profile 10-bit encoding HI10P_CONFIGURE_ON= --bit-depth=10 Modified: head/multimedia/x264/Makefile ============================================================================== --- head/multimedia/x264/Makefile Fri Jul 14 23:41:36 2017 (r445836) +++ head/multimedia/x264/Makefile Fri Jul 14 23:41:54 2017 (r445837) @@ -34,8 +34,7 @@ COMMENT?= H.264/MPEG-4 AVC Video Encoding (Front End C LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= yasm>=1.2.0:devel/yasm \ - bash:shells/bash +BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS?= libx264.so:multimedia/libx264 X264_BUILD= 148 @@ -51,10 +50,10 @@ HAS_CONFIGURE= yes SHEBANG_FILES= configure PLIST_FILES?= bin/x264 -OPTIONS_DEFINE+= ASM DEBUG FFMS GCC LAVF PGO SWSCALE +OPTIONS_DEFINE+= DEBUG FFMS GCC LAVF PGO SWSCALE OPTIONS_RADIO+= MP4 OPTIONS_RADIO_MP4+= GPAC LSMASH -OPTIONS_DEFAULT+= ASM LSMASH +OPTIONS_DEFAULT+= LSMASH FFMS_DESC= FFmpeg Source input support GPAC_DESC= GPAC library support Modified: head/multimedia/x264/files/patch-configure ============================================================================== --- head/multimedia/x264/files/patch-configure Fri Jul 14 23:41:36 2017 (r445836) +++ head/multimedia/x264/files/patch-configure Fri Jul 14 23:41:54 2017 (r445837) @@ -31,6 +31,15 @@ ARCH="AARCH64" stack_alignment=16 AS="${AS-${CC}}" +@@ -875,7 +869,7 @@ elif [ $compiler = ICC -a $ARCH = X86 ]; then + fi + fi + +-if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then ++if [ $cli_libx264 != system -a $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then + if ! as_check "vpmovzxwd ymm0, xmm0" ; then + VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1` + echo "Found $VER" @@ -889,9 +883,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \ fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707142341.v6ENfsRI043856>