diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-12-21 19:00:27 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-12-21 19:00:27 +0000 |
| commit | 3642ceafef74f24f1d2d42efe67f9e64dd00d6e6 (patch) | |
| tree | b67cf732dfd32685ed44d482b0f346835133bcd8 /multimedia/x264/files/patch-configure | |
| parent | Take maintainership. (diff) | |
multimedia/x264: update to 0.159.2991
Changes: https://code.videolan.org/videolan/x264/compare/34c06d1...1771b55
ABI: https://abi-laboratory.pro/tracker/timeline/x264/
Diffstat (limited to 'multimedia/x264/files/patch-configure')
| -rw-r--r-- | multimedia/x264/files/patch-configure | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure index 6564f2058e1c..62f8ea92ede9 100644 --- a/multimedia/x264/files/patch-configure +++ b/multimedia/x264/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2017-12-25 21:45:05 UTC +--- configure.orig 2019-11-26 23:50:00 UTC +++ configure -@@ -692,12 +692,6 @@ case $host_cpu in +@@ -728,12 +728,6 @@ case $host_cpu in AS_EXT=".asm" ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" if [ $compiler = GNU ]; then @@ -13,7 +13,7 @@ CFLAGS="-m32 $CFLAGS" LDFLAGS="-m32 $LDFLAGS" fi -@@ -712,7 +706,7 @@ case $host_cpu in +@@ -748,7 +742,7 @@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf32" fi ;; @@ -22,7 +22,7 @@ ARCH="X86_64" AS="${AS-nasm}" AS_EXT=".asm" -@@ -786,7 +780,7 @@ case $host_cpu in +@@ -824,7 +818,7 @@ case $host_cpu in AS="${AS-${CC}}" fi ;; @@ -30,17 +30,17 @@ + aarch64|arm64) ARCH="AARCH64" stack_alignment=16 - AS="${AS-${CC}}" -@@ -888,7 +882,7 @@ elif [ $compiler = ICC -a $ARCH = X86 ]; then + if [ "$SYS" = MACOSX ] ; then +@@ -937,7 +931,7 @@ if cc_check '' '' '' '__attribute__((force_align_arg_p 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 "vmovdqa32 [eax]{k1}{z}, zmm0" ; then - VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1` + VER="$( ($AS --version || echo no assembler) 2>/dev/null | head -n 1 )" echo "Found $VER" -@@ -901,9 +895,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \ +@@ -950,9 +944,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \ fi if [ $asm = auto -a $ARCH = ARM ] ; then @@ -50,7 +50,7 @@ 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 -@@ -914,9 +905,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then +@@ -963,9 +954,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON ASFLAGS="$ASFLAGS -c" else @@ -62,7 +62,7 @@ fi fi -@@ -943,9 +933,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then +@@ -997,9 +987,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then define HAVE_MSA else @@ -74,7 +74,7 @@ fi fi -@@ -1257,10 +1246,6 @@ if cc_check '' -Wshadow ; then +@@ -1327,10 +1316,6 @@ if cc_check '' -Wshadow ; then CFLAGS="-Wshadow $CFLAGS" fi @@ -82,12 +82,12 @@ - CFLAGS="-Wno-maybe-uninitialized $CFLAGS" -fi - - if [ $compiler = ICC -o $compiler = ICL ] ; then - if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then - define HAVE_INTEL_DISPATCHER -@@ -1296,6 +1281,9 @@ if [ "$opencl" = "yes" ]; then + if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then + CFLAGS="$CFLAGS -fvisibility=hidden" + fi +@@ -1370,6 +1355,9 @@ if [ "$opencl" = "yes" ]; then opencl="yes" - define HAVE_OPENCL + define HAVE_OPENCL "(BIT_DEPTH==8)" libdl="-ldl" + else + opencl="yes" |