commit b914eb9b32b54e140a5b7b14292d309267fec483
Author: Jakub Bogusz <[email protected]>
Date: Wed Apr 26 18:46:54 2023 +0200
- updated to 5.2.51 (AGPL now)
liblinphone-belle-sip.patch | 120 --------------------------------------------
liblinphone-jsoncpp.patch | 39 ++++++--------
liblinphone-lime.patch | 46 -----------------
liblinphone-zxing.patch | 22 ++++++++
liblinphone.spec | 50 +++++++++---------
5 files changed, 62 insertions(+), 215 deletions(-)
---
diff --git a/liblinphone.spec b/liblinphone.spec
index 28bc081..bb8a866 100644
--- a/liblinphone.spec
+++ b/liblinphone.spec
@@ -9,37 +9,36 @@
Summary: Linphone Internet Phone libraries
Summary(pl.UTF-8): Biblioteki telefonu internetowego Linphone
Name: liblinphone
-# note: 5.2.x is AGPL-licensed; see DEVEL-5.2 branch
-Version: 5.1.73
+Version: 5.2.51
Release: 1
-License: GPL v3+ or proprietary
+License: AGPL v3+ or proprietary
Group: Applications/Communications
#Source0Download: https://gitlab.linphone.org/BC/public/liblinphone/-/tags
Source0:
https://gitlab.linphone.org/BC/public/liblinphone/-/archive/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 0c34e076a7cf1fcd53f19a17fb5403cb
+# Source0-md5: 30e4f91bb6355aebb325c4cf054c2ac6
Patch0: %{name}-c++-static.patch
Patch1: %{name}-static.patch
-Patch2: %{name}-lime.patch
-Patch3: %{name}-jsoncpp.patch
-Patch4: %{name}-link.patch
-Patch5: %{name}-belle-sip.patch
+Patch2: %{name}-jsoncpp.patch
+Patch3: %{name}-link.patch
+Patch4: %{name}-zxing.patch
URL: https://www.linphone.org/technical-corner/liblinphone
# base and tester components
BuildRequires: bctoolbox-devel >= 5.2
BuildRequires: belcard-devel >= 4.5.20-1
-BuildRequires: belle-sip-devel >= 5.1
-BuildRequires: belr-devel >= 5.1
+BuildRequires: belle-sip-devel >= 5.2
+BuildRequires: belr-devel >= 5.2
%{?with_zrtp:BuildRequires: bzrtp-devel >= 5.2}
BuildRequires: cmake >= 3.1
BuildRequires: doxygen
BuildRequires: jsoncpp-devel
+BuildRequires: libjpeg-turbo-devel
BuildRequires: libsoci-devel >= 4.0
BuildRequires: libsoci-sqlite3-devel >= 4.0
-BuildRequires: libstdc++-devel >= 6:5
+BuildRequires: libstdc++-devel >= 6:7
BuildRequires: libxml2-devel >= 2.0
%{?with_lime:BuildRequires: lime-devel >= 5.2}
-BuildRequires: mediastreamer-devel >= 5.1.72-2
-BuildRequires: ortp-devel >= 5.1
+BuildRequires: mediastreamer-devel >= 5.2.51
+BuildRequires: ortp-devel >= 5.2
BuildRequires: pkgconfig
BuildRequires: python3 >= 1:3
# to generate C++ wrappers
@@ -50,15 +49,16 @@ BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: sqlite3-devel >= 3.7.0
BuildRequires: udev-devel
BuildRequires: xerces-c-devel
+BuildRequires: zxing-cpp-nu-devel >= 1.4.0
BuildRequires: zlib-devel >= 1.2.3
Requires(post,postun): /sbin/ldconfig
Requires: bctoolbox >= 5.2
-Requires: belle-sip >= 5.1
-Requires: belr >= 5.1
+Requires: belle-sip >= 5.2
+Requires: belr >= 5.2
%{?with_zrtp:Requires: bzrtp >= 5.2}
%{?with_lime:Requires: lime >= 5.2}
-Requires: mediastreamer >= 5.1.72-2
-Requires: ortp >= 5.1
+Requires: mediastreamer >= 5.2.51
+Requires: ortp >= 5.2
Requires: sqlite3 >= 3.7.0
Requires: zlib >= 1.2.3
Obsoletes: linphone-libs < 4
@@ -89,15 +89,15 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Linphone
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: bctoolbox-devel >= 5.2
-Requires: belle-sip-devel >= 5.1
-Requires: belr-devel >= 5.1
+Requires: belle-sip-devel >= 5.2
+Requires: belr-devel >= 5.2
%{?with_zrtp:Requires: bzrtp-devel >= 5.2}
Requires: jsoncpp-devel
-Requires: libstdc++-devel >= 6:5
+Requires: libstdc++-devel >= 6:7
Requires: libxml2-devel >= 2.0
%{?with_lime:Requires: lime-devel >= 5.2}
-Requires: mediastreamer-devel >= 5.1.72-2
-Requires: ortp-devel >= 5.1
+Requires: mediastreamer-devel >= 5.2.51
+Requires: ortp-devel >= 5.2
Requires: sqlite3-devel >= 3.7.0
Requires: zlib-devel >= 1.2.3
Obsoletes: linphone-devel < 4
@@ -208,7 +208,6 @@ pochodzącego z GNOME.
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
install -d builddir
@@ -219,7 +218,8 @@ cd builddir
-DENABLE_DOC=ON \
%{!?with_zrtp:-DENABLE_LIME=OFF} \
%{!?with_lime:-DENABLE_LIME_X3DH=OFF} \
- %{!?with_static_libs:-DENABLE_STATIC=OFF}
+ %{!?with_static_libs:-DENABLE_STATIC=OFF} \
+ -DENABLE_STRICT=OFF
%{__make}
@@ -238,7 +238,7 @@ rm -rf $RPM_BUILD_ROOT
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/liblinphone_tester
# packaged as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/liblinphone-5.1.0
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/liblinphone-5.2.0
# omitted by cmake install
install -d $RPM_BUILD_ROOT%{_mandir}/{man1,cs/man1}
diff --git a/liblinphone-belle-sip.patch b/liblinphone-belle-sip.patch
deleted file mode 100644
index f647b85..0000000
--- a/liblinphone-belle-sip.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- liblinphone-5.1.73/tester/call_secure_tester.c.orig 2022-12-06
10:47:26.000000000 +0100
-+++ liblinphone-5.1.73/tester/call_secure_tester.c 2023-04-19
16:22:22.531145554 +0200
-@@ -839,8 +839,8 @@ static bool_t setup_dtls_srtp(LinphoneCo
- path = bc_tester_file("certificates-pauline");
- linphone_core_set_user_certificates_path(pauline->lc, path);
- bc_free(path);
-- belle_sip_mkdir(linphone_core_get_user_certificates_path(marie->lc));
-- belle_sip_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
-+ bctbx_mkdir(linphone_core_get_user_certificates_path(marie->lc));
-+ bctbx_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
- return TRUE;
- }
-
---- liblinphone-5.1.73/tester/call_single_tester.c.orig 2022-12-06
10:47:26.000000000 +0100
-+++ liblinphone-5.1.73/tester/call_single_tester.c 2023-04-19
16:40:52.125654367 +0200
-@@ -3319,8 +3319,8 @@ static void _call_base_with_configfile(L
- path = bc_tester_file("certificates-pauline");
- linphone_core_set_user_certificates_path(pauline->lc,
path);
- bc_free(path);
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(marie->lc));
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(marie->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
- }
-
- if (policy == LinphonePolicyUseIce) {
---- liblinphone-5.1.73/tester/call_with_rtp_bundle_tester.c.orig
2022-12-06 10:47:26.000000000 +0100
-+++ liblinphone-5.1.73/tester/call_with_rtp_bundle_tester.c 2023-04-19
16:41:32.125254370 +0200
-@@ -54,8 +54,8 @@ static bool_t setup_dtls_srtp(LinphoneCo
- path = bc_tester_file("certificates-pauline");
- linphone_core_set_user_certificates_path(pauline->lc, path);
- bc_free(path);
-- belle_sip_mkdir(linphone_core_get_user_certificates_path(marie->lc));
-- belle_sip_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
-+ bctbx_mkdir(linphone_core_get_user_certificates_path(marie->lc));
-+ bctbx_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
- return TRUE;
- }
-
---- liblinphone-5.1.73/tester/stun_tester.c.orig 2022-12-06
10:47:26.000000000 +0100
-+++ liblinphone-5.1.73/tester/stun_tester.c 2023-04-19 16:42:26.544235453
+0200
-@@ -204,8 +204,8 @@ static void ice_turn_call_base(const Cal
- path = bc_tester_file("certificates-pauline");
- linphone_core_set_user_certificates_path(pauline->lc,
path);
- bc_free(path);
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(marie->lc));
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(marie->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
- }
- }
-
-@@ -459,8 +459,8 @@ static void _ice_turn_dtls_call(const Ca
- path = bc_tester_file("certificates-pauline");
- linphone_core_set_user_certificates_path(pauline->lc,
path);
- bc_free(path);
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(marie->lc));
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(marie->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
- }
- }
-
---- liblinphone-5.1.73/tester/call_video_tester.cpp.orig 2022-12-06
10:47:26.000000000 +0100
-+++ liblinphone-5.1.73/tester/call_video_tester.cpp 2023-04-19
16:44:56.913445918 +0200
-@@ -619,8 +619,8 @@ void video_call_base_2(LinphoneCoreManag
- path = bc_tester_file("certificates-pauline");
- linphone_core_set_user_certificates_path(caller->lc, path);
- bc_free(path);
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(callee->lc));
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(caller->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(callee->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(caller->lc));
- }
-
- linphone_core_set_media_encryption(callee->lc,mode);
-@@ -742,8 +742,8 @@ void video_call_base_3(LinphoneCoreManag
- path = bc_tester_file("certificates-pauline");
- linphone_core_set_user_certificates_path(caller->lc, path);
- bc_free(path);
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(callee->lc));
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(caller->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(callee->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(caller->lc));
- }
-
- linphone_core_set_media_encryption(callee->lc,mode);
---- liblinphone-5.1.73/tester/call_ice_tester.cpp.orig 2022-12-06
10:47:26.000000000 +0100
-+++ liblinphone-5.1.73/tester/call_ice_tester.cpp 2023-04-19
16:52:40.218235966 +0200
-@@ -558,7 +558,7 @@ static void call_paused_resumed_with_ice
- char *path = bc_tester_file("certificates-marie");
- linphone_core_set_user_certificates_path(marie->lc,
path);
- bc_free(path);
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(marie->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(marie->lc));
- }
- }
-
-@@ -568,7 +568,7 @@ static void call_paused_resumed_with_ice
- char *path = bc_tester_file("certificates-pauline");
- linphone_core_set_user_certificates_path(pauline->lc,
path);
- bc_free(path);
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(pauline->lc));
- }
- }
-
---- liblinphone-5.1.73/tester/capability_negotiation_tester.cpp.orig
2022-12-06 10:47:26.000000000 +0100
-+++ liblinphone-5.1.73/tester/capability_negotiation_tester.cpp
2023-04-19 17:11:27.896420462 +0200
-@@ -220,8 +220,8 @@ void encrypted_call_with_params_base(Lin
- path = bc_tester_file("certificates-pauline");
- linphone_core_set_user_certificates_path(caller->lc, path);
- bc_free(path);
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(callee->lc));
--
belle_sip_mkdir(linphone_core_get_user_certificates_path(caller->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(callee->lc));
-+
bctbx_mkdir(linphone_core_get_user_certificates_path(caller->lc));
-
- stats caller_stat = caller->stat;
- stats callee_stat = callee->stat;
diff --git a/liblinphone-jsoncpp.patch b/liblinphone-jsoncpp.patch
index 37ad0c7..43e035e 100644
--- a/liblinphone-jsoncpp.patch
+++ b/liblinphone-jsoncpp.patch
@@ -1,19 +1,15 @@
---- liblinphone-5.1.73/src/CMakeLists.txt.orig 2023-04-16 20:23:18.411880391
+0200
-+++ liblinphone-5.1.73/src/CMakeLists.txt 2023-04-17 17:01:13.969495158
+0200
-@@ -31,11 +31,7 @@ set(PUBLIC_LINK_LIBS
+--- liblinphone-5.2.51/src/CMakeLists.txt.orig 2023-04-20 20:45:01.892542923
+0200
++++ liblinphone-5.2.51/src/CMakeLists.txt 2023-04-20 20:46:02.122216631
+0200
+@@ -32,7 +32,7 @@ set(PUBLIC_LINK_LIBS
)
if (ENABLE_FLEXIAPI)
-- if (XCODE)
-- list(APPEND LINK_LIBS jsoncpp_static)
-- else()
-- list(APPEND LINK_LIBS jsoncpp_object)
-- endif()
-+ list(APPEND LINK_LIBS jsoncpp_lib)
+- list(APPEND LINK_LIBS jsoncpp_static)
++ list(APPEND LINK_LIBS jsoncpp_lib)
endif()
#APPLE_LIBS is mandatory for apple compilation
-@@ -618,11 +614,7 @@ if(ENABLE_STATIC)
+@@ -650,11 +650,7 @@ if(ENABLE_STATIC)
)
if (ENABLE_FLEXIAPI)
@@ -26,7 +22,7 @@
endif()
if (APPLE)
-@@ -673,11 +665,7 @@ if(ENABLE_SHARED)
+@@ -699,11 +695,7 @@ if(ENABLE_SHARED)
)
if (ENABLE_FLEXIAPI)
@@ -39,18 +35,13 @@
endif()
if(APPLE)
---- liblinphone-5.1.73/tester/CMakeLists.txt.orig 2022-12-06
10:47:26.000000000 +0100
-+++ liblinphone-5.1.73/tester/CMakeLists.txt 2023-04-19 16:37:14.557171234
+0200
-@@ -31,11 +31,7 @@ set(OTHER_LIBS_FOR_TESTER
- )
-
- if (ENABLE_FLEXIAPI)
-- if (XCODE)
-- list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static)
-- else()
-- list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object)
-- endif()
-+ list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_lib)
+--- liblinphone-5.2.51/tester/CMakeLists.txt.orig 2023-04-21
18:51:54.676272194 +0200
++++ liblinphone-5.2.51/tester/CMakeLists.txt 2023-04-21 18:51:57.524566770
+0200
+@@ -322,6 +322,7 @@ set(SOURCE_FILES_CXX
+ if(ENABLE_FLEXIAPI)
+ list(APPEND SOURCE_FILES_CXX account_creator_flexiapi_tester.cpp)
+ list(APPEND SOURCE_FILES_CXX flexiapiclient-tester.cpp)
++ list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_lib)
endif()
- if(INTL_FOUND)
+ if(ENABLE_ADVANCED_IM)
diff --git a/liblinphone-lime.patch b/liblinphone-lime.patch
deleted file mode 100644
index ce97c69..0000000
--- a/liblinphone-lime.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- liblinphone-5.1.73/src/chat/encryption/encryption-engine.h.orig
2022-12-06 10:47:26.000000000 +0100
-+++ liblinphone-5.1.73/src/chat/encryption/encryption-engine.h 2023-04-16
20:10:46.962618008 +0200
-@@ -117,7 +117,6 @@ public:
- ) { return nullptr; }
-
- virtual void cleanDb () {}
-- virtual void update () {}
- virtual EngineType getEngineType () { return EngineType::Undefined; }
- virtual AbstractChatRoom::SecurityLevel getSecurityLevel (const
std::string &deviceId) const { return
AbstractChatRoom::SecurityLevel::ClearText; }
- virtual std::list<EncryptionParameter> getEncryptionParameters () {
return std::list<EncryptionParameter>(); }
---- liblinphone-5.1.73/src/chat/encryption/lime-x3dh-encryption-engine.h.orig
2022-12-06 10:47:26.000000000 +0100
-+++ liblinphone-5.1.73/src/chat/encryption/lime-x3dh-encryption-engine.h
2023-04-16 20:13:13.605156910 +0200
-@@ -150,7 +150,7 @@ public:
- AbstractChatRoom::SecurityLevel getSecurityLevel (const std::string
&deviceId) const override;
- EncryptionEngine::EngineType getEngineType () override;
- std::list<EncryptionParameter> getEncryptionParameters () override;
-- void update () override;
-+ void update (const std::string &localDeviceId);
- void cleanDb () override;
-
- // CoreListener overrides
----
liblinphone-5.1.73/src/chat/encryption/lime-x3dh-encryption-engine.cpp.orig
2023-04-16 20:22:27.455489779 +0200
-+++ liblinphone-5.1.73/src/chat/encryption/lime-x3dh-encryption-engine.cpp
2023-04-16 20:22:29.815476994 +0200
-@@ -501,11 +501,11 @@ ChatMessageModifier::Result LimeX3dhEncr
- return ChatMessageModifier::Result::Done;
- }
-
--void LimeX3dhEncryptionEngine::update () {
-+void LimeX3dhEncryptionEngine::update (const std::string &localDeviceId) {
- lime::limeCallback callback = setLimeCallback("Keys update");
-
- LinphoneConfig *lpconfig =
linphone_core_get_config(getCore()->getCCore());
-- limeManager->update(callback);
-+ limeManager->update(localDeviceId, callback);
- linphone_config_set_int(lpconfig, "lime", "last_update_time",
(int)lastLimeUpdate);
- }
-
-@@ -966,7 +966,7 @@ void LimeX3dhEncryptionEngine::onRegistr
- // update keys if necessary
- int limeUpdateThreshold =
linphone_config_get_int(lpconfig, "lime", "lime_update_threshold", 86400); //
24 hours = 86400 s
- if (ms_time(NULL) - lastLimeUpdate >
limeUpdateThreshold) {
-- update();
-+ update(localDeviceId);
- lastLimeUpdate = ms_time(NULL);
- }
- }
diff --git a/liblinphone-zxing.patch b/liblinphone-zxing.patch
new file mode 100644
index 0000000..46eed2b
--- /dev/null
+++ b/liblinphone-zxing.patch
@@ -0,0 +1,22 @@
+--- liblinphone-5.2.51/src/factory/factory.cpp.orig 2023-04-21
06:34:56.157462399 +0200
++++ liblinphone-5.2.51/src/factory/factory.cpp 2023-04-21 06:35:01.130768789
+0200
+@@ -802,7 +802,7 @@ LinphoneContent *Factory::createQRCode(c
+ }
+
+ auto writer =
ZXing::MultiFormatWriter(format).setMargin((int)margin).setEncoding(encoding).setEccLevel(eccLevel);
+- auto matrix = writer.encode(ZXing::TextUtfEncoding::FromUtf8(code),
(int)width, (int)height);
++ auto matrix = writer.encode(code, (int)width, (int)height);
+ auto bitmap = ZXing::ToMatrix<uint8_t>(matrix);
+
+ LinphoneContent * content = Factory::createContent();
+--- liblinphone-5.2.51/CMakeLists.txt.orig 2023-04-20 22:20:41.274783354
+0200
++++ liblinphone-5.2.51/CMakeLists.txt 2023-04-21 06:35:41.677215797 +0200
+@@ -92,7 +92,7 @@ cmake_dependent_option(ENABLE_QRCODE "En
+ # * DISABLE_BC_PACKAGE_SEARCH: skip find_package() for every BC package
(bctoolbox, ortp, etc.)
+ # * DISABLE_SOCI_PACKAGE_SEARCH: skip find_package() for Soci.
+
+-set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_EXTENSIONS NO)
+
+ if(NOT CMAKE_BUILD_TYPE)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/liblinphone.git/commitdiff/b914eb9b32b54e140a5b7b14292d309267fec483
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
