commit 8ba093c9975b603bc4e824b899d3c49570005f86
Author: Jakub Bogusz <[email protected]>
Date: Thu Apr 20 17:31:07 2023 +0200
- updated to 4.4.11
linphone-cmake.patch | 12 +++++-----
linphone-install.patch | 11 +++++++++
linphone-no-sdk.patch | 61 +++++++-------------------------------------------
linphone.spec | 50 +++++++++++++++++++++++++++++++++--------
4 files changed, 66 insertions(+), 68 deletions(-)
---
diff --git a/linphone.spec b/linphone.spec
index b24acb3..7b39656 100644
--- a/linphone.spec
+++ b/linphone.spec
@@ -1,15 +1,17 @@
Summary: Linphone Internet Phone
Summary(pl.UTF-8): Linphone - telefon internetowy
Name: linphone
-Version: 4.2.5
+# 5.0+ requires SDK v5.2, which is partially on AGPL (see DEVEL-5 branch)
+Version: 4.4.11
Release: 1
License: GPL v3+ or proprietary
Group: Applications/Communications
#Source0Download: https://gitlab.linphone.org/BC/public/linphone-desktop/-/tags
Source0:
https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/%{version}/linphone-desktop-%{version}.tar.bz2
-# Source0-md5: ecab72769c693d6e9cb632bb2ba42d22
+# Source0-md5: 89948a7412880c6393b3254fb99c50ef
Patch0: %{name}-no-sdk.patch
Patch1: %{name}-cmake.patch
+Patch2: %{name}-install.patch
URL: http://www.linphone.org/
BuildRequires: Qt5Concurrent-devel >= 5.12
BuildRequires: Qt5Core-devel >= 5.12
@@ -23,18 +25,23 @@ BuildRequires: Qt5Speech-devel >= 5.12
BuildRequires: Qt5Svg-devel >= 5.12
BuildRequires: Qt5Widgets-devel >= 5.12
BuildRequires: bctoolbox-devel >= 0.0.3
-BuildRequires: belcard-devel
+BuildRequires: belcard-devel >= 5.1
BuildRequires: cmake >= 3.1
BuildRequires: doxygen
-BuildRequires: liblinphone-devel >= 4.5
-BuildRequires: liblinphone-c++-devel >= 4.5
+BuildRequires: liblinphone-devel >= 5.1
+BuildRequires: liblinphone-c++-devel >= 5.1
BuildRequires: libstdc++-devel >= 6:4.7
-BuildRequires: mediastreamer-devel >= 4.5.22-1
-BuildRequires: ortp-devel >= 4.5.15-1
+BuildRequires: mediastreamer-devel >= 5.1
+BuildRequires: ortp-devel >= 5.1
BuildRequires: pkgconfig
BuildRequires: qt5-build >= 5.12
BuildRequires: qt5-linguist >= 5.12
BuildRequires: rpmbuild(macros) >= 1.605
+Requires: belcard >= 5.1
+Requires: liblinphone >= 5.1
+Requires: liblinphone-c++ >= 5.1
+Requires: mediastreamer >= 5.1
+Requires: ortp >= 5.1
Obsoletes: linphoneqt < 4.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,10 +59,26 @@ tekstowej.
Jest w pełni oparta o SIP, zarówno w przypadku połączeń, obecności
jak i komunikacji tekstowej.
+%package devel
+Summary: Header files for Linphone plugins
+Summary(pl.UTF-8): Pliki nagłówkowe dla wtyczek Linphone
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: Qt5Core-devel >= 5.12
+Requires: Qt5Network-devel >= 5.12
+Requires: libstdc++-devel >= 6:4.7
+
+%description devel
+Header files for Linphone plugins.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe dla wtyczek Linphone.
+
%prep
%setup -q -n linphone-desktop-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# hack versions (git describe doesn't work on dist tarballs)
%{__sed} -i -e 's/set(FULL_VERSION )/set(FULL_VERSION %{version})/;
/^bc_compute_full_version/d' linphone-app/CMakeLists.txt
@@ -63,12 +86,13 @@ jak i komunikacji tekstowej.
%{__sed} -i -e
's/bc_compute_full_version(APP_PROJECT_VERSION)/set(APP_PROJECT_VERSION
%{version})/' linphone-app/cmake_builder/linphone_package/CMakeLists.txt
%{__sed} -i -e 's/LINPHONE_QT_GIT_VERSION/"%{version}"/'
linphone-app/src/app/AppController.cpp
# adjust locales path
-%{__sed} -i -e '/LanguagePath/ s,"[^"]*","%{_datadir}/linphone/languages",'
linphone-app/src/app/App.cpp
+%{__sed} -i -e '/LanguagePath/ s,"[^"]*","%{_datadir}/linphone/languages",'
linphone-app/src/utils/Constants.hpp
%build
install -d build
cd build
-%cmake ..
+%cmake .. \
+ -DLINPHONE_QT_ONLY=ON
%{__make}
@@ -87,10 +111,14 @@ cp -p build/linphone-app/assets/languages/*.qm
$RPM_BUILD_ROOT%{_datadir}/linpho
%clean
rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
%doc CHANGELOG.md README.md
%attr(755,root,root) %{_bindir}/linphone
+%attr(755,root,root) %{_libdir}/libapp-plugin.so
%{_desktopdir}/linphone.desktop
%{_iconsdir}/hicolor/*x*/apps/linphone.png
%{_iconsdir}/hicolor/scalable/apps/linphone.svg
@@ -112,3 +140,7 @@ rm -rf $RPM_BUILD_ROOT
%lang(uk) %{_datadir}/linphone/languages/uk.qm
%lang(zh_CN) %{_datadir}/linphone/languages/zh_CN.qm
%{_datadir}/linphone/linphonerc-factory
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/LinphoneApp
diff --git a/linphone-cmake.patch b/linphone-cmake.patch
index fbeed04..88289ac 100644
--- a/linphone-cmake.patch
+++ b/linphone-cmake.patch
@@ -1,7 +1,7 @@
---- linphone-desktop-4.2.5/CMakeLists.txt.orig 2021-07-17 17:21:38.966891901
+0200
-+++ linphone-desktop-4.2.5/CMakeLists.txt 2021-07-17 20:14:21.000755945
+0200
-@@ -43,7 +43,7 @@
- message(STATUS "Setting Platform to ${CMAKE_GENERATOR_PLATFORM}")
+--- linphone-desktop-5.0.15/CMakeLists.txt.orig 2023-04-19
21:14:47.137607063 +0200
++++ linphone-desktop-5.0.15/CMakeLists.txt 2023-04-19 21:17:02.070209404
+0200
+@@ -44,7 +44,7 @@ if( APPLE )
+ endif()
endif()
-project(linphoneqt)
@@ -9,8 +9,8 @@
include(GNUInstallDirs)
include(CheckCXXCompilerFlag)
-@@ -145,8 +145,8 @@
- message(FATAL_ERROR "Minimum supported Qt5 version is 5.12!")
+@@ -250,8 +250,8 @@ if ( NOT Qt5_FOUND )
+ message(FATAL_ERROR "Minimum supported Qt5 version is 5.10!")
endif()
-find_package(LinphoneCxx CONFIG QUIET)
diff --git a/linphone-install.patch b/linphone-install.patch
new file mode 100644
index 0000000..d65793e
--- /dev/null
+++ b/linphone-install.patch
@@ -0,0 +1,11 @@
+--- linphone-desktop-4.4.11/linphone-app/CMakeLists.txt.orig 2023-04-19
22:48:35.440449263 +0200
++++ linphone-desktop-4.4.11/linphone-app/CMakeLists.txt 2023-04-20
06:19:44.933446816 +0200
+@@ -645,7 +645,7 @@ add_custom_command(TARGET ${APP_PLUGIN}
+
+
+ #configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/*"
"${CMAKE_INSTALL_PREFIX}/include/LinphoneApp/" COPYONLY)
+-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION ".")
++install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/LinphoneApp"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
+
+ add_subdirectory(build)
diff --git a/linphone-no-sdk.patch b/linphone-no-sdk.patch
index ca5a19f..c14b0d2 100644
--- a/linphone-no-sdk.patch
+++ b/linphone-no-sdk.patch
@@ -1,54 +1,6 @@
---- linphone-desktop-4.2.5/CMakeLists.txt.orig 2020-12-18 19:29:31.000000000
+0100
-+++ linphone-desktop-4.2.5/CMakeLists.txt 2021-07-17 16:25:54.211678661
+0200
-@@ -136,28 +136,9 @@
- 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}"
-- 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)
--
-+set(APP_DEPENDS )
-
- find_package(Qt5 5.12 COMPONENTS Core REQUIRED)
-
-@@ -160,7 +160,6 @@
- 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
-@@ -177,7 +176,6 @@
- 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}/linphone-app"
- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app"
----
linphone-desktop-4.2.5/linphone-app/cmake_builder/linphone_package/CMakeLists.txt.orig
2021-07-17 20:57:04.230203073 +0200
-+++
linphone-desktop-4.2.5/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
2021-07-17 21:11:27.315527338 +0200
-@@ -206,7 +206,9 @@
+---
linphone-desktop-4.4.11/linphone-app/cmake_builder/linphone_package/CMakeLists.txt.orig
2022-11-03 08:37:39.000000000 +0100
++++
linphone-desktop-4.4.11/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
2023-04-19 22:47:47.690707946 +0200
+@@ -231,7 +231,9 @@ else()# Not Windows and Apple
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 ()
@@ -58,12 +10,15 @@
#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*")
-@@ -232,12 +234,16 @@
+@@ -257,6 +259,7 @@ else()# Not Windows and Apple
endif()
install(FILES ${SHARED_LIBRARIES} DESTINATION "lib64")
endif()
+ if (EXISTS "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}")
install(DIRECTORY
"${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" DESTINATION
"${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS)
+ install(DIRECTORY
"${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" DESTINATION
"${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS
+ PATTERN "linphone" EXCLUDE
+@@ -268,8 +271,11 @@ else()# Not Windows and Apple
if(ENABLE_BUILD_VERBOSE)
message("INSTALLATION :
${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" )
endif()
@@ -74,4 +29,4 @@
+ endif()
# 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")
+ install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" DESTINATION
"${CMAKE_INSTALL_DATADIR}/applications" PERMISSIONS OWNER_READ OWNER_WRITE
OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linphone.git/commitdiff/8ba093c9975b603bc4e824b899d3c49570005f86
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
