diff --git a/extra/x264/checksums b/extra/x264/checksums index 5ccc351f..81c3566b 100644 --- a/extra/x264/checksums +++ b/extra/x264/checksums @@ -1,2 +1,2 @@ -173583d46ba20624fee8ecf781ee71e6b2412414d7e4b3f770bd4eea527d80b8e3 -e8e0ae27f3bee7fdc8fbf5ef28c17bd9a5914e4dbef6f530c8632434f934ba4f95 +bc28bd17d2e7adf4cf130eee19b80032ca905fd5774f0a06636de0eeeefa789938 +93c5a6be0c4e674df244eccfbe64b06b921c54ba5e2829bfbac60a38c9e6d00670 diff --git a/extra/x264/patches/portability.patch b/extra/x264/patches/portability.patch index e0285c59..a53cf8b9 100644 --- a/extra/x264/patches/portability.patch +++ b/extra/x264/patches/portability.patch @@ -1,5 +1,5 @@ diff --git a/configure b/configure -index e242e73..687c45d 100755 +index c1fb599..ad6eb33 100755 --- a/configure +++ b/configure @@ -1,4 +1,4 @@ @@ -17,11 +17,10 @@ index e242e73..687c45d 100755 } log_ok() { -@@ -81,13 +81,12 @@ cc_cflags() { - # several non gcc compilers issue an incredibly large number of warnings on high warning levels, +@@ -82,12 +82,12 @@ cc_cflags() { # suppress them by reducing the warning level rather than having to use #pragmas for arg in $*; do -- [[ "$arg" = -falign-loops* ]] && arg= + [[ "$arg" = -falign-loops* ]] && arg= + case $arg in + -falign-loops*|-mpreferred-stack-boundary*|-l*|-L*) arg= + esac @@ -34,7 +33,7 @@ index e242e73..687c45d 100755 if [ $compiler_style = MS ]; then [ "$arg" = -ffast-math ] && arg="-fp:fast" [ "$arg" = -Wall ] && arg= -@@ -103,14 +102,14 @@ cc_cflags() { +@@ -103,14 +103,14 @@ cc_cflags() { fi [ $compiler = CL -a "$arg" = -O3 ] && arg=-O2 @@ -52,7 +51,7 @@ index e242e73..687c45d 100755 [ "${arg#-L}" != "$arg" ] && arg=-libpath:${arg#-L} [ "$arg" = -Wl,--large-address-aware ] && arg=-largeaddressaware [ "$arg" = -s ] && arg= -@@ -119,15 +118,17 @@ cl_ldflags() { +@@ -119,15 +119,17 @@ cl_ldflags() { [ "$arg" = -Werror ] && arg= [ "$arg" = -Wshadow ] && arg= [ "$arg" = -Wmaybe-uninitialized ] && arg= @@ -73,7 +72,7 @@ index e242e73..687c45d 100755 done } -@@ -191,7 +192,7 @@ cpp_check() { +@@ -191,7 +193,7 @@ cpp_check() { for arg in $1; do echo "#include <$arg>" >> conftest.c done @@ -82,7 +81,7 @@ index e242e73..687c45d 100755 if [ $compiler_style = MS ]; then cpp_cmd="$CC conftest.c $(cc_cflags $CFLAGS $2) -P" else -@@ -340,11 +341,15 @@ rm -rf conftest* +@@ -340,11 +342,15 @@ rm -rf conftest* # Construct a path to the specified directory relative to the working directory relative_path() { @@ -102,7 +101,7 @@ index e242e73..687c45d 100755 base="${base%/*}" up="../$up" done -@@ -589,48 +594,6 @@ trap 'rm -rf conftest*' EXIT +@@ -590,48 +596,6 @@ trap 'rm -rf conftest*' EXIT # test for use of compilers that require specific handling cc_base="$(basename "$CC")" QPRE="-" @@ -151,7 +150,7 @@ index e242e73..687c45d 100755 if [ $compiler = GNU ]; then if cc_check '' -Werror=unknown-warning-option ; then -@@ -687,18 +650,6 @@ case $host_os in +@@ -688,18 +652,6 @@ case $host_os in define HAVE_MALLOC_H libm="-lm" ;; @@ -170,7 +169,7 @@ index e242e73..687c45d 100755 sunos*|solaris*) SYS="SunOS" define HAVE_MALLOC_H -@@ -739,30 +690,6 @@ LDFLAGS="$LDFLAGS $libm" +@@ -740,30 +692,6 @@ LDFLAGS="$LDFLAGS $libm" stack_alignment=4 case $host_cpu in i*86) @@ -201,7 +200,7 @@ index e242e73..687c45d 100755 ;; x86_64) ARCH="X86_64" -@@ -972,7 +899,7 @@ fi +@@ -979,7 +907,7 @@ fi if [ $asm = auto -a $ARCH = ARM ] ; then # set flags so neon is built by default @@ -210,11 +209,11 @@ index e242e73..687c45d 100755 cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then -@@ -1674,7 +1601,8 @@ cat conftest.log >> config.log +@@ -1690,7 +1618,8 @@ cat conftest.log >> config.log cat conftest.log [ "$SRCPATH" != "." ] && ln -sf ${SRCPATH}/Makefile ./Makefile --mkdir -p common/{aarch64,arm,mips,ppc,x86} encoder extras filters/video input output tools +-mkdir -p common/{aarch64,arm,mips,ppc,x86,loongarch} encoder extras filters/video input output tools +mkdir -p common/aarch64 common/arm common/mips common/ppc common/x86 +mkdir -p encoder extras filters/video input output tools diff --git a/extra/x264/sources b/extra/x264/sources index 200cfa0d..5f8d1bef 100644 --- a/extra/x264/sources +++ b/extra/x264/sources @@ -1,2 +1,2 @@ -https://code.videolan.org/videolan/x264/-/archive/7ae0053807306da2a4228da8476d3e9a3b26bde9/x264-7ae0053807306da2a4228da8476d3e9a3b26bde9.tar.gz +https://code.videolan.org/videolan/x264/-/archive/3d8aff7e26b2a611d7158ccc875593d36b5f720c/x264-3d8aff7e26b2a611d7158ccc875593d36b5f720c.tar.gz patches/portability.patch diff --git a/extra/x264/version b/extra/x264/version index 3c6d504a..d181334f 100644 --- a/extra/x264/version +++ b/extra/x264/version @@ -1 +1 @@ -7ae0053807306da2a4228da8476d3e9a3b26bde9 1 +3d8aff7e26b2a611d7158ccc875593d36b5f720c 1