diff --git a/srcpkgs/linphone/patches/cmake.patch b/srcpkgs/linphone/patches/cmake.patch new file mode 100644 index 00000000000..0de95fe9d9c --- /dev/null +++ b/srcpkgs/linphone/patches/cmake.patch @@ -0,0 +1,39 @@ +--- a/CMakeLists.txt 2024-06-27 15:40:03.000000000 +0200 ++++ - 2024-07-03 16:56:27.923999881 +0200 +@@ -418,7 +418,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 2024-06-27 15:40:03.000000000 +0200 ++++ - 2024-07-03 17:47:42.583013104 +0200 +@@ -100,12 +100,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) +--- a/cmake/LibLinphoneConfig.cmake.in 2024-07-03 17:48:12.683720688 +0200 ++++ - 2024-07-03 17:48:16.620948799 +0200 +@@ -44,7 +44,7 @@ + include("${CMAKE_CURRENT_LIST_DIR}/LibLinphoneTargets.cmake") + + set(LibLinphone_TARGET liblinphone) +-set_and_check(LibLinphone_PLUGINS_DIR "@PACKAGE_LIBLINPHONE_PLUGINS_DIR@") ++set(LibLinphone_PLUGINS_DIR "@PACKAGE_LIBLINPHONE_PLUGINS_DIR@") + + # We must propagate the public dependencies and the private dependencies for static build + include(CMakeFindDependencyMacro) diff --git a/srcpkgs/linphone/template b/srcpkgs/linphone/template index 4332c80a69a..62de0ab802b 100644 --- a/srcpkgs/linphone/template +++ b/srcpkgs/linphone/template @@ -1,12 +1,12 @@ # Template file for 'linphone' pkgname=linphone -version=5.2.111 +version=5.3.74 revision=1 build_style="cmake" -configure_args="-DENABLE_STRICT=FALSE +configure_args="-DBUILD_SHARED_LIBS=TRUE -DENABLE_ADVANCED_IM=FALSE -DENABLE_DB_STORAGE=TRUE - -DENABLE_LIME=NO -DENABLE_LIME_X3DH=NO -DENABLE_UNIT_TESTS=NO - -DENABLE_STATIC=OFF -DENABLE_FLEXIAPI=OFF -DENABLE_QRCODE=OFF" + -DENABLE_LIME_X3DH=NO -DENABLE_UNIT_TESTS=NO -DENABLE_FLEXIAPI=OFF + -DENABLE_QRCODE=OFF -DENABLE_STRICT=OFF -DENABLE_CONSOLE_UI=ON" # FLEXIAPI disabled because their cmake script doesn't find jsoncpp hostmakedepends="doxygen graphviz python3-pystache python3-six pkg-config" @@ -20,7 +20,7 @@ maintainer="John " license="AGPL-3.0-or-later" homepage="https://www.linphone.org" distfiles="https://gitlab.linphone.org/BC/public/liblinphone/-/archive/${version}/liblinphone-${version}.tar.gz" -checksum=8188eb479f0c22509c63f34fb1ec318357b40cf49853a8dd70bdabaf3761100b +checksum=b41c6bfb9510d9ce6f69401334c1569742015dc98c677f077056d6a5307b4f80 pre_build() { echo "#define MS2_GIT_VERSION=unknown" > coreapi/gitversion.h @@ -48,23 +48,21 @@ linphone-console_package() { linphone-tools_package() { short_desc+=" - tools" pkg_install() { - for i in lp-auto-answer\ - lp-sendmsg lp-test-ecc lpc2xml_test \ - xml2lpc_test; do + for i in linphone-daemon-pipetest liblinphone-auto-answer \ + liblinphone-sendmsg liblinphone-test-ecc \ + liblinphone-lpc2xml-test liblinphone-xml2lpc-test; do vmove "usr/bin/$i"; done - vmove "usr/bin/*test" } } linphone-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision} libxml2-devel ortp-devel" + depends="${sourcepkg}>=${version}_${revision} libxml2-devel ortp-devel sqlite-devel" pkg_install() { vmove "usr/lib/*.so" vmove usr/include - vmove usr/share/LinphoneCxx/cmake - vmove usr/share/Linphone/cmake + vmove usr/lib/cmake } }