Hello community, here is the log from the commit of package mediastreamer2 for openSUSE:Factory checked in at 2018-08-27 13:47:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mediastreamer2 (Old) and /work/SRC/openSUSE:Factory/.mediastreamer2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mediastreamer2" Mon Aug 27 13:47:10 2018 rev:23 rq:629596 version:2.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer2.changes 2017-08-29 11:38:41.485868848 +0200 +++ /work/SRC/openSUSE:Factory/.mediastreamer2.new/mediastreamer2.changes 2018-08-27 13:47:12.384368108 +0200 @@ -1,0 +2,7 @@ +Wed Aug 15 14:36:31 UTC 2018 - sor.ale...@meowr.ru + +- Add mediastreamer2-2.16.1-fix-no-git.patch: Fix building + out-of-git (commit de3a24b). +- Fix missing package documentation and licensing files. + +------------------------------------------------------------------- New: ---- mediastreamer2-2.16.1-fix-no-git.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mediastreamer2.spec ++++++ --- /var/tmp/diff_new_pack.YgY43h/_old 2018-08-27 13:47:13.544369765 +0200 +++ /var/tmp/diff_new_pack.YgY43h/_new 2018-08-27 13:47:13.548369771 +0200 @@ -1,7 +1,7 @@ # # spec file for package mediastreamer2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,15 +25,17 @@ Version: 2.16.1 Release: 0 Summary: Audio/Video real-time streaming -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Telephony/Utilities -Url: https://linphone.org/technical-corner/mediastreamer2/overview +URL: https://linphone.org/technical-corner/mediastreamer2/overview Source: https://linphone.org/releases/sources/%{_name}/%{_name}-%{version}.tar.gz Source99: baselibs.conf # PATCH-FIX-OPENSUSE mediastreamer2-fix-pkgconfig.patch sor.ale...@meowr.ru -- Install mediastreamer.pc. Patch0: mediastreamer2-fix-pkgconfig.patch # PATCH-FIX-OPENSUSE mediastreamer2-fix-xv.patch sor.ale...@meowr.ru -- 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 @@ -64,7 +66,7 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xv) Obsoletes: %{name}-lang -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1500 BuildRequires: libjpeg-devel %endif %if %{with ffmpeg} @@ -117,6 +119,7 @@ %setup -q -n %{_name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake \ @@ -147,8 +150,10 @@ %postun -n %{sovoip}%{sover} -p /sbin/ldconfig %files +%license COPYING +%doc AUTHORS NEWS README.md %doc %{_docdir}/%{name}/ -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120000 +%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 120000 %{_bindir}/mediastream %{_bindir}/mkvstream %dir %{_datadir}/images/ ++++++ mediastreamer2-2.16.1-fix-no-git.patch ++++++ --- a/src/base/msfactory.c +++ b/src/base/msfactory.c @@ -24,9 +24,10 @@ Foundation, Inc., 51 Franklin Street, Fi # ifndef MEDIASTREAMER_VERSION # define MEDIASTREAMER_VERSION "unknown" # endif -# ifndef MS2_GIT_VERSION -# define MS2_GIT_VERSION "unknown" -# endif +#endif + +#ifndef MS2_GIT_VERSION +#define MS2_GIT_VERSION "unknown" #endif #include "mediastreamer2/msfilter.h"
