[vlc-commits] [Git][videolan/vlc][3.0.x] 7 commits: contrib: update libvpx to 1.9.0

Wed Aug 24 17:36:33 UTC 2022


David pushed to branch 3.0.x at VideoLAN / VLC


Commits:
abf2379a by Tristan Matthews at 2022-08-24T16:41:18+00:00
contrib: update libvpx to 1.9.0

(cherry picked from commit 5a88236177425c275cd9d18059db690467b187ae) (edited)
edited:
* header of the 3.0 pacth was different

- - - - -
bf49fd9a by Tristan Matthews at 2022-08-24T16:41:18+00:00
contrib: vpx: update to 1.10.0

(cherry picked from commit 3d128f5b7eb4c0c4a3418e23a08369ad90eced6a)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
a5bdd659 by Tristan Matthews at 2022-08-24T16:41:18+00:00
contrib: update libvpx to 1.11.0

(cherry picked from commit 668ef74e5971e1d90666194964c8af046e7fe442)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
1ba3efcd by Felix Paul Kühne at 2022-08-24T16:41:18+00:00
contrib/vpx: fix compilation for aarch64 simulators on iOS/tvOS

(cherry picked from commit c32d801a882773c0f6b22999afcd3c3a297f76f8) (rebased)
rebased:
* no wasm support in 3.0

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
fdb1909e by Thomas Guillem at 2022-08-24T16:41:18+00:00
contrib: vpx: fix build with NDK25

Disable neon_asm since it rely on arm-linux-androideabi-as (removed in
NDK25).

Temporary commit.

(cherry picked from commit 7be5d4d844361de2461c557ef0114eed3cdc5aee)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
75b8aa7a by Thomas Guillem at 2022-08-24T16:41:18+00:00
contrib: vpx: enable back i386/x86_64 asm on Android

Since relocation issues are now fixed.

(cherry picked from commit 4386bd5f3272f9e6dc410e9398071513c3187ade) (rebased)
rebased:
* no wasm on 3.0

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
04b53556 by Tristan Matthews at 2022-08-24T16:41:18+00:00
contrib: vpx: update to 1.12.0

Notable changes:
 - This release adds optimizations for Loongarch, adds support for vp8 in the
   real-time rate control library, upgrades GoogleTest to v1.11.0, updates
   libwebm to libwebm-1.0.0.28-20-g206d268, and includes numerous bug fixes.

Bug fixes:
 - Fix to a crash related to {vp8/vp9}_set_roi_map.
 - Fix to compiling failure with -Wformat-nonliteral.
 - Fix to integer overflow with vp9 with high resolution content.
 - Fix to AddNoiseTest failure with ARMv7.
 - Fix to libvpx Null-dereference READ in vp8.

(cherry picked from commit 1cc04dc41b047042fd5375e8313131176c85a2ff)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -


3 changed files:

- contrib/src/vpx/SHA512SUMS
- contrib/src/vpx/libvpx-ios.patch
- contrib/src/vpx/rules.mak


Changes:

=====================================
contrib/src/vpx/SHA512SUMS
=====================================
@@ -1 +1 @@
-8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298  libvpx-1.9.0.tar.gz
+dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0  libvpx-1.12.0.tar.gz


=====================================
contrib/src/vpx/libvpx-ios.patch
=====================================
@@ -1,7 +1,8 @@
-diff -ru libvpx-1.9.0/build/make/configure.sh libvpx-1.9.0/build/make/configure.sh
---- libvpx-1.9.0/build/make/configure.sh	2020-07-30 21:59:15.000000000 +0200
-+++ libvpx-1.9.0/build/make/configure.sh	2020-11-29 18:05:12.000000000 +0100
-@@ -832,96 +832,6 @@
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index 581042e38..5b282d666 100644
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -861,100 +861,6 @@ process_common_toolchain() {
    # PIC is probably what we want when building shared libs
    enabled shared && soft_enable pic
  
@@ -18,7 +19,7 @@ diff -ru libvpx-1.9.0/build/make/configure.sh libvpx-1.9.0/build/make/configure.
 -  # Handle darwin variants. Newer SDKs allow targeting older
 -  # platforms, so use the newest one available.
 -  case ${toolchain} in
--    arm*-darwin*)
+-    arm*-darwin-*)
 -      add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
 -      iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
 -      if [ -d "${iphoneos_sdk_dir}" ]; then
@@ -26,7 +27,7 @@ diff -ru libvpx-1.9.0/build/make/configure.sh libvpx-1.9.0/build/make/configure.
 -        add_ldflags "-isysroot ${iphoneos_sdk_dir}"
 -      fi
 -      ;;
--    x86*-darwin*)
+-    *-darwin*)
 -      osx_sdk_dir="$(show_darwin_sdk_path macosx)"
 -      if [ -d "${osx_sdk_dir}" ]; then
 -        add_cflags  "-isysroot ${osx_sdk_dir}"
@@ -84,6 +85,10 @@ diff -ru libvpx-1.9.0/build/make/configure.sh libvpx-1.9.0/build/make/configure.
 -      add_cflags  "-mmacosx-version-min=10.15"
 -      add_ldflags "-mmacosx-version-min=10.15"
 -      ;;
+-    *-darwin2[0-1]-*)
+-      add_cflags  "-arch ${toolchain%%-*}"
+-      add_ldflags "-arch ${toolchain%%-*}"
+-      ;;
 -    *-iphonesimulator-*)
 -      add_cflags  "-miphoneos-version-min=${IOS_VERSION_MIN}"
 -      add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
@@ -98,7 +103,7 @@ diff -ru libvpx-1.9.0/build/make/configure.sh libvpx-1.9.0/build/make/configure.
    # Handle Solaris variants. Solaris 10 needs -lposix4
    case ${toolchain} in
      sparc-solaris-*)
-@@ -1110,12 +1020,6 @@
+@@ -1143,12 +1049,6 @@ EOF
                add_cflags -isysroot ${alt_libc}
              fi
  


=====================================
contrib/src/vpx/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # libvpx
 
-VPX_VERSION := 1.9.0
+VPX_VERSION := 1.12.0
 VPX_URL := http://github.com/webmproject/libvpx/archive/v${VPX_VERSION}.tar.gz
 
 PKGS += vpx
@@ -130,11 +130,7 @@ ifdef HAVE_DARWIN_OS
 VPX_CONF += --enable-vp8-decoder --disable-tools
 VPX_CONF += --extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)"
 ifdef HAVE_IOS
-ifdef HAVE_TVOS
-VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) -mtvos-version-min=9.0
-else
-VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) -miphoneos-version-min=8.4
-endif
+VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) $(LDFLAGS)
 endif
 ifdef HAVE_MACOSX
 VPX_LDFLAGS := -L$(MACOSX_SDK)/usr/lib -isysroot $(MACOSX_SDK) -mmacosx-version-min=10.7
@@ -142,11 +138,6 @@ endif
 VPX_LDFLAGS += -arch $(PLATFORM_SHORT_ARCH)
 endif
 
-ifneq ($(filter i386 x86_64,$(ARCH)),)
-# broken text relocations or invalid register for .seh_savexmm with gcc8
-VPX_CONF += --disable-mmx
-endif
-
 ifndef WITH_OPTIMIZATION
 VPX_CONF += --enable-debug --disable-optimizations
 endif
@@ -159,6 +150,11 @@ ifdef HAVE_ANDROID
 ifneq ($(shell $(VPX_CROSS)gcc -v >/dev/null 2>&1 || echo FAIL),)
 VPX_HOSTVARS = $(HOSTVARS)
 endif
+
+# Depends on "arm-linux-androideabi-as" that is removed in NDK25
+ifeq ($(ARCH),arm)
+VPX_CONF += --disable-neon_asm
+endif
 endif
 
 .vpx: libvpx



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/58d30c8b6432b8ba12f37f20900c9976670bab2e...04b535561db7a11e3ca2684d31f09758957e2eb4

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/58d30c8b6432b8ba12f37f20900c9976670bab2e...04b535561db7a11e3ca2684d31f09758957e2eb4
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance
