Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits: d2cd5c71 by Hugo Beauzée-Luyssen at 2021-07-04T19:55:27+00:00 contrib: aom: Use VideoLAN mirror if available (cherry picked from commit 30b116d88b2f952cf928c84039bffe12b10aaf63) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - 03a5f1da by Steve Lhomme at 2021-07-04T19:55:27+00:00 contrib: aom: remove old headers before building The headers are often incompatible and create compilation issues when rebuilding. (cherry picked from commit c9a5e551ba556ebab9e8bfaf1814bd0ed64f9cfe) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - 3c4da205 by Steve Lhomme at 2021-07-04T19:55:27+00:00 contrib: aom: remove old headers before building The headers are often incompatible and create compilation issues when rebuilding. (cherry picked from commit c9a5e551ba556ebab9e8bfaf1814bd0ed64f9cfe) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - c845f786 by Steve Lhomme at 2021-07-04T19:55:27+00:00 contrib: aom: use the regular UNPACK_DIR variable (cherry picked from commit b8e5d70cbff09df845a7ab293ac091ff5dedd3a8) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - 56859634 by Tristan Matthews at 2021-07-04T19:55:27+00:00 contrib: aom: update to AOM v2.0.0 This is the first "official" release, see: https://aomedia.googlesource.com/aom/+/HEAD/CHANGELOG (cherry picked from commit ab8f0e57720b454f9ccdb86887d391956870f68b) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - c0ea7e02 by Tristan Matthews at 2021-07-04T19:55:27+00:00 contrib: aom: update to v2.0.1 (cherry picked from commit 01d75eb6cdb4dc25b221bcfb39666bb51839b8db) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - 6b9f864d by Tristan Matthews at 2021-07-04T19:55:27+00:00 contrib: aom: update to 3.0.0 Bug fixes: * Issue 2940: Segfault when encoding with --use-16bit-internal and --limit > 1 * Issue 2941: Decoder mismatch with --rt --bit-depth=10 and --cpu-used=8 * Issue 2895: mingw-w64 i686 gcc fails to build * Issue 2874: Separate ssse3 functions from sse2 file. Source: https://aomedia.googlesource.com/aom/+/v3.0.0 (cherry picked from commit 58c8b6aba888c666612e91d1cbb012aea630c853) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - b3827139 by Tristan Matthews at 2021-07-04T19:55:27+00:00 contrib: aom: update to 3.1.0 (cherry picked from commit 3924a5dab72a0bf87572696c6d1519fd7f16363c) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - e7eeab2b by Tristan Matthews at 2021-07-04T19:55:27+00:00 contrib: aom: update to 3.1.1 (cherry picked from commit 65a32a68d11d18ca6fcc843ea6a13aaeeb2813fb) Signed-off-by: Jean-Baptiste Kempf <[email protected]> - - - - - 4 changed files: - contrib/src/aom/aom-android-cpufeatures.patch - contrib/src/aom/aom-android-pthreads.patch - − contrib/src/aom/aom-target-cpu.patch - contrib/src/aom/rules.mak Changes: ===================================== contrib/src/aom/aom-android-cpufeatures.patch ===================================== @@ -1,5 +1,5 @@ diff --git a/aom_ports/aom_ports.cmake b/aom_ports/aom_ports.cmake -index 6272fc0..2d795f8 100644 +index d57989654..11d4b5550 100644 --- a/aom_ports/aom_ports.cmake +++ b/aom_ports/aom_ports.cmake @@ -30,7 +30,8 @@ list(APPEND AOM_PORTS_ASM_X86 "${AOM_ROOT}/aom_ports/emms.asm") @@ -13,15 +13,15 @@ index 6272fc0..2d795f8 100644 list(APPEND AOM_PORTS_SOURCES_PPC "${AOM_ROOT}/aom_ports/ppc.h" "${AOM_ROOT}/aom_ports/ppc_cpudetect.c") diff --git a/aom_ports/arm_cpudetect.c b/aom_ports/arm_cpudetect.c -index 70efee9..86efb8e 100644 +index 5a75bb348..bd5e1cb93 100644 --- a/aom_ports/arm_cpudetect.c +++ b/aom_ports/arm_cpudetect.c -@@ -88,7 +88,7 @@ int arm_cpu_caps(void) { +@@ -88,7 +88,7 @@ int aom_arm_cpu_caps(void) { } #elif defined(__ANDROID__) /* end _MSC_VER */ -#include <cpu-features.h> +#include "cpu-features.h" - int arm_cpu_caps(void) { + int aom_arm_cpu_caps(void) { int flags; ===================================== contrib/src/aom/aom-android-pthreads.patch ===================================== @@ -1,19 +1,14 @@ -diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake -index 64e2021..1cab2a3 100644 ---- a/build/cmake/pkg_config.cmake -+++ b/build/cmake/pkg_config.cmake -@@ -47,12 +47,6 @@ file(APPEND "${pkgconfig_file}" - file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n") - file(APPEND "${pkgconfig_file}" "Requires:\n") - file(APPEND "${pkgconfig_file}" "Conflicts:\n") +--- aom/build/cmake/pkg_config.cmake 2021-05-07 16:22:27.118065285 -0400 ++++ aom/build/cmake/pkg_config.cmake.new 2021-05-07 16:23:24.937812883 -0400 +@@ -56,10 +56,6 @@ + file(APPEND "${pkgconfig_file}" " libvmaf") + endif() + file(APPEND "${pkgconfig_file}" "\nConflicts:\n") +-file(APPEND "${pkgconfig_file}" "Libs: -L\${libdir} -l${pkg_name}\n") -if(CONFIG_MULTITHREAD AND HAVE_PTHREAD_H) -- file(APPEND "${pkgconfig_file}" -- "Libs: -L\${prefix}/lib -l${pkg_name} -lm -lpthread\n") - file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n") -else() -- file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n") -- file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n") --endif() +file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n") -+file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n") - file(APPEND "${pkgconfig_file}" "Cflags: -I\${prefix}/include\n") + file(APPEND "${pkgconfig_file}" "Libs.private: -lm\n") +-endif() + file(APPEND "${pkgconfig_file}" "Cflags: -I\${includedir}\n") ===================================== contrib/src/aom/aom-target-cpu.patch deleted ===================================== @@ -1,15 +0,0 @@ ---- aom/CMakeLists.txt.target-cpu 2019-01-08 12:23:33.570217317 -0500 -+++ aom/CMakeLists.txt 2019-01-08 12:23:26.118217140 -0500 -@@ -18,12 +18,6 @@ if(NOT EMSCRIPTEN) - endif() - endif() - --if(NOT AOM_TARGET_CPU) -- set(AOM_TARGET_CPU generic) -- message("Forcing generic build for normative branch; set AOM_TARGET_CPU to " -- "the target CPU type to allow for an optimized build.") --endif() -- - option(ENABLE_CCACHE "Enable ccache support." OFF) - option(ENABLE_DECODE_PERF_TESTS "Enables decoder performance tests" OFF) - option(ENABLE_DISTCC "Enable distcc support." OFF) ===================================== contrib/src/aom/rules.mak ===================================== @@ -1,7 +1,6 @@ # aom -AOM_HASH := add4b15580e410c00c927ee366fa65545045a5d9 -AOM_VERSION := v1.0.0.errata.1 -AOM_GITURL := https://aomedia.googlesource.com/aom/+archive/$(AOM_HASH).tar.gz +AOM_VERSION := v3.1.1 +AOM_GITURL := https://aomedia.googlesource.com/aom/+archive/$(AOM_VERSION).tar.gz PKGS += aom ifeq ($(call need_pkg,"aom"),) @@ -9,17 +8,16 @@ PKGS_FOUND += aom endif $(TARBALLS)/aom-$(AOM_VERSION).tar.gz: - $(call download,$(AOM_GITURL)) + $(call download_pkg,$(AOM_GITURL),aom) .sum-aom: aom-$(AOM_VERSION).tar.gz $(warning $@ not implemented) touch $@ aom: aom-$(AOM_VERSION).tar.gz .sum-aom - rm -Rf $@-$(AOM_VERSION) $@ - mkdir -p $@-$(AOM_VERSION) - tar xvzfo "$<" -C $@-$(AOM_VERSION) - $(APPLY) $(SRC)/aom/aom-target-cpu.patch + rm -Rf $(UNPACK_DIR) $@ + mkdir -p $(UNPACK_DIR) + tar xvzfo "$<" -C $(UNPACK_DIR) ifdef HAVE_ANDROID $(APPLY) $(SRC)/aom/aom-android-pthreads.patch $(APPLY) $(SRC)/aom/aom-android-cpufeatures.patch @@ -96,6 +94,8 @@ endif # libaom doesn't allow in-tree builds .aom: aom toolchain.cmake + rm -rf $(PREFIX)/include/aom + cd $< && rm -rf aom_build && mkdir -p aom_build cd $< && mkdir -p aom_build cd $</aom_build && LDFLAGS="$(AOM_LDFLAGS)" $(HOSTVARS) CFLAGS="$(AOM_CFLAGS)" CXXFLAGS="$(AOM_CXXFLAGS)" $(CMAKE) ../ $(AOM_CONF) cd $< && $(CMAKEBUILD) aom_build View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/801a5090e9ba39cf5661d8aa5907da3ee0def9f9...e7eeab2bc61a6fffd61138e805dcaf71d6c63579 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/801a5090e9ba39cf5661d8aa5907da3ee0def9f9...e7eeab2bc61a6fffd61138e805dcaf71d6c63579 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
