Hello community, here is the log from the commit of package linphone for openSUSE:Factory checked in at 2020-08-03 14:15:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphone (Old) and /work/SRC/openSUSE:Factory/.linphone.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linphone" Mon Aug 3 14:15:22 2020 rev:62 rq:823439 version:4.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/linphone/linphone.changes 2019-06-12 13:14:48.556784586 +0200 +++ /work/SRC/openSUSE:Factory/.linphone.new.3592/linphone.changes 2020-08-03 14:16:09.324545380 +0200 @@ -1,0 +2,17 @@ +Wed Jul 29 14:46:36 UTC 2020 - Alexei Sorokin <[email protected]> + +- Update to version 4.4.0: + * See https://gitlab.linphone.org/BC/public/liblinphone/blob/4.4.0/CHANGELOG.md + +------------------------------------------------------------------- +Wed Apr 22 16:24:17 UTC 2020 - Alexei Sorokin <[email protected]> + +- Update to version 4.3.1: + * No changelog available. +- Update the licence: it is now GPLv3+. +- Rebase linphone-build-readline.patch, + linphone-fix-pkgconfig.patch. +- Drop linphone-fix-gtkui-build.patch. +- Remove outdated elements from the spec file. + +------------------------------------------------------------------- Old: ---- linphone-3.12.0.tar.gz linphone-fix-gtkui-build.patch New: ---- liblinphone-4.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphone.spec ++++++ --- /var/tmp/diff_new_pack.AsvQYA/_old 2020-08-03 14:16:10.412546471 +0200 +++ /var/tmp/diff_new_pack.AsvQYA/_new 2020-08-03 14:16:10.416546475 +0200 @@ -1,7 +1,7 @@ # # spec file for package linphone # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,31 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define sover 9 -%bcond_with linphone_gtkui -%bcond_without linphone_cplusplus +%define sover 10 Name: linphone -Version: 3.12.0 +Version: 4.4.0 Release: 0 Summary: Web Phone -License: GPL-2.0-or-later AND GPL-3.0-only -Group: Productivity/Telephony/SIP/Clients +License: GPL-3.0-or-later URL: https://linphone.org/technical-corner/liblinphone/overview -Source: https://linphone.org/releases/sources/%{name}/%{name}-%{version}.tar.gz +Source: https://gitlab.linphone.org/BC/public/liblinphone/-/archive/%{version}/liblinphone-%{version}.tar.bz2 Source1: %{name}-manual.tar.bz2 Source2: baselibs.conf # PATCH-FIX-OPENSUSE linphone-fix-pkgconfig.patch [email protected] -- Install linphone.pc. Patch0: linphone-fix-pkgconfig.patch -# PATCH-FIX-OPENSUSE linphone-fix-gtkui-build.patch -- Fix building of GtkUI. -Patch1: linphone-fix-gtkui-build.patch # PATCH-FEATURE-OPENSUSE linphone-build-readline.patch [email protected] -- Add the ability to compile with readline to the build system. -Patch2: linphone-build-readline.patch +Patch1: linphone-build-readline.patch # PATCH-FIX-UPSTREAM -Patch3: reproducible.patch +Patch2: reproducible.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes @@ -44,16 +39,24 @@ BuildRequires: graphviz BuildRequires: libeXosip2-devel BuildRequires: libgsm-devel +BuildRequires: lime-devel BuildRequires: openldap2-devel BuildRequires: pkgconfig +BuildRequires: python3 +BuildRequires: python3-pystache +BuildRequires: python3-six +BuildRequires: python3-xml BuildRequires: readline-devel BuildRequires: sgmltool +BuildRequires: soci-devel +BuildRequires: soci-sqlite3-devel +BuildRequires: xsd BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(bctoolbox) >= 0.6.0 -BuildRequires: pkgconfig(belcard) -BuildRequires: pkgconfig(belle-sip) >= 1.6.2 +BuildRequires: pkgconfig(bctoolbox) >= 4.4.0 +BuildRequires: pkgconfig(belcard) >= 4.4.0 +BuildRequires: pkgconfig(belle-sip) >= 4.4.0 BuildRequires: pkgconfig(libavcodec) >= 51.0.0 -BuildRequires: pkgconfig(libbzrtp) >= 1.0.6 +BuildRequires: pkgconfig(libbzrtp) >= 4.4.0 BuildRequires: pkgconfig(libosip2) BuildRequires: pkgconfig(libsasl2) BuildRequires: pkgconfig(libswscale) >= 0.7.0 @@ -61,36 +64,12 @@ BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(libv4l2) >= 0.8.4 BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(mediastreamer) >= 2.16.0 +BuildRequires: pkgconfig(mediastreamer) >= 4.4.0 BuildRequires: pkgconfig(opus) -BuildRequires: pkgconfig(ortp) >= 1.0.2 +BuildRequires: pkgconfig(ortp) >= 4.4.0 BuildRequires: pkgconfig(speex) >= 1.1.6 BuildRequires: pkgconfig(sqlite3) -%if 0%{?suse_version} >= 1500 -BuildRequires: python2 -BuildRequires: python2-six -BuildRequires: python2-xml -%else -BuildRequires: python -BuildRequires: python-six -BuildRequires: python-xml -%endif -%if %{with linphone_cplusplus} -%if 0%{?suse_version} >= 1500 -BuildRequires: python2-pystache -%else -BuildRequires: python-pystache -%endif -%endif -%if %{with linphone_gtkui} -BuildRequires: hicolor-icon-theme -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libnotify) -Requires: lib%{name}-data = %{version} -Recommends: %{name}-cli = %{version} -Obsoletes: %{name}-lang < %{version} -%endif +BuildRequires: pkgconfig(xerces-c) %description Linphone is a Web phone with a Qt interface. It lets you make @@ -102,7 +81,6 @@ %package cli Summary: Web Phone Command Line Interface -Group: Productivity/Telephony/SIP/Clients Requires: lib%{name}-data = %{version} %description cli @@ -117,7 +95,6 @@ %package -n lib%{name}%{sover} Summary: Web Phone library -Group: System/Libraries Recommends: lib%{name}-lang Provides: lib%{name} = %{version} @@ -133,10 +110,8 @@ %lang_package -n lib%{name} -%if %{with linphone_cplusplus} %package -n lib%{name}++%{sover} Summary: Web Phone C++ library -Group: System/Libraries %description -n lib%{name}++%{sover} Linphone is a Web phone with a Qt interface. It lets you make @@ -147,11 +122,9 @@ with high speed connections as well as 28k modems. This package contains a C++ library. -%endif %package -n lib%{name}-data Summary: Web Phone data files -Group: Productivity/Telephony/SIP/Clients BuildArch: noarch %description -n lib%{name}-data @@ -166,12 +139,14 @@ %package -n lib%{name}-devel Summary: Web Phone Development files -Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: lib%{name}%{sover} = %{version} +Requires: lib%{name}++%{sover} = %{version} Requires: lib%{name}-data = %{version} Requires: libeXosip2-devel Requires: libosip2-devel +Requires: soci-devel +Requires: soci-sqlite3-devel Requires: pkgconfig(alsa) Requires: pkgconfig(glib-2.0) Requires: pkgconfig(libavcodec) >= 51.0.0 @@ -180,9 +155,6 @@ # linphone-devel was last used in openSUSE Leap 42.3. Provides: %{name}-devel = %{version} Obsoletes: %{name}-devel < %{version} -%if %{with linphone_cplusplus} -Requires: lib%{name}++%{sover} = %{version} -%endif %description -n lib%{name}-devel Linphone is a Web phone with a Qt interface. It lets you make @@ -193,84 +165,37 @@ with high speed connections as well as 28k modems. %prep -%setup -q -%setup -q -D -T -a 1 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -n liblinphone-%{version} -p1 +%setup -q -n liblinphone-%{version} -D -T -a 1 %build %cmake \ - -DPYTHON_EXECUTABLE="%{_bindir}/python2" \ -%if %{with linphone_cplusplus} + -DPYTHON_EXECUTABLE="%{_bindir}/python3" \ -DENABLE_CXX_WRAPPER=ON \ -%else - -DENABLE_CXX_WRAPPER=OFF \ -%endif -DENABLE_ROOTCA_DOWNLOAD=OFF \ -DENABLE_ZRTP=ON \ -DENABLE_LDAP=ON \ -%if %{with linphone_gtkui} - -DENABLE_GTK_UI=ON \ -%endif -DENABLE_TOOLS=OFF \ -DENABLE_STRICT=OFF \ -DENABLE_STATIC=OFF -make %{?_smp_mflags} V=1 +%cmake_build %install %cmake_install -mkdir -p %{buildroot}%{_docdir}/%{name}/ -mv -T %{buildroot}%{_datadir}/doc/%{name}-%{version}/ \ - %{buildroot}%{_docdir}/%{name}/ - -%if %{with linphone_gtkui} -install -Dpm 0755 share/%{name}.appdata.xml \ - %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -%suse_update_desktop_file -r -D "%{name}/index.xml.html" %{name} Network Telephony -# Remove a duplicate COPYING. -rm -f %{buildroot}%{_datadir}/%{name}/COPYING -%endif - # Install the manual. mkdir -p %{buildroot}%{_datadir}/gnome/help/ cp -a %{name} %{buildroot}%{_datadir}/gnome/help/%{name}/ %find_lang %{name} %fdupes %{buildroot}%{_datadir}/ -%if 0%{?suse_version} < 1500 && %{with linphone_gtkui} -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun -%endif - %post -n lib%{name}%{sover} -p /sbin/ldconfig %postun -n lib%{name}%{sover} -p /sbin/ldconfig -%if %{with linphone_cplusplus} %post -n lib%{name}++%{sover} -p /sbin/ldconfig %postun -n lib%{name}++%{sover} -p /sbin/ldconfig -%endif - -%if %{with linphone_gtkui} -%files -%{_bindir}/%{name} -%{_datadir}/%{name}/ -%{_datadir}/applications/%{name}.desktop -%{_datadir}/applications/audio-assistant.desktop -%{_datadir}/icons/hicolor/*/*/%{name}* -%{_datadir}/pixmaps/%{name}/ -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{name}.appdata.xml -%endif %files cli %{_bindir}/%{name}c* @@ -283,29 +208,25 @@ %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ -%if %{with linphone_cplusplus} %files -n lib%{name}++%{sover} %{_libdir}/lib%{name}++.so.%{sover}* -%endif %files -n lib%{name}-data -%license COPYING -%doc AUTHORS NEWS README.md -%doc %{_docdir}/%{name}/ +%license LICENSE.txt +%doc CHANGELOG.md README.md +%{_datadir}/%{name}/ %{_datadir}/sounds/%{name}/ %files -n lib%{name}-devel %{_includedir}/%{name}*/ %{_bindir}/lib%{name}_tester +%{_bindir}/groupchat_benchmark %{_libdir}/lib%{name}.so -%if %{with linphone_cplusplus} %{_libdir}/lib%{name}++.so -%endif %{_datadir}/liblinphone_tester/ %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/Linphone/ -%if %{with linphone_cplusplus} %{_datadir}/LinphoneCxx/ -%endif +%{_datadir}/belr/grammars/*_grammar %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.AsvQYA/_old 2020-08-03 14:16:10.444546503 +0200 +++ /var/tmp/diff_new_pack.AsvQYA/_new 2020-08-03 14:16:10.448546507 +0200 @@ -1,2 +1,2 @@ -liblinphone9 -liblinphone++9 +liblinphone10 +liblinphone++10 ++++++ linphone-build-readline.patch ++++++ --- /var/tmp/diff_new_pack.AsvQYA/_old 2020-08-03 14:16:10.460546519 +0200 +++ /var/tmp/diff_new_pack.AsvQYA/_new 2020-08-03 14:16:10.460546519 +0200 @@ -61,17 +61,17 @@ +mark_as_advanced(READLINE_INCLUDE_DIRS READLINE_LIBRARIES HAVE_READLINE_H HAVE_HISTORY_H) --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -56,6 +56,7 @@ option(ENABLE_TUTORIALS "Enable compilat - option(ENABLE_UNIT_TESTS "Enable compilation of unit tests." YES) - option(ENABLE_UPDATE_CHECK "Enable update check." NO) - option(ENABLE_VIDEO "Build with video support." YES) +@@ -69,6 +69,7 @@ option(ENABLE_ASSETS "Package sound asse + option(ENABLE_PACKAGE_SOURCE "Create 'package_source' target for source archive making (CMake >= 3.11)" OFF) + + cmake_dependent_option(ENABLE_NOTIFY "Enable libnotify support." YES "ENABLE_GTK_UI;NOT APPLE" NO) +cmake_dependent_option(ENABLE_READLINE "Enable readline support." YES "ENABLE_CONSOLE_UI" NO) cmake_dependent_option(ENABLE_ASSISTANT "Turn on assistant compiling." YES "ENABLE_GTK_UI" NO) - option(ENABLE_DEBUG_LOGS "Turn on or off debug level logs." NO) - option(ENABLE_NLS "Build with internationalisation support" YES) -@@ -137,6 +138,15 @@ endif() - if(ENABLE_SQLITE_STORAGE) - find_package(Sqlite3 REQUIRED) + + set(CMAKE_CXX_STANDARD 11) +@@ -156,6 +157,15 @@ if(ENABLE_TUNNEL) + set(ENABLE_TUNNEL OFF CACHE BOOL "Enable tunnel support." FORCE) + endif() endif() +if(ENABLE_READLINE) + find_package(Readline) @@ -85,10 +85,10 @@ if(ENABLE_NOTIFY) find_package(Notify) if(NOTIFY_FOUND) -@@ -267,7 +277,7 @@ if(MSVC) - endif() - else() - list(APPEND STRICT_OPTIONS_CPP "-Wall" "-Wuninitialized" "-Wno-error=deprecated-declarations") +@@ -302,7 +312,7 @@ else() + if (SUGGEST_OVERRIDE) + list(APPEND STRICT_OPTIONS_CXX "-Wsuggest-override" "-Wno-error=suggest-override" ) + endif () - list(APPEND STRICT_OPTIONS_C "-Wstrict-prototypes" "-Werror=strict-prototypes") + list(APPEND STRICT_OPTIONS_C "-Wstrict-prototypes") if(CMAKE_C_COMPILER_ID STREQUAL "GNU") @@ -97,7 +97,7 @@ --- a/config.h.cmake +++ b/config.h.cmake @@ -42,6 +42,9 @@ - #cmakedefine HAVE_GTK_OSX 1 + #cmakedefine BUILD_WIZARD #cmakedefine HAVE_NOTIFY4 #cmakedefine HAVE_ZLIB 1 +#cmakedefine HAVE_READLINE @@ -108,9 +108,9 @@ #cmakedefine HAVE_LIBUDEV_H 0 --- a/console/CMakeLists.txt +++ b/console/CMakeLists.txt -@@ -40,6 +40,10 @@ add_executable(linphonec ${LINPHONEC_SOU - target_link_libraries(linphonec ${LINPHONE_LIBS_FOR_TOOLS} ${BCTOOLBOX_CORE_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES}) +@@ -41,6 +41,10 @@ target_link_libraries(linphonec ${LINPHO set_target_properties(linphonec PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") + set_target_properties(linphonec PROPERTIES LINKER_LANGUAGE CXX) +if(READLINE_FOUND) + target_include_directories(linphonec PUBLIC ${READLINE_INCLUDE_DIRS}) @@ -119,10 +119,10 @@ if(INTL_FOUND) target_link_libraries(linphonec ${INTL_LIBRARIES}) endif() -@@ -47,6 +51,10 @@ endif() +@@ -48,6 +52,10 @@ endif() if(WIN32) add_executable(linphoned WIN32 ${LINPHONEC_SOURCE_FILES}) - target_link_libraries(linphoned ${LINPHONE_LIBS_FOR_TOOLS} ${BCTOOLBOX_CORE_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES}) + target_link_libraries(linphoned ${LINPHONE_LIBS_FOR_TOOLS} bctoolbox ortp mediastreamer ${XSD_LIBRARIES}) + if(READLINE_FOUND) + target_include_directories(linphoned PUBLIC ${READLINE_INCLUDE_DIRS}) + target_link_libraries(linphoned ${READLINE_LIBRARIES}) @@ -130,9 +130,9 @@ if(INTL_FOUND) target_link_libraries(linphoned ${INTL_LIBRARIES}) endif() -@@ -56,6 +64,11 @@ add_executable(linphonecsh ${LINPHONECSH - target_link_libraries(linphonecsh ${LINPHONE_LIBS_FOR_TOOLS} ${ORTP_LIBRARIES}) +@@ -58,6 +66,11 @@ target_link_libraries(linphonecsh ${LINP set_target_properties(linphonecsh PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") + set_target_properties(linphonecsh PROPERTIES LINKER_LANGUAGE CXX) +if(READLINE_FOUND) + target_include_directories(linphonecsh PUBLIC ${READLINE_INCLUDE_DIRS}) @@ -144,9 +144,9 @@ list(APPEND INSTALL_TARGETS linphoned) --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt -@@ -118,6 +118,11 @@ target_include_directories(linphone-daem - target_link_libraries(linphone-daemon ${LINPHONE_LIBS_FOR_TOOLS} ${MEDIASTREAMER2_LIBRARIES} ${ORTP_LIBRARIES} ${BCTOOLBOX_CORE_LIBRARIES}) +@@ -123,6 +123,11 @@ target_link_libraries(linphone-daemon ${ set_target_properties(linphone-daemon PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") + set_target_properties(linphone-daemon PROPERTIES LINKER_LANGUAGE CXX) +if(READLINE_FOUND) + target_include_directories(linphone-daemon PUBLIC ${READLINE_INCLUDE_DIRS}) @@ -154,11 +154,11 @@ +endif() + add_executable(linphone-daemon-pipetest ${DAEMON_PIPETEST_SOURCE_FILES}) - target_link_libraries(linphone-daemon-pipetest ${LINPHONE_LIBS_FOR_TOOLS} ${ORTP_LIBRARIES}) + target_link_libraries(linphone-daemon-pipetest ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer) set_target_properties(linphone-daemon-pipetest PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") --- a/daemon/daemon.cc +++ b/daemon/daemon.cc -@@ -28,11 +28,6 @@ Inc., 51 Franklin Street, Fifth Floor, B +@@ -31,11 +31,6 @@ #include <functional> #include <limits> @@ -170,13 +170,3 @@ #ifndef _WIN32 #include <poll.h> #endif ---- a/Makefile.am -+++ b/Makefile.am -@@ -67,6 +67,7 @@ EXTRA_DIST = \ - cmake/FindIconv.cmake \ - cmake/FindIntl.cmake \ - cmake/FindNotify.cmake \ -+ cmake/FindReadline.cmake \ - cmake/FindSqlite3.cmake \ - cmake/FindXML2.cmake \ - cmake/FindZlib.cmake \ ++++++ linphone-fix-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.AsvQYA/_old 2020-08-03 14:16:10.472546531 +0200 +++ /var/tmp/diff_new_pack.AsvQYA/_new 2020-08-03 14:16:10.472546531 +0200 @@ -1,10 +1,9 @@ --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt -@@ -42,6 +42,17 @@ if(ENABLE_ROOTCA_DOWNLOAD) - ) - endif() +@@ -35,6 +35,15 @@ install(FILES ${GRAMMAR_FILES} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) -+ +set(LINPHONE_CFLAGS ${LINPHONE_CPPFLAGS}) +set(LINPHONE_LIBS ${LINPHONE_LDFLAGS}) +set(prefix ${CMAKE_INSTALL_PREFIX}) @@ -14,7 +13,6 @@ +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/linphone.pc.in ${CMAKE_CURRENT_BINARY_DIR}/linphone.pc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/linphone.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + -+ set(SOUND_FILES hello16000.wav hello8000.wav
