[vlc-commits] [Git][videolan/vlc][master] contrib: vpx: update to 1.15.1

[Tristan Matthews (@tmatth)]

Tristan Matthews pushed to branch master at VideoLAN / VLC


Commits:
6351a747 by Tristan Matthews at 2025-04-16T16:15:59-04:00
contrib: vpx: update to 1.15.1

The dropped patches have been merged upstream.

- - - - -


6 changed files:

- − contrib/src/vpx/0001-vp9-rc-fix-sizeof-of-member-in-static-function.patch
- contrib/src/vpx/SHA512SUMS
- contrib/src/vpx/libvpx-darwin-aarch64.patch
- contrib/src/vpx/libvpx-ios.patch
- contrib/src/vpx/libvpx-remove-bitcode.patch
- contrib/src/vpx/rules.mak


Changes:

=====================================
contrib/src/vpx/0001-vp9-rc-fix-sizeof-of-member-in-static-function.patch deleted
=====================================
@@ -1,32 +0,0 @@
-From ca8306ea5c292f41057e124ab23760551753ef85 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Thu, 16 Jan 2025 13:11:54 +0100
-Subject: [PATCH] vp9 rc: fix sizeof of member in static function
-
-It generates a compilation in AppleClang 15.0.0.15000309:
-
-```
-../vp9/ratectrl_rtc.cc:29:67: error: invalid use of member 'cpi_' in static member function
-  rc_api->cpi_ = static_cast<VP9_COMP *>(vpx_memalign(32, sizeof(*cpi_)));
-                                                                  ^~~~
-```
----
- vp9/ratectrl_rtc.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vp9/ratectrl_rtc.cc b/vp9/ratectrl_rtc.cc
-index b29e1ec23..43948fb7e 100644
---- a/vp9/ratectrl_rtc.cc
-+++ b/vp9/ratectrl_rtc.cc
-@@ -26,7 +26,7 @@ std::unique_ptr<VP9RateControlRTC> VP9RateControlRTC::Create(
-   std::unique_ptr<VP9RateControlRTC> rc_api(new (std::nothrow)
-                                                 VP9RateControlRTC());
-   if (!rc_api) return nullptr;
--  rc_api->cpi_ = static_cast<VP9_COMP *>(vpx_memalign(32, sizeof(*cpi_)));
-+  rc_api->cpi_ = static_cast<VP9_COMP *>(vpx_memalign(32, sizeof(*rc_api->cpi_)));
-   if (!rc_api->cpi_) return nullptr;
-   vp9_zero(*rc_api->cpi_);
- 
--- 
-2.45.0.windows.1
-


=====================================
contrib/src/vpx/SHA512SUMS
=====================================
@@ -1 +1 @@
-8f483653a324c710fd431b87fd0d5d6f476f006bd8c8e9c6d1fa6abd105d6a40ac81c8fd5638b431c455d57ab2ee823c165e9875eb3932e6e518477422da3a7b  libvpx-1.15.0.tar.gz
+4cf5c3d7735ed75be1984b826dd6706e46e21ef9f0e9c7c52001d0c71ab10e79633ae292132d49db11ca2251a77573473b911400b1e4cf2383a74e59c540b640  libvpx-1.15.1.tar.gz


=====================================
contrib/src/vpx/libvpx-darwin-aarch64.patch
=====================================
@@ -1,6 +1,6 @@
---- libvpx-1.14.0/build/make/configure.sh	2024-01-24 14:51:54.835698759 -0500
-+++ libvpx-1.14.0-new/build/make/configure.sh	2024-01-24 14:54:28.595456073 -0500
-@@ -1146,7 +1146,7 @@
+--- libvpx/build/make/configure.sh	2025-04-16 15:30:51.431710564 -0400
++++ libvpx-new/build/make/configure.sh	2025-04-16 15:36:35.935402419 -0400
+@@ -1183,7 +1183,7 @@
  
          darwin)
            if ! enabled external_build; then
@@ -9,7 +9,7 @@
              CXX="$(${XCRUN_FIND} clang++)"
              CC="$(${XCRUN_FIND} clang)"
              AR="$(${XCRUN_FIND} ar)"
-@@ -1165,7 +1165,7 @@
+@@ -1200,7 +1200,7 @@
              add_cflags -arch ${tgt_isa}
              add_ldflags -arch ${tgt_isa}
  


=====================================
contrib/src/vpx/libvpx-ios.patch
=====================================
@@ -1,6 +1,6 @@
---- libvpx-1.14.0/build/make/configure.sh	2024-01-09 16:12:22.000000000 -0500
-+++ libvpx-1.14.0-new/build/make/configure.sh	2024-01-24 16:12:30.986695507 -0500
-@@ -863,109 +863,6 @@
+--- libvpx/build/make/configure.sh	2025-01-10 14:30:59.000000000 -0500
++++ libvpx-new/build/make/configure.sh	2025-04-16 16:06:21.962173179 -0400
+@@ -903,109 +903,6 @@
        ;;
    esac
  
@@ -92,7 +92,7 @@
 -      add_cflags  "-mmacosx-version-min=10.15"
 -      add_ldflags "-mmacosx-version-min=10.15"
 -      ;;
--    *-darwin2[0-3]-*)
+-    *-darwin2[0-4]-*)
 -      add_cflags  "-arch ${toolchain%%-*}"
 -      add_ldflags "-arch ${toolchain%%-*}"
 -      ;;
@@ -110,7 +110,7 @@
    # Handle Solaris variants. Solaris 10 needs -lposix4
    case ${toolchain} in
      sparc-solaris-*)
-@@ -1170,12 +1067,6 @@
+@@ -1205,12 +1102,6 @@
                add_cflags -isysroot ${alt_libc}
              fi
  


=====================================
contrib/src/vpx/libvpx-remove-bitcode.patch
=====================================
@@ -1,6 +1,6 @@
---- libvpx-1.14.0/build/make/configure.sh	2024-01-24 15:55:34.070346026 -0500
-+++ libvpx-1.14.0-new/build/make/configure.sh	2024-01-24 15:57:57.821681598 -0500
-@@ -1090,12 +1090,6 @@
+--- libvpx/build/make/configure.sh	2025-01-10 14:30:59.000000000 -0500
++++ libvpx-new/build/make/configure.sh	2025-04-16 16:13:01.119638658 -0400
+@@ -1228,12 +1228,6 @@
                  fi
                  ;;
              esac


=====================================
contrib/src/vpx/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # libvpx
 
-VPX_VERSION := 1.15.0
+VPX_VERSION := 1.15.1
 VPX_URL := $(GITHUB)/webmproject/libvpx/archive/v${VPX_VERSION}.tar.gz
 
 ifneq ($(filter arm aarch64 i386 loongarch64 mipsel mips64el ppc64le x86_64 wasm32, $(ARCH)),)
@@ -31,7 +31,6 @@ endif
 	# Disable automatic addition of -fembed-bitcode for iOS
 	# as it is enabled through --extra-cflags if necessary.
 	$(APPLY) $(SRC)/vpx/libvpx-remove-bitcode.patch
-	$(APPLY) $(SRC)/vpx/0001-vp9-rc-fix-sizeof-of-member-in-static-function.patch
 	$(MOVE)
 
 DEPS_vpx =



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/6351a747182cdfee5c2a7341083b6196254a160b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/6351a747182cdfee5c2a7341083b6196254a160b
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance