summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid P2020-08-03 13:05:48 -0400
committerDavid P2020-08-03 13:05:48 -0400
commit9f9e2db97580f0140ecaa6a88b8778f6f6b5a757 (patch)
treebfc25402d83fae032ee941bfb9f041b06e872b02
parent20c3377f938697e8eaa17621f54153b240412840 (diff)
downloadaur-9f9e2db97580f0140ecaa6a88b8778f6f6b5a757.tar.gz
upgpkg: linphone-desktop 4.2.2-1
-rw-r--r--.SRCINFO15
-rw-r--r--0001-do-not-build-linphone-sdk.patch49
-rw-r--r--0002-Fix-building-out-of-git.patch6
-rw-r--r--0003-remove-bc_compute_full_version-usage.patch52
-rw-r--r--PKGBUILD35
5 files changed, 119 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3a6b9aa2b51..0926cb55250 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linphone-desktop
pkgdesc = A free VoIP and video softphone based on the SIP protocol
- pkgver = 4.2.1
+ pkgver = 4.2.2
pkgrel = 1
url = http://linphone.org
arch = x86_64
@@ -12,19 +12,20 @@ pkgbase = linphone-desktop
makedepends = nasm
makedepends = yasm
makedepends = python-six
+ depends = qt5-quickcontrols
depends = qt5-quickcontrols2
depends = qt5-graphicaleffects
depends = qt5-svg
depends = qt5-tools
- depends = mediastreamer
- depends = belcard
depends = liblinphone
- source = https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/4.2.1/linphone-desktop-4.2.1.tar.gz
+ source = https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/4.2.2/linphone-desktop-4.2.2.tar.gz
source = 0001-do-not-build-linphone-sdk.patch
source = 0002-Fix-building-out-of-git.patch
- sha512sums = 4014960bb69cc1e6a9c2132d590600f2ebd5a820209bbbd76266f2ada7c2474c058c0a1c943fea1ffca20c64a6653ad8b8844326bdca35fa07999f05c68d1f8e
- sha512sums = 7f1c080d99d24765582d68782c9c20cca6c311990f17a5109a710174405790ff69b1320dc983d1ea605afd064f14f857bf03d1acbd9847b1cea3c99b475eee5d
- sha512sums = ea4c21c162f672f897c5a62ec8b51dd88fcc226e68b23148b4d3ed1bcdd69171a5995f3be1022f56cd48d6fdfca6455cda46e11306db60df3e63087b3f96e9e8
+ source = 0003-remove-bc_compute_full_version-usage.patch
+ sha512sums = 736b3448f309e8286acfdf724b765fcc77cb9d092ba892fd38f88f7af431c50f784c399bf5688cfe6caf45d2e6cc6e7d0c5e01b991be07b237f2f6bda35f338c
+ sha512sums = 7c1d1782d02da7b24ac1b39548a0b995d9abcfd883e3dfc0611f6431542ad7e873d785cf1e15033562818f0ce9ec1021d47d6b8ac5dc64530902b997f051c886
+ sha512sums = 8f90eed36db84369b8b44e7004d67f7634c3ef9549304491b56a1c0b18d676ab46afa0322353d6919f7317b4f0f387972be25dcfd09621d54fe63d74e8a1f52f
+ sha512sums = c09bce9a5fb51519bde651a6f25187274b2cb561b8590b9cd849f88d0cd35c4a8d4698578fe75d453c8c82135b8f5cf8e0a58093706dcfcb7382d07928c8dba9
pkgname = linphone-desktop
diff --git a/0001-do-not-build-linphone-sdk.patch b/0001-do-not-build-linphone-sdk.patch
index ddc6fc4b3b2..8020c50e97a 100644
--- a/0001-do-not-build-linphone-sdk.patch
+++ b/0001-do-not-build-linphone-sdk.patch
@@ -1,16 +1,16 @@
-From 4c7794f7e0bba6577ebe1668af474f2b4e74b4b3 Mon Sep 17 00:00:00 2001
+From 0b3528dc56f12f42f0039a22598cc04e80d6cd31 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
+Subject: [PATCH 1/3] 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(-)
+ CMakeLists.txt | 59 +------------------
+ .../cmake_builder/additional_steps.cmake | 9 ---
+ 2 files changed, 3 insertions(+), 65 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fb699155..af93ef38 100644
+index fb699155..bb8270c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}")
@@ -51,12 +51,34 @@ index fb699155..af93ef38 100644
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)
+@@ -170,37 +148,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 <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}
+- # ${APP_OPTIONS}
+- BUILD_ALWAYS ON
+- )
+- install(CODE "message(STATUS Running install)")
+- set(AUTO_REGENERATION auto_regeneration)
+- add_custom_target(${AUTO_REGENERATION} ALL
+- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
+- DEPENDS linphone-qt)
+-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()
+-endif()
-ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphoneqt"
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app"
- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
@@ -67,6 +89,9 @@ index fb699155..af93ef38 100644
- EXCLUDE_FROM_ALL ON
- BUILD_ALWAYS ON
-)
++message("Adding Linphone Desktop in an IDE-friendly state")
++set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
++add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
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
@@ -87,5 +112,5 @@ index 7f7fd573..a69a04e8 100644
endif ()
endif ()
--
-2.27.0
+2.28.0
diff --git a/0002-Fix-building-out-of-git.patch b/0002-Fix-building-out-of-git.patch
index 71ec35f1404..1ae0505bebb 100644
--- a/0002-Fix-building-out-of-git.patch
+++ b/0002-Fix-building-out-of-git.patch
@@ -1,7 +1,7 @@
-From 98551f5eea1167e0bc42217d0e1cf0dd49f07153 Mon Sep 17 00:00:00 2001
+From 9eebcb33ed8e56f6ec237b83d426c7d8c2b69e7b Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Wed, 22 Jul 2020 17:55:02 -0400
-Subject: [PATCH 2/2] Fix building out-of-git
+Subject: [PATCH 2/3] Fix building out-of-git
Based in https://build.opensuse.org/package/view_file/openSUSE:Factory/linphoneqt/linphoneqt-fix-no-git.patch
@@ -40,5 +40,5 @@ index 093539e0..a4e7e25a 100644
#cmakedefine APPLICATION_ID "${APPLICATION_ID}"
#cmakedefine APPLICATION_NAME "${APPLICATION_NAME}"
--
-2.27.0
+2.28.0
diff --git a/0003-remove-bc_compute_full_version-usage.patch b/0003-remove-bc_compute_full_version-usage.patch
new file mode 100644
index 00000000000..2484c87a843
--- /dev/null
+++ b/0003-remove-bc_compute_full_version-usage.patch
@@ -0,0 +1,52 @@
+From 7cf21c4f00b4a77613f5922e00789e60ded77536 Mon Sep 17 00:00:00 2001
+From: David P <megver83@parabola.nu>
+Date: Mon, 3 Aug 2020 12:51:55 -0400
+Subject: [PATCH 3/3] remove bc_compute_full_version usage
+
+---
+ linphone-app/build/CMakeLists.txt | 5 -----
+ .../cmake_builder/linphone_package/CMakeLists.txt | 12 +-----------
+ 2 files changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt
+index 8ef03faa..97d94bd6 100644
+--- a/linphone-app/build/CMakeLists.txt
++++ b/linphone-app/build/CMakeLists.txt
+@@ -46,11 +46,6 @@ set(CPACK_SOURCE_IGNORE_FILES
+ "libmng.spec"
+ )
+
+-bc_compute_full_version(PROJECT_VERSION_BUILD)
+-if(PROJECT_VERSION_BUILD)
+- set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION_BUILD}")
+-endif()
+-
+ message("-- Package file name is ${CPACK_PACKAGE_FILE_NAME}")
+
+ 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..f8634e1b 100644
+--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
++++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
+@@ -38,17 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui")
+ # ==============================================================================
+ # Build package version.
+ # ==============================================================================
+-bc_compute_full_version(APP_PROJECT_VERSION)
+-if (GIT_EXECUTABLE AND NOT(APP_PROJECT_VERSION))
+- execute_process(
+- COMMAND ${GIT_EXECUTABLE} describe --always
+- OUTPUT_VARIABLE APP_PROJECT_VERSION
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.."
+- )
+-elseif (NOT(APP_PROJECT_VERSION))
+- set(APP_PROJECT_VERSION "0.0.0")
+-endif ()
++set(APP_PROJECT_VERSION "0.0.0")
+ string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}")
+ string(REPLACE "." ";" SPLITTED_LINPHONE_VERSION "${LINPHONE_VERSION}")
+ list(LENGTH SPLITTED_LINPHONE_VERSION SPLITTED_LINPHONE_VERSION_LENGTH)
+--
+2.28.0
+
diff --git a/PKGBUILD b/PKGBUILD
index fbda4f28770..55e73aa6f51 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,43 @@
# Maintainer: David P. <megver83@parabola.nu>
pkgname=linphone-desktop
-pkgver=4.2.1
+pkgver=4.2.2
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)
+depends=(qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects qt5-svg qt5-tools 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
+ 0003-remove-bc_compute_full_version-usage.patch
)
-sha512sums=('4014960bb69cc1e6a9c2132d590600f2ebd5a820209bbbd76266f2ada7c2474c058c0a1c943fea1ffca20c64a6653ad8b8844326bdca35fa07999f05c68d1f8e'
- '7f1c080d99d24765582d68782c9c20cca6c311990f17a5109a710174405790ff69b1320dc983d1ea605afd064f14f857bf03d1acbd9847b1cea3c99b475eee5d'
- 'ea4c21c162f672f897c5a62ec8b51dd88fcc226e68b23148b4d3ed1bcdd69171a5995f3be1022f56cd48d6fdfca6455cda46e11306db60df3e63087b3f96e9e8')
+sha512sums=('736b3448f309e8286acfdf724b765fcc77cb9d092ba892fd38f88f7af431c50f784c399bf5688cfe6caf45d2e6cc6e7d0c5e01b991be07b237f2f6bda35f338c'
+ '7c1d1782d02da7b24ac1b39548a0b995d9abcfd883e3dfc0611f6431542ad7e873d785cf1e15033562818f0ce9ec1021d47d6b8ac5dc64530902b997f051c886'
+ '8f90eed36db84369b8b44e7004d67f7634c3ef9549304491b56a1c0b18d676ab46afa0322353d6919f7317b4f0f387972be25dcfd09621d54fe63d74e8a1f52f'
+ 'c09bce9a5fb51519bde651a6f25187274b2cb561b8590b9cd849f88d0cd35c4a8d4698578fe75d453c8c82135b8f5cf8e0a58093706dcfcb7382d07928c8dba9')
prepare() {
- cd "$pkgname-$pkgver"
- patch -Np1 -i ../0001-do-not-build-linphone-sdk.patch
- patch -Np1 -i ../0002-Fix-building-out-of-git.patch
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i ../0001-do-not-build-linphone-sdk.patch
+ patch -Np1 -i ../0002-Fix-building-out-of-git.patch
+ patch -Np1 -i ../0003-remove-bc_compute_full_version-usage.patch
}
build() {
- mkdir -p build
- cd build
+ mkdir -p build
+ cd build
- cmake -DCMAKE_BUILD_TYPE=Release "../$pkgname-$pkgver"
- make
+ cmake "../$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
+ 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"
+ make -C build install
+ rm "$pkgdir/usr/bin/qt.conf"
}