[packages/mediastreamer] - updated dependencies, avoid -Werror=adress errors in UPnP code, patch cleanup

[qboosh]

commit 5786ff67effc0920b634a4f9a7bd1c53a1f3005a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 10 21:35:16 2023 +0200

    - updated dependencies, avoid -Werror=adress errors in UPnP code, patch cleanup

 mediastreamer-gsm.patch | 18 ------------------
 mediastreamer.spec      | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 26 deletions(-)
---
diff --git a/mediastreamer.spec b/mediastreamer.spec
index 0b943fd..e7e4979 100644
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -49,10 +49,10 @@ URL:		http://www.linphone.org/technical-corner/mediastreamer2/overview
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
 %{?with_arts:BuildRequires:	artsc-devel}
 %{?with_bcg729:BuildRequires:	bcg729-devel >= 1.1.1-1}
-%{?with_matroska:BuildRequires:	bcmatroska2-devel}
+%{?with_matroska:BuildRequires:	bcmatroska2-devel >= 5.1}
 BuildRequires:	bctoolbox-devel >= 0.4.0
 %{?with_bv16:BuildRequires:	bv16-floatingpoint-devel}
-%{?with_zrtp:BuildRequires:	bzrtp-devel >= 4.5.15-1}
+%{?with_zrtp:BuildRequires:	bzrtp-devel >= 5.1}
 BuildRequires:	cmake >= 3.1
 BuildRequires:	doxygen
 # libavcodec >= 51.0.0, libswscale >= 0.7.0
@@ -70,7 +70,7 @@ BuildRequires:	libv4l-devel
 BuildRequires:	libvpx-devel >= 0.9.6
 BuildRequires:	libyuv-devel
 BuildRequires:	opus-devel >= 0.9.0
-BuildRequires:	ortp-devel >= 4.5.15-1
+BuildRequires:	ortp-devel >= 5.1
 BuildRequires:	pkgconfig
 %{?with_portaudio:BuildRequires:	portaudio-devel}
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel >= 0.9.21}
@@ -84,13 +84,14 @@ BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXv-devel
 %{?with_zxing:BuildRequires:	zxing-cpp-devel}
 %{?with_bcg729:Requires:	bcg729 >= 1.1.1-1}
+%{?with_matroska:Requires:	bcmatroska2 >= 5.1}
 Requires:	bctoolbox >= 0.4.0
-%{?with_zrtp:Requires:	bzrtp >= 4.5}
+%{?with_zrtp:Requires:	bzrtp >= 5.1}
 %{?with_opengl:Requires:	glew >= 1.5}
 Requires:	libtheora >= 1.0-0.alpha7
 Requires:	libvpx >= 0.9.6
 Requires:	opus >= 0.9.0
-Requires:	ortp >= 4.5
+Requires:	ortp >= 5.1
 %{?with_pulseaudio:Requires:	pulseaudio-libs >= 0.9.21}
 Requires:	spandsp >= 0.0.6
 Requires:	speex >= 1:1.2-beta3
@@ -116,10 +117,10 @@ Requires:	%{name} = %{version}-%{release}
 %{?with_opengl:Requires:	OpenGL-devel}
 %{?with_alsa:Requires:	alsa-lib-devel}
 %{?with_bcg729:Requires:	bcg729-devel >= 1.1.1-1}
-%{?with_matroska:Requires:	bcmatroska2-devel}
+%{?with_matroska:Requires:	bcmatroska2-devel >= 5.1}
 Requires:	bctoolbox-devel >= 0.4.0
 %{?with_bv16:Requires:	bv16-floatingpoint-devel}
-%{?with_zrtp:Requires:	bzrtp-devel >= 4.5.15-1}
+%{?with_zrtp:Requires:	bzrtp-devel >= 5.1}
 Requires:	ffmpeg-devel
 %{?with_opengl:Requires:	glew-devel >= 1.5}
 Requires:	libtheora-devel >= 1.0-0.alpha7
@@ -127,7 +128,7 @@ Requires:	libupnp-devel >= 1.8
 Requires:	libv4l-devel
 Requires:	libvpx-devel >= 0.9.6
 Requires:	opus-devel >= 0.9.0
-Requires:	ortp-devel >= 4.5.15-1
+Requires:	ortp-devel >= 5.1
 %{?with_portaudio:Requires:	portaudio-devel}
 %{?with_pulseaudio:Requires:	pulseaudio-devel >= 0.9.21}
 Requires:	spandsp-devel >= 0.0.6
@@ -172,6 +173,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
+
 %build
 install -d build
 cd build
diff --git a/mediastreamer-gsm.patch b/mediastreamer-gsm.patch
index 2c4844a..6bd4855 100644
--- a/mediastreamer-gsm.patch
+++ b/mediastreamer-gsm.patch
@@ -9,24 +9,6 @@
  
  #ifdef _MSC_VER
  #include <malloc.h>
-#--- mediastreamer2-4.5.22/cmake/FindGSM.cmake.orig	2021-06-24 23:55:04.000000000 +0200
-#+++ mediastreamer2-4.5.22/cmake/FindGSM.cmake	2021-07-09 20:32:19.826129758 +0200
-#@@ -37,6 +37,15 @@ find_path(GSM_INCLUDE_DIRS
-# )
-# if(GSM_INCLUDE_DIRS)
-# 	set(HAVE_GSM_GSM_H 1)
-#+else()
-#+	find_path(GSM_INCLUDE_DIRS
-#+		NAMES gsm.h
-#+		HINTS _GSM_ROOT_PATHS
-#+		PATH_SUFFIXES include
-#+	)
-#+	if(GSM_INCLUDE_DIRS)
-#+		set(HAVE_GSM_H 1)
-#+	endif()
-# endif()
-# 
-# find_library(GSM_LIBRARIES
 --- mediastreamer2-4.5.22/cmake/FindGSM.cmake.orig	2021-06-24 23:55:04.000000000 +0200
 +++ mediastreamer2-4.5.22/cmake/FindGSM.cmake	2021-07-09 20:42:12.959583145 +0200
 @@ -31,12 +31,12 @@ set(_GSM_ROOT_PATHS
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mediastreamer.git/commitdiff/5786ff67effc0920b634a4f9a7bd1c53a1f3005a