From 118d49b70e08b4bb49acbbf048062af1d733a792 Mon Sep 17 00:00:00 2001 From: David P Date: Thu, 23 Jul 2020 12:41:24 -0400 Subject: addpkg: pcr/linphone-desktop 4.2.1-1 Signed-off-by: David P --- .../0001-do-not-build-linphone-sdk.patch | 91 ++++++++++++++++++++++ .../0002-Fix-building-out-of-git.patch | 44 +++++++++++ pcr/linphone-desktop/PKGBUILD | 40 ++++++++++ 3 files changed, 175 insertions(+) create mode 100644 pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch create mode 100644 pcr/linphone-desktop/0002-Fix-building-out-of-git.patch create mode 100644 pcr/linphone-desktop/PKGBUILD diff --git a/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch b/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch new file mode 100644 index 000000000..ddc6fc4b3 --- /dev/null +++ b/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch @@ -0,0 +1,91 @@ +From 4c7794f7e0bba6577ebe1668af474f2b4e74b4b3 Mon Sep 17 00:00:00 2001 +From: David P +Date: Wed, 22 Jul 2020 17:26:39 -0400 +Subject: [PATCH 1/2] do not build linphone-sdk + +Signed-off-by: David P +--- + CMakeLists.txt | 33 ------------------- + .../cmake_builder/additional_steps.cmake | 9 ----- + 2 files changed, 42 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fb699155..af93ef38 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") + + list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") + +-include(ExternalProject) + 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() + endif() + +-ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" +- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" +- STAMP_DIR "${SDK_BUILD_DIR}/stamp" +- BINARY_DIR "${SDK_BUILD_DIR}" +- STEP_TARGETS build +- 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} +- #BUILD_ALWAYS NO #${DO_BUILD} +-) +-ExternalProject_Add_Step(sdk force_build +- COMMENT "Forcing build for 'desktop'" +- DEPENDEES configure +- DEPENDERS build +- ALWAYS 1 +-) + include(FindPkgConfig) + +-set(APP_DEPENDS sdk) +- +- + find_package(Qt5 5.12 COMPONENTS Core REQUIRED) + + if ( NOT Qt5_FOUND ) +@@ -192,15 +170,4 @@ else() + message("Adding Linphone Desktop in an IDE-friendly state") + set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") + add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) +- add_dependencies(app-library ${APP_DEPENDS}) + endif() +-ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphoneqt" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- 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} +- EXCLUDE_FROM_ALL ON +- BUILD_ALWAYS ON +-) +diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake +index 7f7fd573..a69a04e8 100644 +--- a/linphone-app/cmake_builder/additional_steps.cmake ++++ b/linphone-app/cmake_builder/additional_steps.cmake +@@ -54,14 +54,5 @@ if (ENABLE_PACKAGING) + linphone_builder_apply_flags() + linphone_builder_set_ep_directories(linphone_package) + linphone_builder_expand_external_project_vars() +- ExternalProject_Add(TARGET_linphone_package +- DEPENDS TARGET_linphone_builder +- TMP_DIR ${ep_tmp} +- BINARY_DIR ${ep_build} +- SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/linphone_package" +- DOWNLOAD_COMMAND "" +- CMAKE_GENERATOR ${CMAKE_GENERATOR} +- CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DLINPHONE_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY} +- ) + endif () + endif () +-- +2.27.0 + diff --git a/pcr/linphone-desktop/0002-Fix-building-out-of-git.patch b/pcr/linphone-desktop/0002-Fix-building-out-of-git.patch new file mode 100644 index 000000000..71ec35f14 --- /dev/null +++ b/pcr/linphone-desktop/0002-Fix-building-out-of-git.patch @@ -0,0 +1,44 @@ +From 98551f5eea1167e0bc42217d0e1cf0dd49f07153 Mon Sep 17 00:00:00 2001 +From: David P +Date: Wed, 22 Jul 2020 17:55:02 -0400 +Subject: [PATCH 2/2] Fix building out-of-git + +Based in https://build.opensuse.org/package/view_file/openSUSE:Factory/linphoneqt/linphoneqt-fix-no-git.patch + +Signed-off-by: David P +--- + linphone-app/src/app/AppController.cpp | 4 ++++ + linphone-app/src/config.h.cmake | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/linphone-app/src/app/AppController.cpp b/linphone-app/src/app/AppController.cpp +index e502d9fd..012981d2 100644 +--- a/linphone-app/src/app/AppController.cpp ++++ b/linphone-app/src/app/AppController.cpp +@@ -28,6 +28,10 @@ + + #include "AppController.hpp" + ++#ifndef LINPHONE_QT_GIT_VERSION ++#define LINPHONE_QT_GIT_VERSION LINPHONE_QT_VERSION ++#endif ++ + #include "components/other/desktop-tools/DesktopTools.hpp" + // ============================================================================= + +diff --git a/linphone-app/src/config.h.cmake b/linphone-app/src/config.h.cmake +index 093539e0..a4e7e25a 100644 +--- a/linphone-app/src/config.h.cmake ++++ b/linphone-app/src/config.h.cmake +@@ -20,6 +20,8 @@ + * + *******************************************************************************/ + ++#define LINPHONE_QT_VERSION "${PROJECT_VERSION}" ++ + #cmakedefine APPLICATION_DESCRIPTION "${APPLICATION_DESCRIPTION}" + #cmakedefine APPLICATION_ID "${APPLICATION_ID}" + #cmakedefine APPLICATION_NAME "${APPLICATION_NAME}" +-- +2.27.0 + diff --git a/pcr/linphone-desktop/PKGBUILD b/pcr/linphone-desktop/PKGBUILD new file mode 100644 index 000000000..eaa12d4ee --- /dev/null +++ b/pcr/linphone-desktop/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: David P. + +pkgname=linphone-desktop +pkgver=4.2.1 +pkgrel=1 +pkgdesc='A free VoIP and video softphone based on the SIP protocol' +arch=(x86_64 i686) +url='http://linphone.org' +license=(GPL) +depends=(qt5-quickcontrols2 qt5-graphicaleffects qt5-svg qt5-tools mediastreamer belcard liblinphone) +makedepends=(cmake python-pystache doxygen nasm yasm python-six) +source=("https://gitlab.linphone.org/BC/public/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz" + 0001-do-not-build-linphone-sdk.patch + 0002-Fix-building-out-of-git.patch +) +sha512sums=('4014960bb69cc1e6a9c2132d590600f2ebd5a820209bbbd76266f2ada7c2474c058c0a1c943fea1ffca20c64a6653ad8b8844326bdca35fa07999f05c68d1f8e' + '7f1c080d99d24765582d68782c9c20cca6c311990f17a5109a710174405790ff69b1320dc983d1ea605afd064f14f857bf03d1acbd9847b1cea3c99b475eee5d' + 'ea4c21c162f672f897c5a62ec8b51dd88fcc226e68b23148b4d3ed1bcdd69171a5995f3be1022f56cd48d6fdfca6455cda46e11306db60df3e63087b3f96e9e8') + +prepare() { + cd "$pkgname-$pkgver" + patch -Np1 -i ../0001-do-not-build-linphone-sdk.patch + patch -Np1 -i ../0002-Fix-building-out-of-git.patch +} + +build() { + mkdir -p build + cd build + + cmake -DCMAKE_BUILD_TYPE=Release "../$pkgname-$pkgver" + make + + sed '/linphone-sdk/d' -i linphone-app/cmake_builder/linphone_package/cmake_install.cmake + sed "s|$srcdir/build/OUTPUT|$pkgdir/usr|" -i cmake_install.cmake +} + +package() { + make -C build install + rm "$pkgdir/usr/bin/qt.conf" +} -- cgit v1.2.3