Tristan Matthews pushed to branch master at VideoLAN / VLC
Commits: 3924a5da by Tristan Matthews at 2021-05-08T10:18:54-04:00 contrib: aom: update to 3.1.0 - - - - - 2 changed files: - contrib/src/aom/aom-android-pthreads.patch - contrib/src/aom/rules.mak Changes: ===================================== contrib/src/aom/aom-android-pthreads.patch ===================================== @@ -1,17 +1,14 @@ -diff --git a/build/cmake/pkg_config.cmake b/build/cmake/pkg_config.cmake -index c3914d79e..1eb36f7ec 100644 ---- a/build/cmake/pkg_config.cmake -+++ b/build/cmake/pkg_config.cmake -@@ -53,10 +53,6 @@ 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.private: -lm -lpthread\n") -else() -- 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}" "Libs.private: -lm\n") +-endif() file(APPEND "${pkgconfig_file}" "Cflags: -I\${includedir}\n") ===================================== contrib/src/aom/rules.mak ===================================== @@ -1,5 +1,5 @@ # aom -AOM_VERSION := v3.0.0 +AOM_VERSION := v3.1.0 AOM_GITURL := https://aomedia.googlesource.com/aom/+archive/$(AOM_VERSION).tar.gz PKGS += aom View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3924a5dab72a0bf87572696c6d1519fd7f16363c -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3924a5dab72a0bf87572696c6d1519fd7f16363c You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits