From 361e17d7dbfc6ed4bb12c47c63f3cc27d0d169c9 Mon Sep 17 00:00:00 2001
From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org>
Date: Wed, 10 Apr 2024 16:51:24 +0000
Subject: [PATCH] testing/linphone: upgrade to 5.3.38
---
testing/linphone/APKBUILD | 14 ++++++------
testing/linphone/cxx17.patch | 15 -------------
testing/linphone/fix-cmake-path.patch | 31 +++++++++++++++++++++++++++
3 files changed, 37 insertions(+), 23 deletions(-)
delete mode 100644 testing/linphone/cxx17.patch
create mode 100644 testing/linphone/fix-cmake-path.patch
diff --git a/testing/linphone/APKBUILD b/testing/linphone/APKBUILD
index f1e179fa8faf..da6d0fdff838 100644
--- a/testing/linphone/APKBUILD
+++ b/testing/linphone/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=linphone
-pkgver=5.2.86
+pkgver=5.3.38
pkgrel=0
pkgdesc="An opensource SIP phone for voice/video calls and instant messaging"
url="https://linphone.org/"
@@ -34,7 +34,7 @@ makedepends="
"
subpackages="$pkgname-dev $pkgname-libs"
source="https://gitlab.linphone.org/BC/public/liblinphone/-/archive/$pkgver/liblinphone-$pkgver.tar.gz
- cxx17.patch
+ fix-cmake-path.patch
"
builddir="$srcdir/lib$pkgname-$pkgver"
@@ -53,7 +53,7 @@ build() {
-DENABLE_LIME=NO \
-DENABLE_LIME_X3DH=NO \
-DENABLE_NOTIFY=YES \
- -DENABLE_SHARED=YES \
+ -DBUILD_SHARED_LIBS=YES \
-DENABLE_STATIC=NO \
-DENABLE_STRICT=NO \
-DENABLE_STRICT=NO \
@@ -70,14 +70,12 @@ package() {
dev() {
default_dev
- mkdir -p "$subpkgdir"/usr/lib/cmake/Linphone
- mv "$pkgdir"/usr/share/Linphone/cmake/* "$subpkgdir"/usr/lib/cmake/Linphone
# Fix includes
- sed -i -e 's/INTERFACE_INCLUDE_DIRECTORIES.*/INTERFACE_INCLUDE_DIRECTORIES\ \"\/usr\/include\"/g' "$subpkgdir"/usr/lib/cmake/Linphone/LinphoneTargets.cmake
+ sed -i -e 's/INTERFACE_INCLUDE_DIRECTORIES.*/INTERFACE_INCLUDE_DIRECTORIES\ \"\/usr\/include\"/g' "$subpkgdir"/usr/lib/cmake/LibLinphone/LibLinphoneTargets.cmake
}
sha512sums="
-d4fea5f3764373b9ca8e2292621fecc9d2ba01296fb2dcfae722668fc0fa9683ebf8fd274ff290a7db596359f1a143690edb4448d12d96f6b87b355b82a03f22 liblinphone-5.2.86.tar.gz
-ec5832c6b6d596b51688918deeb4ca0cc4bbe90a217cdf88d39d799c2641078da5f24dc3048f3a8df1e43bb7a3107074244e0d052b52b9332553a1618b7a51f6 cxx17.patch
+3a73cae2665bcc40939000bd7d474551499cfc5a075e49ee6d4afa723c127fa599589e0fabd15de34f28d87529bfe002fa8cdfa4ae42ec31cf734fbeaa862f74 liblinphone-5.3.38.tar.gz
+57f3c1ab1172133167991429150e3bbff6213817deea988c302d367a6a0b1315030f2027b6493a64c9b41f3d112d95eeea4a20ae3dc07c3ebb3be3aa95e42d3f fix-cmake-path.patch
"
diff --git a/testing/linphone/cxx17.patch b/testing/linphone/cxx17.patch
deleted file mode 100644
index f6200bce2624..000000000000
--- a/testing/linphone/cxx17.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-needed for zxing
---
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 475ff16..a771e45 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,7 +92,7 @@ cmake_dependent_option(ENABLE_QRCODE "Enable QRCode support" YES "ENABLE_VIDEO"
- # * DISABLE_BC_PACKAGE_SEARCH: skip find_package() for every BC package (bctoolbox, ortp, etc.)
- # * DISABLE_SOCI_PACKAGE_SEARCH: skip find_package() for Soci.
-
--set(CMAKE_CXX_STANDARD 14)
-+set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_EXTENSIONS NO)
-
- if(NOT CMAKE_BUILD_TYPE)
diff --git a/testing/linphone/fix-cmake-path.patch b/testing/linphone/fix-cmake-path.patch
new file mode 100644
index 000000000000..5ee0f9786abc
--- /dev/null
+++ b/testing/linphone/fix-cmake-path.patch
@@ -0,0 +1,31 @@
+Adapted from https://github.com/OpenMandrivaAssociation/linphone/blob/master/liblinphone-5.3.6-cmake-config-location.patch
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -397,7 +397,7 @@
+ endif()
+
+ include(CMakePackageConfigHelpers)
+-set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake")
++set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/")
+ configure_package_config_file("cmake/${PROJECT_NAME}Config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+ INSTALL_DESTINATION "${CMAKE_MODULES_INSTALL_DIR}"
+ PATH_VARS LIBLINPHONE_PLUGINS_DIR
+--- a/wrappers/cpp/CMakeLists.txt
++++ b/wrappers/cpp/CMakeLists.txt
+@@ -98,12 +98,12 @@
+
+ install(EXPORT LinphoneCxxTargets
+ FILE LinphoneCxxTargets.cmake
+- DESTINATION "${CMAKE_INSTALL_DATADIR}/LinphoneCxx/cmake"
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/LinphoneCxx"
+ )
+ install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxVersion.cmake"
+- DESTINATION "${CMAKE_INSTALL_DATADIR}/LinphoneCxx/cmake"
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/LinphoneCxx"
+ )
+
+ if(ENABLE_DOC OR ENABLE_CXX_WRAPPER)
+
--
GitLab