From 179968310cc6f9caf746503498d5526909f6c655 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 1 Jul 2024 23:05:00 +0200 Subject: [PATCH] mediastreamer: update to 5.3.74. --- common/shlibs | 2 +- .../mediastreamer/patches/cmake-deps.patch | 20 +++++++++++++++++++ srcpkgs/mediastreamer/patches/cmake.patch | 11 ++++++++++ .../patches/set_and_no_check.patch | 11 ++++++++++ srcpkgs/mediastreamer/patches/soname.patch | 10 ++++++++++ srcpkgs/mediastreamer/template | 12 +++++------ 6 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/mediastreamer/patches/cmake-deps.patch create mode 100644 srcpkgs/mediastreamer/patches/cmake.patch create mode 100644 srcpkgs/mediastreamer/patches/set_and_no_check.patch create mode 100644 srcpkgs/mediastreamer/patches/soname.patch diff --git a/common/shlibs b/common/shlibs index f49f711d3cf..0178ef9ecc3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3568,7 +3568,7 @@ libbzrtp.so.0 bzrtp-1.0.6_1 libbelle-sip.so.1 belle-sip-5.3.62_1 libKPim6EventViews.so.6 eventviews-24.02.0_1 libKPim6IncidenceEditor.so.6 incidenceeditor-24.02.0_1 -libmediastreamer.so.11 mediastreamer-4.4.0_1 +libmediastreamer2.so.11 mediastreamer-5.3.62_1 liblinphone.so.10 linphone-4.4.0_1 liblinphone++.so.10 linphone-4.4.0_1 libbelr.so.1 belr-0.1.3_1 diff --git a/srcpkgs/mediastreamer/patches/cmake-deps.patch b/srcpkgs/mediastreamer/patches/cmake-deps.patch new file mode 100644 index 00000000000..fac8e3f50f6 --- /dev/null +++ b/srcpkgs/mediastreamer/patches/cmake-deps.patch @@ -0,0 +1,20 @@ +--- a/CMakeLists.txt 2024-08-04 15:07:13.016418509 +0200 ++++ - 2024-08-04 15:11:35.036746347 +0200 +@@ -332,7 +332,7 @@ + endif() + + if(ENABLE_G729 OR ENABLE_G729B_CNG) +- find_package(BCG729 1.1.1) ++ find_package(Bcg729 1.1.1) + if(NOT BCG729_FOUND) + message(WARNING "Could not find bcg729, mediastreamer2 will be compiled without G729 codec and G729 AnnexB in RFC3389.") + set(ENABLE_G729 OFF CACHE BOOL "Build mediastreamer2 with the G729 codec." FORCE) +@@ -488,7 +488,7 @@ + if(ENABLE_G729_CNG) + add_definitions("-DHAVE_G729B=1") + endif() +- list(APPEND LINK_LIBS ${BCG729_TARGET}) ++ list(APPEND LINK_LIBS bcg729) + endif() + if(GSM_FOUND) + list(APPEND LINK_LIBS ${GSM_TARGET}) diff --git a/srcpkgs/mediastreamer/patches/cmake.patch b/srcpkgs/mediastreamer/patches/cmake.patch new file mode 100644 index 00000000000..94d6963bc1b --- /dev/null +++ b/srcpkgs/mediastreamer/patches/cmake.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2024-06-19 16:37:43.000000000 +0200 ++++ - 2024-07-03 16:54:21.954681558 +0200 +@@ -714,7 +714,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 MS2_PLUGINS_DIR diff --git a/srcpkgs/mediastreamer/patches/set_and_no_check.patch b/srcpkgs/mediastreamer/patches/set_and_no_check.patch new file mode 100644 index 00000000000..5b3021dfe04 --- /dev/null +++ b/srcpkgs/mediastreamer/patches/set_and_no_check.patch @@ -0,0 +1,11 @@ +--- a/cmake/Mediastreamer2Config.cmake.in 2024-06-19 16:37:43.000000000 +0200 ++++ - 2024-07-01 23:50:21.114340308 +0200 +@@ -44,7 +44,7 @@ + include("${CMAKE_CURRENT_LIST_DIR}/Mediastreamer2Targets.cmake") + + set(Mediastreamer2_TARGET mediastreamer2) +-set_and_check(Mediastreamer2_PLUGINS_DIR "@PACKAGE_MS2_PLUGINS_DIR@") ++set(Mediastreamer2_PLUGINS_DIR "@PACKAGE_MS2_PLUGINS_DIR@") + + # We must propagate the public dependencies and the private dependencies for static build + include(CMakeFindDependencyMacro) diff --git a/srcpkgs/mediastreamer/patches/soname.patch b/srcpkgs/mediastreamer/patches/soname.patch new file mode 100644 index 00000000000..0ca763e6792 --- /dev/null +++ b/srcpkgs/mediastreamer/patches/soname.patch @@ -0,0 +1,10 @@ +--- a/src/CMakeLists.txt 2024-06-19 16:37:43.000000000 +0200 ++++ - 2024-07-01 23:41:06.402782989 +0200 +@@ -616,6 +616,7 @@ + # Do not version shared library on Android + set_target_properties(mediastreamer2 PROPERTIES SOVERSION ${MEDIASTREAMER_SO_VERSION}) + else() ++ set_target_properties(mediastreamer2 PROPERTIES SOVERSION ${MEDIASTREAMER_SO_VERSION}) + + + #Workaround for the Debian 11 issue with conflict between libc and libtirpc diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template index 0fcffa7653d..c8aa91fc21f 100644 --- a/srcpkgs/mediastreamer/template +++ b/srcpkgs/mediastreamer/template @@ -1,9 +1,9 @@ # Template file for 'mediastreamer' pkgname=mediastreamer -version=5.2.111 -revision=2 +version=5.3.74 +revision=1 build_style=cmake -configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0" +configure_args="-DENABLE_STRICT=0 -DENABLE_UNIT_TESTS=0 -DBUILD_SHARED_LIBS=TRUE" hostmakedepends="python3" makedepends="bzrtp-devel ffmpeg-devel glew-devel libXv-devel libsrtp-devel libupnp-devel libvpx-devel mbedtls-devel opus-devel ortp-devel pulseaudio-devel @@ -14,10 +14,11 @@ maintainer="John " license="AGPL-3.0-or-later" homepage="https://www.linphone.org/technical-corner/mediastreamer2" distfiles="https://gitlab.linphone.org/BC/public/mediastreamer2/-/archive/${version}/mediastreamer2-${version}.tar.gz" -checksum=4de0f3193869d3ecde4f5ff2a3bcf15baf92f2bd7c7400c5e8e1f6012f9080b9 +checksum=c17af2490a3f85db7bab9e862de9e7a7c00083bd2626fbeaf1bae7f12eea96a4 post_install() { vlicense LICENSE.txt + rm -r "${DESTDIR}/usr/include/OpenGL" } mediastreamer-devel_package() { @@ -26,8 +27,7 @@ mediastreamer-devel_package() { pkg_install() { vmove usr/bin vmove usr/include - vmove "usr/lib/*.a" vmove "usr/lib/*.so" - vmove usr/share/Mediastreamer2/cmake + vmove usr/lib/cmake } }