diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-07-14 23:41:54 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-07-14 23:41:54 +0000 |
| commit | d6a0cae988b284df169a5b561225493b42d7be12 (patch) | |
| tree | 4712537150b63da2b051698f0bff8f8693f6bd31 /multimedia/x264 | |
| parent | 843d24f3d810af3003637d2608ec731e7b418b6b (diff) | |
| download | ports-d6a0cae988b284df169a5b561225493b42d7be12.tar.gz ports-d6a0cae988b284df169a5b561225493b42d7be12.zip | |
Notes
Diffstat (limited to 'multimedia/x264')
| -rw-r--r-- | multimedia/x264/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/x264/files/patch-configure | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 5c8c36cbfbc5..c1f0038f882c 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -34,8 +34,7 @@ COMMENT?= H.264/MPEG-4 AVC Video Encoding (Front End CLI) 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 diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure index 844bd8db468b..8234febf8a23 100644 --- a/multimedia/x264/files/patch-configure +++ b/multimedia/x264/files/patch-configure @@ -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 |