Hello community, here is the log from the commit of package mediastreamer2 for openSUSE:Factory checked in at 2020-03-06 21:24:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mediastreamer2 (Old) and /work/SRC/openSUSE:Factory/.mediastreamer2.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mediastreamer2" Fri Mar 6 21:24:17 2020 rev:24 rq:781569 version:4.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer2.changes 2018-08-27 13:47:12.384368108 +0200 +++ /work/SRC/openSUSE:Factory/.mediastreamer2.new.26092/mediastreamer2.changes 2020-03-06 21:24:27.749454898 +0100 @@ -1,0 +2,7 @@ +Wed Mar 4 12:36:38 UTC 2020 - Paolo Stivanin <[email protected]> + +- Update to 4.3.1 (no changelog) +- Remove mediastreamer2-fix-xv.patch +- Remove mediastreamer2-2.16.1-fix-no-git.patch + +------------------------------------------------------------------- Old: ---- mediastreamer-2.16.1.tar.gz mediastreamer2-2.16.1-fix-no-git.patch mediastreamer2-fix-xv.patch New: ---- mediastreamer2-4.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mediastreamer2.spec ++++++ --- /var/tmp/diff_new_pack.imD4ca/_old 2020-03-06 21:24:28.729455440 +0100 +++ /var/tmp/diff_new_pack.imD4ca/_new 2020-03-06 21:24:28.733455441 +0100 @@ -1,7 +1,7 @@ # # spec file for package mediastreamer2 # -# 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,30 +12,22 @@ # 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 _name mediastreamer -%define sobase libmediastreamer_base -%define sovoip libmediastreamer_voip +%define sobase libmediastreamer %define sover 10 -%bcond_without ffmpeg Name: mediastreamer2 -Version: 2.16.1 +Version: 4.3.1 Release: 0 Summary: Audio/Video real-time streaming License: GPL-2.0-or-later Group: Productivity/Telephony/Utilities URL: https://linphone.org/technical-corner/mediastreamer2/overview -Source: https://linphone.org/releases/sources/%{_name}/%{_name}-%{version}.tar.gz +Source: https://github.com/BelledonneCommunications/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source99: baselibs.conf -# PATCH-FIX-OPENSUSE mediastreamer2-fix-pkgconfig.patch [email protected] -- Install mediastreamer.pc. Patch0: mediastreamer2-fix-pkgconfig.patch -# PATCH-FIX-OPENSUSE mediastreamer2-fix-xv.patch [email protected] -- Fix Xv by linking with Xext. -Patch1: mediastreamer2-fix-xv.patch -# PATCH-FIX-UPSTREAM mediastreamer2-2.16.1-fix-no-git.patch -- Fix building out-of-git (commit de3a24b). -Patch2: mediastreamer2-2.16.1-fix-no-git.patch BuildRequires: bcmatroska2-devel BuildRequires: cmake BuildRequires: doxygen @@ -47,9 +39,11 @@ BuildRequires: libsrtp-devel BuildRequires: libv4l-devel BuildRequires: libvpx-devel +BuildRequires: libxml2-devel BuildRequires: pkgconfig BuildRequires: python BuildRequires: spandsp-devel +BuildRequires: sqlite3-devel BuildRequires: vim BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(bctoolbox) >= 0.6.0 @@ -65,16 +59,13 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xv) -Obsoletes: %{name}-lang %if 0%{?suse_version} >= 1500 BuildRequires: libjpeg-devel %endif -%if %{with ffmpeg} BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(libavcodec) >= 51.0.0 BuildRequires: pkgconfig(libswscale) >= 0.7.0 -%endif %description Mediastreamer2 is a GPL licensed library to make audio and video @@ -90,21 +81,23 @@ real-time streaming and processing. Written in pure C, it is based upon the oRTP library. -%package -n %{sovoip}%{sover} -Summary: Audio/video real-time streaming library, voip part -Group: System/Libraries +%package doc +Summary: Documentation for the mediastreamer2 library +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} -%description -n %{sovoip}%{sover} +%description doc Mediastreamer2 is a GPL licensed library to make audio and video real-time streaming and processing. Written in pure C, it is based -upon the oRTP library. +upon the ortp library. + +This package contains documentation files %package devel -Summary: Headers, libraries and docs for the mediastreamer2 library +Summary: Headers and libraries for the mediastreamer2 library Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: %{sobase}%{sover} = %{version} -Requires: %{sovoip}%{sover} = %{version} Requires: bcmatroska2-devel %description devel @@ -116,62 +109,46 @@ develop programs using the mediastreamer2 library. %prep -%setup -q -n %{_name}-%{version} +%setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build -%cmake \ -%if %{with ffmpeg} - -DCMAKE_INCLUDE_PATH=%{_includedir}/ffmpeg \ -%else - -DENABLE_NON_FREE_CODECS=OFF \ - -DENABLE_VIDEO=OFF \ -%endif - -DENABLE_ZRTP=ON \ - -DENABLE_STRICT=OFF \ - -DENABLE_STATIC=OFF -make %{?_smp_mflags} V=1 +%cmake -DCMAKE_SHARED_LINKER_FLAGS="-flto=auto -Wl,--as-needed -Wl,-z,now" \ + -DENABLE_STATIC=NO +make %install %cmake_install mkdir -p %{buildroot}%{_docdir}/%{name}/ -mv -T %{buildroot}%{_datadir}/doc/%{name}-%{version}/ \ +mv -T %{buildroot}%{_datadir}/doc/%{name}-4.3.0/ \ %{buildroot}%{_docdir}/%{name}/ %post -n %{sobase}%{sover} -p /sbin/ldconfig %postun -n %{sobase}%{sover} -p /sbin/ldconfig -%post -n %{sovoip}%{sover} -p /sbin/ldconfig - -%postun -n %{sovoip}%{sover} -p /sbin/ldconfig - %files -%license COPYING -%doc AUTHORS NEWS README.md -%doc %{_docdir}/%{name}/ -%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 120000 +%license LICENSE.txt %{_bindir}/mediastream %{_bindir}/mkvstream -%dir %{_datadir}/images/ -%{_datadir}/images/nowebcamCIF.jpg -%endif %files -n %{sobase}%{sover} %{_libdir}/%{sobase}.so.%{sover}* -%files -n %{sovoip}%{sover} -%{_libdir}/%{sovoip}.so.%{sover}* +%files doc +%doc README.md +%dir %{_docdir}/%{name}/ +%doc %{_docdir}/%{name}/* +%dir %{_datadir}/images/ +%{_datadir}/images/nowebcamCIF.jpg %files devel %{_includedir}/mediastreamer2/ %{_bindir}/mediastreamer2_tester -%{_libdir}/libmediastreamer_*.so +%{_libdir}/libmediastreamer.so %{_datadir}/mediastreamer2_tester/ %{_datadir}/Mediastreamer2/ -%{_libdir}/pkgconfig/%{_name}.pc +%{_libdir}/pkgconfig/mediastreamer.pc %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.imD4ca/_old 2020-03-06 21:24:28.773455464 +0100 +++ /var/tmp/diff_new_pack.imD4ca/_new 2020-03-06 21:24:28.777455466 +0100 @@ -1,2 +1 @@ -libmediastreamer_base10 -libmediastreamer_voip10 +libmediastreamer10 ++++++ mediastreamer-2.16.1.tar.gz -> mediastreamer2-4.3.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer-2.16.1.tar.gz /work/SRC/openSUSE:Factory/.mediastreamer2.new.26092/mediastreamer2-4.3.1.tar.gz differ: char 5, line 1 ++++++ mediastreamer2-fix-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.imD4ca/_old 2020-03-06 21:24:28.805455482 +0100 +++ /var/tmp/diff_new_pack.imD4ca/_new 2020-03-06 21:24:28.805455482 +0100 @@ -1,17 +1,13 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -556,6 +556,27 @@ if(MEDIASTREAMER2_CPPFLAGS) - add_definitions(${MEDIASTREAMER2_CPPFLAGS}) - endif() +diff -urN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2020-02-12 08:32:20.000000000 +0100 ++++ b/CMakeLists.txt 2020-03-04 14:54:53.220925208 +0100 +@@ -114,6 +114,21 @@ + option(ENABLE_JPEG "Enable JPEG support" YES) + cmake_dependent_option(ENABLE_QRCODE "Enable QRCode support" YES "ENABLE_VIDEO" NO) -+ +set(MS_PUBLIC_PACKAGES "ortp bctoolbox") -+if(ENABLE_ZRTP) -+ set(MS_PRIVATE_PACKAGES "${MS_PRIVATE_PACKAGES} libbzrtp") -+endif() -+if(ENABLE_FFMPEG) -+ set(MS_PRIVATE_PACKAGES "${MS_PRIVATE_PACKAGES} libavcodec libavutil libswscale") -+endif() ++set(MS_PRIVATE_PACKAGES "${MS_PRIVATE_PACKAGES} libbzrtp") ++set(MS_PRIVATE_PACKAGES "${MS_PRIVATE_PACKAGES} libavcodec libavutil libswscale") +if(ENABLE_FIXED_POINT) + set(MS_PUBLIC_CFLAGS "-DMS_FIXED_POINT") +else(ENABLE_FIXED_POINT) @@ -24,13 +20,13 @@ +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mediastreamer.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mediastreamer.pc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mediastreamer.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + -+ - set(STRICT_OPTIONS_CPP ) - set(STRICT_OPTIONS_C ) - set(STRICT_OPTIONS_OBJC "-Wno-error") ---- a/mediastreamer.pc.in -+++ b/mediastreamer.pc.in -@@ -5,7 +5,8 @@ includedir=@includedir@ + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_EXTENSIONS NO) + +diff -urN a/mediastreamer.pc.in b/mediastreamer.pc.in +--- a/mediastreamer.pc.in 2020-02-12 08:32:20.000000000 +0100 ++++ b/mediastreamer.pc.in 2020-03-04 14:57:06.385621735 +0100 +@@ -5,7 +5,8 @@ Name: mediastreamer Description: A mediastreaming library for telephony applications
