[vlc-commits] [Git][videolan/vlc][master] contrib: opus: update to 1.4

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
2715d41e by Tristan Matthews at 2023-04-24T12:07:10+00:00
contrib: opus: update to 1.4

An equivalent fix for our PROJECT_VERSION patch (but using PACKAGE_VERSION) was merged,
so that patch was dropped.

- - - - -


4 changed files:

- − contrib/src/opus/0001-CMake-set-the-pkg-config-version-to-the-library-vers.patch
- contrib/src/opus/0002-CMake-set-the-pkg-config-string-as-with-autoconf-mes.patch
- contrib/src/opus/SHA512SUMS
- contrib/src/opus/rules.mak


Changes:

=====================================
contrib/src/opus/0001-CMake-set-the-pkg-config-version-to-the-library-vers.patch deleted
=====================================
@@ -1,27 +0,0 @@
-From e3932184ed8148b35e5a3bb58765aa12d01cb15c Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Fri, 9 Sep 2022 07:57:02 +0200
-Subject: [PATCH 1/2] CMake: set the pkg-config version to the library version
-
-Not the .so version.
----
- CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17ee3fc2..902cb835 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -316,8 +316,7 @@ if(OPUS_INSTALL_PKG_CONFIG_MODULE)
-   set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-   set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
-   set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
--  set(VERSION ${OPUS_LIBRARY_VERSION})
--  set(VERSION ${OPUS_LIBRARY_VERSION})
-+  set(VERSION ${PROJECT_VERSION})
-   if(HAVE_LIBM)
-     set(LIBM "-lm")
-   endif()
--- 
-2.37.3.windows.1
-


=====================================
contrib/src/opus/0002-CMake-set-the-pkg-config-string-as-with-autoconf-mes.patch
=====================================
@@ -8,13 +8,13 @@ Subject: [PATCH 2/2] CMake: set the pkg-config string as with autoconf/meson
  1 file changed, 8 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 902cb835..0abb677c 100644
+index 9d824cdc..216ed4b1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -317,6 +317,14 @@ if(OPUS_INSTALL_PKG_CONFIG_MODULE)
+@@ -533,6 +533,14 @@ if(OPUS_INSTALL_PKG_CONFIG_MODULE)
    set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
    set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
-   set(VERSION ${PROJECT_VERSION})
+   set(VERSION ${PACKAGE_VERSION})
 +  if(OPUS_FIXED_POINT)
 +    set(PC_BUILD "fixed-point")
 +  else()
@@ -26,6 +26,3 @@ index 902cb835..0abb677c 100644
    if(HAVE_LIBM)
      set(LIBM "-lm")
    endif()
--- 
-2.37.3.windows.1
-


=====================================
contrib/src/opus/SHA512SUMS
=====================================
@@ -1 +1 @@
-6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd  opus-1.3.1.tar.gz
+1ecd39e0add24de12823bf7c936bb67441228721e2cdae0edbfcf3cee0894bcc6edf2a1d0ca5cdfdad1565803bf39cc4c985ad32710c2a9582f850adeb5ca631  opus-1.4.tar.gz


=====================================
contrib/src/opus/rules.mak
=====================================
@@ -1,8 +1,8 @@
 # opus
 
-OPUS_VERSION := 1.3.1
+OPUS_VERSION := 1.4
 
-OPUS_URL := https://archive.mozilla.org/pub/opus/opus-$(OPUS_VERSION).tar.gz
+OPUS_URL := $(XIPH)/opus/opus-$(OPUS_VERSION).tar.gz
 
 PKGS += opus
 ifeq ($(call need_pkg,"opus >= 0.9.14"),)
@@ -16,7 +16,6 @@ $(TARBALLS)/opus-$(OPUS_VERSION).tar.gz:
 
 opus: opus-$(OPUS_VERSION).tar.gz .sum-opus
 	$(UNPACK)
-	$(APPLY) $(SRC)/opus/0001-CMake-set-the-pkg-config-version-to-the-library-vers.patch
 	$(APPLY) $(SRC)/opus/0002-CMake-set-the-pkg-config-string-as-with-autoconf-mes.patch
 	# fix missing included file in packaged source
 	cd $(UNPACK_DIR) && sed -e 's,include(opus_buildtype,#include(opus_buildtype,' -i.orig CMakeLists.txt
@@ -27,6 +26,15 @@ ifndef HAVE_FPU
 OPUS_CONF += -DOPUS_FIXED_POINT=ON
 endif
 
+# rtcd is not working on win64-arm64
+ifdef HAVE_WIN64
+ifeq ($(ARCH),aarch64)
+OPUS_CONF += -DOPUS_MAY_HAVE_NEON=OFF -DOPUS_PRESUME_NEON=ON
+endif
+endif
+
+
+
 .opus: opus toolchain.cmake
 	$(CMAKECLEAN)
 	$(HOSTVARS) $(CMAKE) $(OPUS_CONF)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2715d41ebede22cfa9cb7427d4486fc228feeef9

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


VideoLAN code repository instance