[packages/mediastreamer/DEVEL-5.2] - updated to 5.2.49 (AGPL licensed now)
qboosh
qboosh at pld-linux.org
Mon Apr 10 21:35:37 CEST 2023
commit 3b62eac2220fc3bedb30b9c59423b301405a5bd1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Apr 10 20:53:09 2023 +0200
- updated to 5.2.49 (AGPL licensed now)
mediastreamer-cmake-upnp.patch | 12 ++++++------
mediastreamer-gsm.patch | 8 ++++----
mediastreamer.spec | 23 +++++++++++------------
3 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/mediastreamer.spec b/mediastreamer.spec
index e7e4979..dfa36a7 100644
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -20,19 +20,18 @@
%bcond_without sdl # SDL support
# video codecs
%bcond_without matroska # Matroska support via bcmatroska2
-%bcond_without zxing # QRcode support via zxing-cpp
+%bcond_without zxing # QRcode support via zxing-cpp-nu
#
Summary: Audio/Video real-time streaming
Summary(pl.UTF-8): Przesyłanie strumieni audio/video w czasie rzeczywistym
Name: mediastreamer
-# note: 5.2.x is AGPL-licensed; see DEVEL-5.2 branch
-Version: 5.1.72
+Version: 5.2.49
Release: 1
-License: GPL v3+
+License: AGPL v3+
Group: Libraries
#Source0Download: https://gitlab.linphone.org/BC/public/mediastreamer2/tags
Source0: https://gitlab.linphone.org/BC/public/mediastreamer2/-/archive/%{version}/mediastreamer2-%{version}.tar.bz2
-# Source0-md5: 8b27b959e5872ac9625ab6740aab7376
+# Source0-md5: b1df8e326f047666aa904832c67bdc02
Patch0: build.patch
Patch1: %{name}-cmake-link.patch
Patch2: libupnp-1.14.patch
@@ -70,7 +69,7 @@ BuildRequires: libv4l-devel
BuildRequires: libvpx-devel >= 0.9.6
BuildRequires: libyuv-devel
BuildRequires: opus-devel >= 0.9.0
-BuildRequires: ortp-devel >= 5.1
+BuildRequires: ortp-devel >= 5.2
BuildRequires: pkgconfig
%{?with_portaudio:BuildRequires: portaudio-devel}
%{?with_pulseaudio:BuildRequires: pulseaudio-devel >= 0.9.21}
@@ -82,7 +81,7 @@ BuildRequires: speexdsp-devel >= 1.2-beta3
%{?with_srtp:BuildRequires: libsrtp2-devel}
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXv-devel
-%{?with_zxing:BuildRequires: zxing-cpp-devel}
+%{?with_zxing:BuildRequires: zxing-cpp-nu-devel}
%{?with_bcg729:Requires: bcg729 >= 1.1.1-1}
%{?with_matroska:Requires: bcmatroska2 >= 5.1}
Requires: bctoolbox >= 0.4.0
@@ -91,7 +90,7 @@ Requires: bctoolbox >= 0.4.0
Requires: libtheora >= 1.0-0.alpha7
Requires: libvpx >= 0.9.6
Requires: opus >= 0.9.0
-Requires: ortp >= 5.1
+Requires: ortp >= 5.2
%{?with_pulseaudio:Requires: pulseaudio-libs >= 0.9.21}
Requires: spandsp >= 0.0.6
Requires: speex >= 1:1.2-beta3
@@ -128,7 +127,7 @@ Requires: libupnp-devel >= 1.8
Requires: libv4l-devel
Requires: libvpx-devel >= 0.9.6
Requires: opus-devel >= 0.9.0
-Requires: ortp-devel >= 5.1
+Requires: ortp-devel >= 5.2
%{?with_portaudio:Requires: portaudio-devel}
%{?with_pulseaudio:Requires: pulseaudio-devel >= 0.9.21}
Requires: spandsp-devel >= 0.0.6
@@ -172,8 +171,8 @@ Statyczne biblioteki mediastreamer.
# cmake checks for python3, so don't require python 2 as well
%{__sed} -i -e '1s,/usr/bin/python$,%{__python3},' tools/xxd.py
-
-%{__sed} -i -e 's/"-Werror" /"-Werror" "-Wno-error=address"/' CMakeLists.txt
+# there are some unused parameters in UPnP code
+%{__sed} -i -e 's/"-Werror" /& "-Wno-error=address" "-Wno-error=unused-parameter"/' CMakeLists.txt
%build
install -d build
@@ -233,7 +232,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/mediastreamer/plugins
# we don't need another copy
%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/OpenGL
# Remove duplicated documentation
-%{__rm} -r $RPM_BUILD_ROOT/usr/share/doc/mediastreamer2-5.1.0/html
+%{__rm} -r $RPM_BUILD_ROOT/usr/share/doc/mediastreamer2-5.2.0/html
%find_lang %{name}
diff --git a/mediastreamer-cmake-upnp.patch b/mediastreamer-cmake-upnp.patch
index 38ccd12..2456f8e 100644
--- a/mediastreamer-cmake-upnp.patch
+++ b/mediastreamer-cmake-upnp.patch
@@ -1,15 +1,15 @@
---- mediastreamer2-5.1.72/CMakeLists.txt.orig 2023-04-10 19:00:46.387121654 +0200
-+++ mediastreamer2-5.1.72/CMakeLists.txt 2023-04-10 19:04:39.545858525 +0200
-@@ -91,6 +91,8 @@ option(ENABLE_OPENGL_PROFILING "Measure
- option(ENABLE_SRTP "Build with the SRTP transport support." YES)
+--- mediastreamer2-5.2.49/CMakeLists.txt.orig 2023-04-10 20:24:30.643236256 +0200
++++ mediastreamer2-5.2.49/CMakeLists.txt 2023-04-10 20:34:24.300020141 +0200
+@@ -93,6 +93,8 @@ option(ENABLE_SRTP "Build with the SRTP
cmake_dependent_option(ENABLE_ZRTP "Build with ZRTP support." YES "ENABLE_SRTP" NO)
+ cmake_dependent_option(ENABLE_GOCLEAR "Build with ZRTP GoClear message support (RFC 6189 - section 5.11)." YES "ENABLE_ZRTP" NO)
+option(ENABLE_UPNP "Build with UPnP support." YES)
+
option(ENABLE_SOUND "Can be used to turn off all possible sound backends." YES)
cmake_dependent_option(ENABLE_ALSA "Enable ALSA support." YES "ENABLE_SOUND;LINUX_OR_BSD" NO)
cmake_dependent_option(ENABLE_ANDROIDSND "Enable Android sound support." NO "ENABLE_SOUND;ANDROID" NO)
-@@ -183,6 +185,13 @@ endif()
+@@ -185,6 +187,13 @@ endif()
if(ENABLE_PCAP)
find_package(PCAP QUIET)
endif()
@@ -23,7 +23,7 @@
if(ENABLE_SRTP)
if(NOT DISABLE_SRTP_SEARCH)
find_package(SRTP "2" REQUIRED)
-@@ -449,6 +458,11 @@ endif()
+@@ -455,6 +464,11 @@ endif()
if(HAVE_DLOPEN)
list(APPEND LINK_LIBS dl)
endif()
diff --git a/mediastreamer-gsm.patch b/mediastreamer-gsm.patch
index 6bd4855..b30d93b 100644
--- a/mediastreamer-gsm.patch
+++ b/mediastreamer-gsm.patch
@@ -1,7 +1,7 @@
---- mediastreamer2-4.5.22/src/audiofilters/gsm.c.orig 2021-06-24 23:55:04.000000000 +0200
-+++ mediastreamer2-4.5.22/src/audiofilters/gsm.c 2021-07-09 20:30:36.320023832 +0200
-@@ -18,7 +18,7 @@
- */
+--- mediastreamer2-5.2.49/src/audiofilters/gsm.c.orig 2023-04-10 20:20:05.804671009 +0200
++++ mediastreamer2-5.2.49/src/audiofilters/gsm.c 2023-04-10 20:23:51.093450515 +0200
+@@ -21,7 +21,7 @@
+ #include <bctoolbox/defs.h>
#include "mediastreamer2/msfilter.h"
-#include <gsm/gsm.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mediastreamer.git/commitdiff/3b62eac2220fc3bedb30b9c59423b301405a5bd1
More information about the pld-cvs-commit
mailing list