summaryrefslogtreecommitdiff
path: root/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-07-23 12:41:24 -0400
committerDavid P <megver83@parabola.nu>2020-07-23 12:41:24 -0400
commit118d49b70e08b4bb49acbbf048062af1d733a792 (patch)
tree5708e57b7e808cbdc6fa705c41795ad240b027c7 /pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch
parent7cff0759b29fe43428bc21632da8e40dddacff92 (diff)
downloadabslibre-118d49b70e08b4bb49acbbf048062af1d733a792.tar.gz
abslibre-118d49b70e08b4bb49acbbf048062af1d733a792.tar.bz2
abslibre-118d49b70e08b4bb49acbbf048062af1d733a792.zip
addpkg: pcr/linphone-desktop 4.2.1-1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch')
-rw-r--r--pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch91
1 files changed, 91 insertions, 0 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
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 <megver83@parabola.nu>
+Date: Wed, 22 Jul 2020 17:26:39 -0400
+Subject: [PATCH 1/2] do not build linphone-sdk
+
+Signed-off-by: David P <megver83@parabola.nu>
+---
+ 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 <BINARY_DIR> --config $<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=<INSTALL_DIR> -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 <BINARY_DIR> --config $<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=<INSTALL_DIR> -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
+