[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
25/26: gnu: linphone-desktop: Update to 5.0.14.
|
From: |
guix-commits |
|
Subject: |
25/26: gnu: linphone-desktop: Update to 5.0.14. |
|
Date: |
Sun, 9 Apr 2023 05:06:39 -0400 (EDT) |
rekado pushed a commit to branch core-updates
in repository guix.
commit 043b3dd45742c1ede1a6a97375af2e4b2d63691b
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sat Apr 8 20:04:42 2023 +0200
gnu: linphone-desktop: Update to 5.0.14.
* gnu/packages/linphone.scm (linphone-desktop): Update to 5.0.14.
[arguments]: Use G-expressions; add pre-install phase.
* gnu/packages/patches/linphone-desktop-without-sdk.patch: Update.
---
gnu/packages/linphone.scm | 78 +++++----
.../patches/linphone-desktop-without-sdk.patch | 187 +++++++++------------
2 files changed, 129 insertions(+), 136 deletions(-)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 3beb8c7ab8..4666216975 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -818,7 +818,7 @@ and video calls or instant messaging capabilities to an
application.")
(define-public linphone-desktop
(package
(name "linphone-desktop")
- (version "4.2.5")
+ (version "5.0.14")
(source
(origin
(method git-fetch)
@@ -827,41 +827,55 @@ and video calls or instant messaging capabilities to an
application.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1gq4l9p21rbrcksa7fbkzn9fzbbynqmn6ni6lhnvzk359sb1xvbz"))
+ (base32 "0glrfsp087ni5hn6x6p4f6y63r4nyp061yyy0rfgddbxkzdqi2j1"))
(patches (search-patches "linphone-desktop-without-sdk.patch"))))
(build-system qt-build-system)
(outputs '("out" "debug"))
(arguments
- `(#:tests? #f ; No test target
- #:configure-flags (list "-DENABLE_UPDATE_CHECK=NO"
- "-DENABLE_DAEMON=YES"
- "-DENABLE_CONSOLE_UI=YES")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'pre-configure
- (lambda _
- (make-file-writable "linphone-app/linphoneqt_version.cmake")
- (substitute* "linphone-app/linphoneqt_version.cmake"
- (("\\$\\{GUIX-SET-VERSION\\}") ,version))))
- (add-after 'install 'post-install
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (liblinphone (assoc-ref inputs "liblinphone"))
- (grammar-dest (string-append out "/share/belr/grammars")))
- ;; Remove unnecessary Qt configuration file.
- (delete-file (string-append out "/bin/qt.conf"))
- ;; Not using the FHS exposes an issue where the client
- ;; refers to its own directories, which lacks files
- ;; installed by the dependencies.
- (symlink (string-append liblinphone "/lib")
- (string-append out "/lib"))
- (symlink (string-append liblinphone "/share/sounds")
- (string-append out "/share/sounds"))
- (symlink (string-append liblinphone
"/share/linphone/rootca.pem")
- (string-append out "/share/linphone/rootca.pem"))
- (mkdir-p (dirname grammar-dest))
- (symlink (string-append liblinphone "/share/belr/grammars")
- grammar-dest)))))))
+ (list
+ #:tests? #f ; No test target
+ #:configure-flags
+ #~(list (string-append "-DFULL_VERSION=" #$version)
+ (string-append "-DCMAKE_INSTALL_PREFIX=" #$output)
+ (string-append "-DCMAKE_INSTALL_BINDIR=" #$output "/bin")
+ (string-append "-DCMAKE_INSTALL_DATAROOTDIR=" #$output "/share")
+ (string-append "-DCMAKE_INSTALL_LIBDIR=" #$output "/lib")
+ "-DENABLE_UPDATE_CHECK=NO"
+ "-DENABLE_DAEMON=YES"
+ "-DENABLE_CONSOLE_UI=YES")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'pre-configure
+ (lambda _
+ (make-file-writable "linphone-app/linphoneqt_version.cmake")
+ (substitute* "linphone-app/linphoneqt_version.cmake"
+ (("\\$\\{GUIX-SET-VERSION\\}") #$version))))
+ (add-before 'install 'pre-install
+ (lambda _
+ (mkdir-p (string-append #$output "/share/linphone"))
+ (symlink (string-append #$(this-package-input "liblinphone")
+ "/share/sounds")
+ (string-append #$output
+ "/share/sounds"))))
+ (add-after 'install 'post-install
+ (lambda _
+ (let* ((liblinphone #$(this-package-input "liblinphone"))
+ (grammar-dest (string-append #$output
"/share/belr/grammars")))
+ ;; Remove unnecessary Qt configuration file.
+ (delete-file (string-append #$output "/bin/qt.conf"))
+ ;; Not using the FHS exposes an issue where the client
+ ;; refers to its own directories, which lacks files
+ ;; installed by the dependencies.
+ (for-each
+ (lambda (file)
+ (symlink file
+ (string-append #$output "/lib/" (basename file))))
+ (find-files (string-append liblinphone "/lib")))
+ (symlink (string-append liblinphone
"/share/linphone/rootca.pem")
+ (string-append #$output "/share/linphone/rootca.pem"))
+ (mkdir-p (dirname grammar-dest))
+ (symlink (string-append liblinphone "/share/belr/grammars")
+ grammar-dest)))))))
(native-inputs
(list pkg-config qttools-5))
(inputs
diff --git a/gnu/packages/patches/linphone-desktop-without-sdk.patch
b/gnu/packages/patches/linphone-desktop-without-sdk.patch
index 63e9808bf4..ef61b86707 100644
--- a/gnu/packages/patches/linphone-desktop-without-sdk.patch
+++ b/gnu/packages/patches/linphone-desktop-without-sdk.patch
@@ -13,13 +13,12 @@ Subject: [PATCH] [PATCH]: Fix building from git.
6 files changed, 6 insertions(+), 121 deletions(-)
create mode 100644 linphone-app/linphoneqt_version.cmake
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f7eb05f2..3e853bdd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,16 +48,6 @@ project(linphoneqt)
- include(GNUInstallDirs)
- include(CheckCXXCompilerFlag)
+diff -ru a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
++++ b/CMakeLists.txt 2023-04-08 16:00:45.487927870 +0200
+@@ -51,23 +51,6 @@
+
+ set(CMAKE_CXX_STANDARD 11)
-# Prepare gobal CMAKE configuration specific to the current project
-set(SDK_BUILD_DIR "${CMAKE_BINARY_DIR}/WORK") # SDK build in WORK. Keep
all in it.
@@ -27,30 +26,43 @@ index f7eb05f2..3e853bdd 100644
-
-set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT")
-
--set(CMAKE_PREFIX_PATH
"${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}")
+-set(CMAKE_PREFIX_PATH
"${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}/include${PREFIX_PATH}")
+-if(WIN32)
+- set( CMAKE_PREFIX_PATH
"${CMAKE_PREFIX_PATH};${APPLICATION_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}")
+-elseif(APPLE)
+- set( CMAKE_PREFIX_PATH
"${CMAKE_PREFIX_PATH};${APPLICATION_NAME}.app/Contents/Frameworks")
+-else()
+- set( CMAKE_PREFIX_PATH
"${CMAKE_PREFIX_PATH};${APPLICATION_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}")
+-endif()
-string(REPLACE ";" "|" PREFIX_PATH "${CMAKE_PREFIX_PATH}")
-#set(PREFIX_PATH
"${LINPHONE_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}")
-
# Avoid cmake warning if CMP0071 is not set.
if (POLICY CMP0071)
cmake_policy(SET CMP0071 NEW)
-@@ -116,9 +106,6 @@ if(ENABLE_V4L)
+@@ -177,10 +160,8 @@
endif()
list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}")
-list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}")
--
+ list(APPEND APP_OPTIONS "-DENABLE_QT_GL=${ENABLE_VIDEO}")#Activate on video
+
-include(ExternalProject)
set(PROJECT_BUILD_COMMAND "")
if(CMAKE_BUILD_PARALLEL_LEVEL)
list(APPEND APP_OPTIONS
"-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}")
-@@ -133,32 +120,10 @@ if(CMAKE_VERBOSE_MAKEFILE)
+@@ -195,7 +176,6 @@
endif()
endif()
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()
+ elseif(APPLE)
+ list(APPEND APP_OPTIONS "-DENABLE_FAT_BINARY=ON") #Disable
XCFrameworks as it is not supported.
+@@ -222,28 +202,9 @@
+
+
+ if(NOT LINPHONE_QT_ONLY)
-ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk"
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk"
- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}"
@@ -61,7 +73,7 @@ index f7eb05f2..3e853bdd 100644
- 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}
+- BUILD_ALWAYS NO #${DO_BUILD}
-)
-ExternalProject_Add_Step(sdk force_build
- COMMENT "Forcing build for 'desktop'"
@@ -69,18 +81,17 @@ index f7eb05f2..3e853bdd 100644
- DEPENDERS build
- ALWAYS 1
-)
+ endif()
include(FindPkgConfig)
-set(APP_DEPENDS sdk)
--
--
- find_package(Qt5 5.12 COMPONENTS Core REQUIRED)
+ find_package(Qt5 5.10 COMPONENTS Core REQUIRED)
if ( NOT Qt5_FOUND )
-@@ -173,39 +138,5 @@ find_package(Mediastreamer2 CONFIG QUIET)
+@@ -257,62 +218,5 @@
+ 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 install")
- ExternalProject_Add(linphone-qt PREFIX
"${CMAKE_BINARY_DIR}/linphone-app"
@@ -89,22 +100,45 @@ index f7eb05f2..3e853bdd 100644
- 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"
+- 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
- )
+- if( ENABLE_BUILD_APP_PLUGINS)
+- ExternalProject_Add(app-plugins PREFIX
"${CMAKE_BINARY_DIR}/plugins-app"
+- SOURCE_DIR "${CMAKE_SOURCE_DIR}/plugins"
+- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
+- BINARY_DIR "${CMAKE_BINARY_DIR}/plugins-app"
+- DEPENDS linphone-qt
+- 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}
+- )
+- endif()
- 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)
+- if( ENABLE_BUILD_APP_PLUGINS)
+- add_custom_target(${AUTO_REGENERATION} ALL
+- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
+- DEPENDS app-plugins)
+- else()
+- add_custom_target(${AUTO_REGENERATION} ALL
+- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
+- DEPENDS linphone-qt)
+- endif()
-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})
+- if(NOT LINPHONE_QT_ONLY)
+- add_dependencies(app-library ${APP_DEPENDS})
+- endif()
+- if( ENABLE_BUILD_APP_PLUGINS)
+- add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app")
+- endif()
-endif()
-ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app"
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app"
@@ -115,14 +149,25 @@ index f7eb05f2..3e853bdd 100644
- 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
+- #BUILD_ALWAYS ON
-)
+message("Adding Linphone Desktop in an IDE-friendly state")
+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
-diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt
-index 3bc9420a..5267cd4a 100644
---- a/linphone-app/CMakeLists.txt
-+++ b/linphone-app/CMakeLists.txt
+diff -ru a/linphone-app/cmake_builder/additional_steps.cmake
./linphone-app/cmake_builder/additional_steps.cmake
+--- a/linphone-app/cmake_builder/additional_steps.cmake 1970-01-01
01:00:01.000000000 +0100
++++ ./linphone-app/cmake_builder/additional_steps.cmake 2023-04-08
16:02:33.005843116 +0200
+@@ -61,7 +61,7 @@
+ 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}
++ CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS}
-DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE
-DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs
-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 ()
+diff -ru a/linphone-app/CMakeLists.txt ./linphone-app/CMakeLists.txt
+--- a/linphone-app/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
++++ ./linphone-app/CMakeLists.txt 2023-04-08 16:01:32.699012115 +0200
@@ -21,17 +21,8 @@
################################################################################
cmake_minimum_required(VERSION 3.1)
@@ -140,96 +185,30 @@ index 3bc9420a..5267cd4a 100644
-
-project(linphoneqt VERSION
"${version_major}.${version_minor}.${version_patch}")
+
if(ENABLE_BUILD_VERBOSE)
- #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}")
-@@ -49,7 +40,6 @@ if(UNIX AND NOT APPLE)
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+@@ -51,7 +42,6 @@
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
-list(APPEND CMAKE_MODULE_PATH "${LINPHONE_OUTPUT_DIR}/cmake")
set(APP_LIBRARY app-library)
- include(application_info.cmake)
-diff --git a/linphone-app/cmake_builder/additional_steps.cmake
b/linphone-app/cmake_builder/additional_steps.cmake
-index 7f7fd573..48e3c716 100644
---- a/linphone-app/cmake_builder/additional_steps.cmake
-+++ b/linphone-app/cmake_builder/additional_steps.cmake
-@@ -61,7 +61,7 @@ if (ENABLE_PACKAGING)
- 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}
-+ CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS}
-DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE
-DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs
-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 ()
-diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
-index baea03cf..d06dcb74 100644
---- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
-+++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
-@@ -200,44 +200,6 @@ elseif (APPLE)
- endif ()
- # install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME}.app"
DESTINATION "." USE_SOURCE_PERMISSIONS)
- else()# Not Windows and Apple
-- foreach (LIBRARY ${SHARED_LIBRARIES})
-- get_filename_component(LIBRARY_FILENAME ${LIBRARY} NAME)
-- message("Changing RPATH of ${LIBRARY_FILENAME} from
'${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}' to
'$ORIGIN/../${CMAKE_INSTALL_LIBDIR}'")
-- execute_process(COMMAND install_name_tool -rpath
"${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}" "$ORIGIN/../lib" "${LIBRARY}")
-- execute_process(COMMAND install_name_tool -addrpath
"$ORIGIN/../lib64" "${LIBRARY}")
-- endforeach ()
-- install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}/"
DESTINATION "${CMAKE_INSTALL_BINDIR}" USE_SOURCE_PERMISSIONS)
--#Just in case. This is useless because we have to use CMAKE_INSTALL_LIBDIR
-- if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib/")
-- file(GLOB SHARED_LIBRARIES "${LINPHONE_OUTPUT_DIR}/lib/*.so*")
-- if( ENABLE_OPENH264 )# Remove openH264 lib from the
installation. this codec will be download by user
-- foreach(item ${SHARED_LIBRARIES})
-- get_filename_component(LIBRARY_FILENAME ${item}
NAME)
-- if("${LIBRARY_FILENAME}" MATCHES
"^libopenh264.*$")
-- list(REMOVE_ITEM SHARED_LIBRARIES
${item})
-- endif()
-- endforeach(item)
-- endif()
-- install(FILES ${SHARED_LIBRARIES} DESTINATION "lib")
-- endif()
-- if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib64/")
-- file(GLOB SHARED_LIBRARIES "${LINPHONE_OUTPUT_DIR}/lib64/*.so*")
-- if( ENABLE_OPENH264 )# Remove openH264 lib from the
installation. this codec will be download by user
-- foreach(item ${SHARED_LIBRARIES})
-- get_filename_component(LIBRARY_FILENAME ${item}
NAME)
-- if("${LIBRARY_FILENAME}" MATCHES
"^libopenh264.*$")
-- list(REMOVE_ITEM SHARED_LIBRARIES
${item})
-- endif()
-- endforeach(item)
-- endif()
-- install(FILES ${SHARED_LIBRARIES} DESTINATION "lib64")
-- endif()
-- install(DIRECTORY
"${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" DESTINATION
"${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS)
-- if(ENABLE_BUILD_VERBOSE)
-- message("INSTALLATION :
${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" )
-- endif()
-- file(GLOB PLUGINS_FILES
"${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins/*")
-- install(FILES ${PLUGINS_FILES} DESTINATION "plugins/mediastreamer/" )
- # Install desktop/icon files.
-
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../assets/linphone.desktop.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" @ONLY)
- install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" DESTINATION
"${CMAKE_INSTALL_DATADIR}/applications")
+ set(APP_PLUGIN app-plugin)
diff --git a/linphone-app/linphoneqt_version.cmake
b/linphone-app/linphoneqt_version.cmake
new file mode 100644
index 00000000..a85d3455
--- /dev/null
+++ b/linphone-app/linphoneqt_version.cmake
-@@ -0,0 +1 @@
+@@ -0,0 +1,1 @@
+project(linphoneqt VERSION ${GUIX-SET-VERSION})
\ No newline at end of file
-diff --git a/linphone-app/src/config.h.cmake b/linphone-app/src/config.h.cmake
-index 093539e0..5a238c70 100644
---- a/linphone-app/src/config.h.cmake
-+++ b/linphone-app/src/config.h.cmake
-@@ -28,3 +28,4 @@
- #cmakedefine ENABLE_UPDATE_CHECK 1
+diff -ru a/linphone-app/src/config.h.cmake b/linphone-app/src/config.h.cmake
+--- a/linphone-app/src/config.h.cmake 1970-01-01 01:00:01.000000000 +0100
++++ b/linphone-app/src/config.h.cmake 2023-04-08 16:05:33.458349986 +0200
+@@ -32,3 +32,4 @@
#cmakedefine EXECUTABLE_NAME "${EXECUTABLE_NAME}"
#cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}"
+ #cmakedefine ENABLE_APP_WEBVIEW "${ENABLE_APP_WEBVIEW}"
+#define LINPHONE_QT_GIT_VERSION "${PROJECT_VERSION}"
\ No newline at end of file
---
-2.31.0
-
- 04/26: gnu: belr: Update to 5.2.49., (continued)
- 04/26: gnu: belr: Update to 5.2.49., guix-commits, 2023/04/09
- 06/26: gnu: belcard: Simplify by using G-expression., guix-commits, 2023/04/09
- 08/26: gnu: soci: Update to 4.0.3., guix-commits, 2023/04/09
- 23/26: gnu: Add openldap-for-linphone., guix-commits, 2023/04/09
- 05/26: gnu: belcard: Update to 5.2.49., guix-commits, 2023/04/09
- 16/26: gnu: bcmatroska2: Update to 5.2.1., guix-commits, 2023/04/09
- 11/26: gnu: ortp: Use G-expression., guix-commits, 2023/04/09
- 17/26: gnu: mediastreamer2: Use G-expression., guix-commits, 2023/04/09
- 21/26: gnu: libxsd-frontend: Build with GCC 10., guix-commits, 2023/04/09
- 24/26: gnu: liblinphone: Update to 5.2.50., guix-commits, 2023/04/09
- 25/26: gnu: linphone-desktop: Update to 5.0.14.,
guix-commits <=
- 09/26: gnu: lime: Update to 5.2.49., guix-commits, 2023/04/09
- 12/26: gnu: ortp: Drop input labels., guix-commits, 2023/04/09
- 13/26: gnu: ortp: Update to 5.2.49., guix-commits, 2023/04/09
- 22/26: gnu: xsd: Build with GCC 10., guix-commits, 2023/04/09
- 14/26: gnu: bzrtp: Drop input labels., guix-commits, 2023/04/09
- 20/26: gnu: cli: Use GCC 10., guix-commits, 2023/04/09
- 15/26: gnu: bzrtp: Update to 5.2.49., guix-commits, 2023/04/09
- 18/26: gnu: mediastreamer2: Drop input labels., guix-commits, 2023/04/09
- 26/26: gnu: qtbase: Disable qsslkey tests., guix-commits, 2023/04/09
- 19/26: gnu: mediastreamer2: Update to 5.2.49., guix-commits, 2023/04/09