From 49a15b0d72ece170283ce5212895ff78ddfe5058 Mon Sep 17 00:00:00 2001 From: David P Date: Thu, 26 Nov 2020 16:02:31 -0300 Subject: updpkg: pcr/linphone-desktop 4.2.4-1 Signed-off-by: David P --- .../0001-do-not-build-linphone-sdk.patch | 44 +++++++++++----------- ...0002-remove-bc_compute_full_version-usage.patch | 8 ++-- pcr/linphone-desktop/PKGBUILD | 8 ++-- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch b/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch index 512a16398..fe774a479 100644 --- a/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch +++ b/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch @@ -1,16 +1,16 @@ -From a8153863fe1f1b9a92cbdb2eeab28ff9bc249c85 Mon Sep 17 00:00:00 2001 +From 08b8b1811a1ad079fa713d19a8cc6bf2dc782bb7 Mon Sep 17 00:00:00 2001 From: David P -Date: Wed, 22 Jul 2020 17:26:39 -0400 +Date: Thu, 26 Nov 2020 15:56:30 -0300 Subject: [PATCH 1/2] do not build linphone-sdk Signed-off-by: David P --- - CMakeLists.txt | 59 +------------------ + CMakeLists.txt | 61 +------------------ .../cmake_builder/additional_steps.cmake | 9 --- - 2 files changed, 3 insertions(+), 65 deletions(-) + 2 files changed, 3 insertions(+), 67 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fb699155..bb8270c1 100644 +index f7eb05f2..5921ee5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") @@ -21,10 +21,10 @@ index fb699155..bb8270c1 100644 set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") -@@ -133,29 +132,8 @@ if(CMAKE_VERBOSE_MAKEFILE) - endif() +@@ -136,29 +135,8 @@ if(UNIX AND NOT APPLE) + set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}") + list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}") endif() - -ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" - INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" @@ -51,22 +51,23 @@ index fb699155..bb8270c1 100644 find_package(Qt5 5.12 COMPONENTS Core REQUIRED) if ( NOT Qt5_FOUND ) -@@ -170,37 +148,6 @@ find_package(Mediastreamer2 CONFIG QUIET) +@@ -173,39 +151,6 @@ find_package(Mediastreamer2 CONFIG QUIET) find_package(ortp CONFIG QUIET) -if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS) -- message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target all") -- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" -- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" -- DEPENDS ${APP_DEPENDS} -- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} --# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") +- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" +- DEPENDS ${APP_DEPENDS} +- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project" +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} - # ${APP_OPTIONS} -- BUILD_ALWAYS ON +- BUILD_ALWAYS ON - ) - install(CODE "message(STATUS Running install)") - set(AUTO_REGENERATION auto_regeneration) @@ -79,9 +80,10 @@ index fb699155..bb8270c1 100644 - add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) - add_dependencies(app-library ${APP_DEPENDS}) -endif() --ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" +-ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" - INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" - BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} -# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator @@ -112,5 +114,5 @@ index 7f7fd573..a69a04e8 100644 endif () endif () -- -2.29.0 +2.29.2 diff --git a/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch b/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch index ecec4ade0..547652d3a 100644 --- a/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch +++ b/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch @@ -1,4 +1,4 @@ -From b7bbebb8bf6f4fe8d321d4ace84b5a62326e5b89 Mon Sep 17 00:00:00 2001 +From 6fc23da651d54979e73776fcda38614e290d65dc Mon Sep 17 00:00:00 2001 From: David P Date: Fri, 23 Oct 2020 16:44:17 -0300 Subject: [PATCH 2/2] remove bc_compute_full_version usage @@ -10,7 +10,7 @@ Subject: [PATCH 2/2] remove bc_compute_full_version usage 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt -index b85e3684..43bcd171 100644 +index 3bc9420a..27b418ee 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -21,17 +21,8 @@ @@ -49,7 +49,7 @@ index 8ef03faa..97d94bd6 100644 set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}) diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -index 9549b595..6b05379c 100644 +index baea03cf..08ffc1b5 100644 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt @@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui") @@ -70,5 +70,5 @@ index 9549b595..6b05379c 100644 endif () string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}") -- -2.29.0 +2.29.2 diff --git a/pcr/linphone-desktop/PKGBUILD b/pcr/linphone-desktop/PKGBUILD index 63b1b364c..0312ea45d 100644 --- a/pcr/linphone-desktop/PKGBUILD +++ b/pcr/linphone-desktop/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: David P. pkgname=linphone-desktop -pkgver=4.2.3 +pkgver=4.2.4 pkgrel=1 pkgdesc='A free VoIP and video softphone based on the SIP protocol' arch=(x86_64 i686) @@ -13,9 +13,9 @@ source=("https://gitlab.linphone.org/BC/public/$pkgname/-/archive/$pkgver/$pkgna 0001-do-not-build-linphone-sdk.patch 0002-remove-bc_compute_full_version-usage.patch ) -sha512sums=('d0f0fbd99bd8ab20d89b525ac4f38774974aefedb36b311b51190682ffdceedaed205e918c3685124497aa14d95dfdf1bd6c1c2675a1dd2452fed44d7b171bce' - '24f9849692ca1f937661dfaa89695da38d5c1713f42d364446568fdef3fca54cc195bf815111c7bf570e4520f15846ecd5d0cd44cefa380384bf37d74c69e9a9' - 'c41551388e590844b06e0ff23ec079c5a10a67a6ec9b1aec27d2662e5e8b22d8cbceb601e0277365f2e9b0c004af06b6481248b296b7645007d964e16dac197f') +sha512sums=('00b150b547032f2621ba3e31318258ab5c7d087877cbf362e10824da64b21bc227c9fd571ba35874f51d083a753f703abfed883c14988c634274e0cb273d0cb6' + '1643fcaf4c033125b0cebd7e31a15c87baa62126bbecf12cc599f9ea1aa719ccb76a9d15849e0c7d5d1218445c0e3297771ed152930e14dadaaa87772a4c3ad7' + 'aea52c176474018b0bb05cb0ff370ec63aecbce66b3ed29e25a7be108239b91f33971317bdb3bef01730348cd98d17a2b6f24488854d34f7066371141f7d02f6') prepare() { cd "$pkgname-$pkgver" -- cgit v1.2.3