From eee5cdadf244b80efddedb944a55c9cdbb0ff6c9 Mon Sep 17 00:00:00 2001 From: uknunknown Date: Fri, 4 Oct 2024 17:32:49 -0700 Subject: [PATCH] update libvpx v.1.14.1 update libvpx v.1.14.1 remove previous patch (from 1.14.0) --- Makefile.ffmpeg | 5 +- support/patches/fix_id_1841.patch | 80 ------------------------------- 2 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 support/patches/fix_id_1841.patch diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg index 3066e4cb6..f1ddc48d1 100644 --- a/Makefile.ffmpeg +++ b/Makefile.ffmpeg @@ -65,12 +65,11 @@ LIBX265_SHA1 = 51fc4592a9f1e340d87a51233361cc5a3ffd739d LIBX265_DIFFS = libx265.pic.diff LIBX265_DIFFS += libx265-silence.patch -LIBVPX_VER = 1.14.0 +LIBVPX_VER = 1.14.1 LIBVPX = libvpx-$(LIBVPX_VER) LIBVPX_TB = $(LIBVPX).tar.gz LIBVPX_URL = https://github.com/webmproject/libvpx/archive/v$(LIBVPX_VER)/$(LIBVPX_TB) -LIBVPX_SHA1 = f767052bff9043e61d094598cf9a18f38dde8a3e -LIBVPX_DIFFS = fix_id_1841.patch +LIBVPX_SHA1 = 04af9fed7d7e2d686dc164d78c85908499420dd4 LIBOGG = libogg-1.3.5 LIBOGG_TB = $(LIBOGG).tar.gz diff --git a/support/patches/fix_id_1841.patch b/support/patches/fix_id_1841.patch deleted file mode 100644 index 22e6585a3..000000000 --- a/support/patches/fix_id_1841.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- configure.sh 2024-03-02 19:37:00.000000000 +0000 -+++ configure.sh 2024-03-02 19:01:25.000000000 +0000 -@@ -980,33 +980,16 @@ - case ${toolchain} in - arm*) - soft_enable runtime_cpu_detect -- # Arm ISA extensions are treated as supersets. -- case ${tgt_isa} in -- arm64|armv8) -- for ext in ${ARCH_EXT_LIST_AARCH64}; do -- # Disable higher order extensions to simplify dependencies. -- if [ "$disable_exts" = "yes" ]; then -- if ! disabled $ext; then -- RTCD_OPTIONS="${RTCD_OPTIONS}--disable-${ext} " -- disable_feature $ext -- fi -- elif disabled $ext; then -- disable_exts="yes" -- else -- soft_enable $ext -- fi -- done -- ;; -- armv7|armv7s) -- soft_enable neon -- # Only enable neon_asm when neon is also enabled. -- enabled neon && soft_enable neon_asm -- # If someone tries to force it through, die. -- if disabled neon && enabled neon_asm; then -- die "Disabling neon while keeping neon-asm is not supported" -- fi -- ;; -- esac -+ -+ if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then -+ soft_enable neon -+ # Only enable neon_asm when neon is also enabled. -+ enabled neon && soft_enable neon_asm -+ # If someone tries to force it through, die. -+ if disabled neon && enabled neon_asm; then -+ die "Disabling neon while keeping neon-asm is not supported" -+ fi -+ fi - - asm_conversion_cmd="cat" - -@@ -1228,6 +1211,33 @@ - fi - ;; - esac -+ # AArch64 ISA extensions are treated as supersets. -+ if [ ${tgt_isa} = "arm64" ] || [ ${tgt_isa} = "armv8" ]; then -+ aarch64_arch_flag_neon="arch=armv8-a" -+ aarch64_arch_flag_neon_dotprod="arch=armv8.2-a+dotprod" -+ aarch64_arch_flag_neon_i8mm="arch=armv8.2-a+dotprod+i8mm" -+ aarch64_arch_flag_sve="arch=armv8.2-a+dotprod+i8mm+sve" -+ for ext in ${ARCH_EXT_LIST_AARCH64}; do -+ if [ "$disable_exts" = "yes" ]; then -+ RTCD_OPTIONS="${RTCD_OPTIONS}--disable-${ext} " -+ soft_disable $ext -+ else -+ # Check the compiler supports the -march flag for the extension. -+ # This needs to happen after toolchain/OS inspection so we handle -+ # $CROSS etc correctly when checking for flags, else these will -+ # always fail. -+ flag="$(eval echo \$"aarch64_arch_flag_${ext}")" -+ check_gcc_machine_option "${flag}" "${ext}" -+ if ! enabled $ext; then -+ # Disable higher order extensions to simplify dependencies. -+ disable_exts="yes" -+ RTCD_OPTIONS="${RTCD_OPTIONS}--disable-${ext} " -+ soft_disable $ext -+ fi -+ fi -+ done -+ check_neon_sve_bridge_compiles -+ fi - ;; - mips*) - link_with_cc=gcc -- 2.47.2