diff options
Diffstat (limited to 'multimedia/x264/files/patch-configure')
-rw-r--r-- | multimedia/x264/files/patch-configure | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure index 62f8ea92ede9..0da28fb9398e 100644 --- a/multimedia/x264/files/patch-configure +++ b/multimedia/x264/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2019-11-26 23:50:00 UTC +--- configure.orig 2020-07-02 16:50:47 UTC +++ configure -@@ -728,12 +728,6 @@ case $host_cpu in +@@ -729,12 +729,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 -@@ -748,7 +742,7 @@ case $host_cpu in +@@ -749,7 +743,7 @@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf32" fi ;; @@ -22,7 +22,7 @@ ARCH="X86_64" AS="${AS-nasm}" AS_EXT=".asm" -@@ -824,7 +818,7 @@ case $host_cpu in +@@ -825,7 +819,7 @@ case $host_cpu in AS="${AS-${CC}}" fi ;; @@ -31,7 +31,7 @@ ARCH="AARCH64" stack_alignment=16 if [ "$SYS" = MACOSX ] ; then -@@ -937,7 +931,7 @@ if cc_check '' '' '' '__attribute__((force_align_arg_p +@@ -938,7 +932,7 @@ if cc_check '' '' '' '__attribute__((force_align_arg_p fi fi @@ -40,7 +40,7 @@ if ! as_check "vmovdqa32 [eax]{k1}{z}, zmm0" ; then VER="$( ($AS --version || echo no assembler) 2>/dev/null | head -n 1 )" echo "Found $VER" -@@ -950,9 +944,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \ +@@ -951,9 +945,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 -@@ -963,9 +954,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then +@@ -964,9 +955,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 -@@ -997,9 +987,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then +@@ -998,9 +988,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,26 @@ fi fi -@@ -1327,10 +1316,6 @@ if cc_check '' -Wshadow ; then +@@ -1232,15 +1221,16 @@ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then + gpac="no" + GPAC_LIBS="-lgpac_static" + cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz" ++ cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl" + if [ "$SYS" = "WINDOWS" ] ; then + cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32" + cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm" + fi + if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_close(0);" ; then +- if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0);" ; then ++ if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0,0);" ; then + gpac="yes" + else +- echo "Warning: gpac is too old, update to 2007-06-21 UTC or later" ++ echo "Warning: gpac is too old, update to v0.8.0 or later" + fi + fi + fi +@@ -1328,10 +1318,6 @@ if cc_check '' -Wshadow ; then CFLAGS="-Wshadow $CFLAGS" fi @@ -85,7 +104,7 @@ if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then CFLAGS="$CFLAGS -fvisibility=hidden" fi -@@ -1370,6 +1355,9 @@ if [ "$opencl" = "yes" ]; then +@@ -1371,6 +1357,9 @@ if [ "$opencl" = "yes" ]; then opencl="yes" define HAVE_OPENCL "(BIT_DEPTH==8)" libdl="-ldl" |