diff options
| -rw-r--r-- | .SRCINFO | 42 | ||||
| -rw-r--r-- | 0001-do-not-build-linphone-sdk.patch | 44 | ||||
| -rw-r--r-- | 0002-remove-bc_compute_full_version-usage.patch | 8 | ||||
| -rw-r--r-- | PKGBUILD | 74 |
4 files changed, 101 insertions, 67 deletions
@@ -1,29 +1,41 @@ pkgbase = linphone-desktop pkgdesc = A free VoIP and video softphone based on the SIP protocol - pkgver = 4.2.3 + pkgver = 5.2.4 pkgrel = 1 url = http://linphone.org arch = x86_64 - arch = i686 license = GPL + makedepends = meson + makedepends = coreutils + makedepends = git + makedepends = gendesk makedepends = cmake - makedepends = python-pystache - makedepends = doxygen - makedepends = nasm makedepends = yasm + makedepends = nasm + makedepends = doxygen + makedepends = perl + makedepends = python-pystache makedepends = python-six + makedepends = libpulse + makedepends = qt5-base + makedepends = qt5-declarative + makedepends = qt5-quickcontrols2 + makedepends = qt5-svg + makedepends = qt5-tools + depends = qt5-base + depends = qt5-multimedia + depends = qt5-graphicaleffects depends = qt5-quickcontrols depends = qt5-quickcontrols2 - depends = qt5-graphicaleffects depends = qt5-svg - depends = qt5-tools - depends = liblinphone - source = https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/4.2.3/linphone-desktop-4.2.3.tar.gz - source = 0001-do-not-build-linphone-sdk.patch - source = 0002-remove-bc_compute_full_version-usage.patch - sha512sums = d0f0fbd99bd8ab20d89b525ac4f38774974aefedb36b311b51190682ffdceedaed205e918c3685124497aa14d95dfdf1bd6c1c2675a1dd2452fed44d7b171bce - sha512sums = 24f9849692ca1f937661dfaa89695da38d5c1713f42d364446568fdef3fca54cc195bf815111c7bf570e4520f15846ecd5d0cd44cefa380384bf37d74c69e9a9 - sha512sums = c41551388e590844b06e0ff23ec079c5a10a67a6ec9b1aec27d2662e5e8b22d8cbceb601e0277365f2e9b0c004af06b6481248b296b7645007d964e16dac197f + depends = qt5-speech + depends = libxcrypt-compat + depends = v4l-utils + depends = glew + provides = linphone=5.2.4 + source = git+https://github.com/BelledonneCommunications/linphone-desktop.git#commit=d69e033508265f756fb47b39b76b7d589be159c0 + source = linphone.png::https://gitlab.linphone.org/BC/public/linphone-desktop/-/raw/8dfd384e3df08b200c8eb382b740da6839961bf0/linphone-app/assets/icons/hicolor/128x128/apps/icon.png + sha512sums = SKIP + sha512sums = d6495cdc022b1e4c92b3641cb70347e7e6b6ef47599004de729e908b4876a12540713ab54b588611c99c8025fb9b33e3392573c85c13f72cdaee8bcf7a73d65d pkgname = linphone-desktop - diff --git a/0001-do-not-build-linphone-sdk.patch b/0001-do-not-build-linphone-sdk.patch index 512a1639859d..fe774a479fac 100644 --- a/0001-do-not-build-linphone-sdk.patch +++ b/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 <megver83@parabola.nu> -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 <megver83@parabola.nu> --- - 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 <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} +- 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 <BINARY_DIR> --config $<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=<INSTALL_DIR> -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 <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 @@ -112,5 +114,5 @@ index 7f7fd573..a69a04e8 100644 endif () endif () -- -2.29.0 +2.29.2 diff --git a/0002-remove-bc_compute_full_version-usage.patch b/0002-remove-bc_compute_full_version-usage.patch index ecec4ade0459..547652d3af7f 100644 --- a/0002-remove-bc_compute_full_version-usage.patch +++ b/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 <megver83@parabola.nu> 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 @@ -1,45 +1,65 @@ -# Maintainer: David P. <megver83@parabola.nu> +# Maintainer: Daniel Poellmann <aur@<lastname><firstname>.de> +# Contributor: David P. <megver83@parabola.nu> pkgname=linphone-desktop -pkgver=4.2.3 +pkgver=5.2.4 pkgrel=1 pkgdesc='A free VoIP and video softphone based on the SIP protocol' -arch=(x86_64 i686) +arch=(x86_64) url='http://linphone.org' license=(GPL) -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-remove-bc_compute_full_version-usage.patch +depends=('qt5-base' 'qt5-multimedia' 'qt5-graphicaleffects' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-speech' 'libxcrypt-compat' 'v4l-utils' 'glew') +makedepends=('meson' 'coreutils' 'git' 'gendesk' 'cmake' 'yasm' 'nasm' 'doxygen' 'perl' 'python-pystache' 'python-six' 'libpulse' 'qt5-base' 'qt5-declarative' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-tools') +source=("git+https://github.com/BelledonneCommunications/linphone-desktop.git#commit=d69e033508265f756fb47b39b76b7d589be159c0" + "linphone.png::https://gitlab.linphone.org/BC/public/linphone-desktop/-/raw/8dfd384e3df08b200c8eb382b740da6839961bf0/linphone-app/assets/icons/hicolor/128x128/apps/icon.png" + ) +sha512sums=('SKIP' + 'd6495cdc022b1e4c92b3641cb70347e7e6b6ef47599004de729e908b4876a12540713ab54b588611c99c8025fb9b33e3392573c85c13f72cdaee8bcf7a73d65d' ) -sha512sums=('d0f0fbd99bd8ab20d89b525ac4f38774974aefedb36b311b51190682ffdceedaed205e918c3685124497aa14d95dfdf1bd6c1c2675a1dd2452fed44d7b171bce' - '24f9849692ca1f937661dfaa89695da38d5c1713f42d364446568fdef3fca54cc195bf815111c7bf570e4520f15846ecd5d0cd44cefa380384bf37d74c69e9a9' - 'c41551388e590844b06e0ff23ec079c5a10a67a6ec9b1aec27d2662e5e8b22d8cbceb601e0277365f2e9b0c004af06b6481248b296b7645007d964e16dac197f') +options=() +provides=(linphone=${pkgver}) prepare() { - cd "$pkgname-$pkgver" - patch -Np1 -i ../0001-do-not-build-linphone-sdk.patch - patch -Np1 -i ../0002-remove-bc_compute_full_version-usage.patch - - # Fix building out-of-git - echo '#define LINPHONE_QT_GIT_VERSION "${PROJECT_VERSION}"' >> linphone-app/src/config.h.cmake - # Hardcode linphoneqt version - echo "project(linphoneqt VERSION $pkgver)" > linphone-app/linphoneqt_version.cmake + cd "$srcdir/linphone-desktop" + git submodule update --init --recursive } build() { - mkdir -p build - cd build + cd "$srcdir/linphone-desktop" + mkdir -p build build/OUTPUT && cd build - cmake "../$pkgname-$pkgver" - make + cmake .. -DCMAKE_BUILD_PARALLEL_LEVEL=$(nproc) -DCMAKE_BUILD_TYPE=RelWithDebInfo + cmake --build . --target install --parallel $(nproc) --config RelWithDebInfo - sed -i '/linphone-sdk/d' linphone-app/cmake_builder/linphone_package/cmake_install.cmake - sed -i "s|$srcdir/build/OUTPUT|$pkgdir/usr|" cmake_install.cmake + cd "$srcdir" + gendesk -f -n \ + --pkgname="$pkgname" \ + --pkgdesc="$pkgdesc" \ + --name=Linphone \ + --genericname="VoIP Client" \ + --categories=Network \ + --icon=linphone.png \ + --exec=/opt/linphone/linphone-launcher \ + --terminal=false \ + --startupnotify=true \ + --comment "Linphone" } package() { - make -C build install - rm "$pkgdir/usr/bin/qt.conf" + mkdir -p "$pkgdir/opt/linphone/" + cp -r "$srcdir/linphone-desktop/build/OUTPUT/." "$pkgdir/opt/linphone/" + + mkdir -p "$pkgdir/usr/share/applications/" + install -Dm644 "$srcdir/linphone-desktop.desktop" "$pkgdir/usr/share/applications/" + + mkdir -p "$pkgdir/usr/share/pixmaps/" + install -Dm644 "$srcdir/linphone.png" "$pkgdir/usr/share/pixmaps/" + + # Add linphone's own lib folder to LD_LIBRARY_PATH + echo "#!/bin/bash" > "$pkgdir/opt/linphone/linphone-launcher" + echo 'LD_LIBRARY_PATH="/opt/linphone/lib:$LD_LIBRARY_PATH" /opt/linphone/bin/linphone "$@"' >> "$pkgdir/opt/linphone/linphone-launcher" + chmod +x "$pkgdir/opt/linphone/linphone-launcher" + + mkdir -p "$pkgdir/usr/bin/" + ln -s /opt/linphone/linphone-launcher "$pkgdir/usr/bin/linphone" } |