[packages/mediastreamer] - up to 5.2.109
baggins
baggins at pld-linux.org
Sun Oct 22 23:01:38 CEST 2023
commit c21e49af2e7e14c60b24482b1de23ee71c256ad1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Oct 22 23:01:19 2023 +0200
- up to 5.2.109
gcc13.patch | 10 --------
mediastreamer-bzrtp.patch | 11 ---------
mediastreamer-cmake-upnp.patch | 55 ------------------------------------------
mediastreamer-gsm.patch | 39 ------------------------------
mediastreamer.spec | 18 ++++----------
5 files changed, 5 insertions(+), 128 deletions(-)
---
diff --git a/mediastreamer.spec b/mediastreamer.spec
index 0e8d57b..a479f37 100644
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -26,13 +26,13 @@ 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
-Release: 3
+Version: 5.2.109
+Release: 0.1
License: GPL 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: fb37d1ea973015e3c648d219d2ff3dda
Patch0: build.patch
Patch1: %{name}-cmake-link.patch
Patch2: libupnp-1.14.patch
@@ -40,11 +40,7 @@ Patch3: %{name}-cmake-datadir.patch
Patch4: %{name}-cmake-install-pkgconfig.patch
Patch5: %{name}-cmake-SDL.patch
Patch6: %{name}-types.patch
-Patch7: %{name}-gsm.patch
-Patch8: %{name}-cmake-upnp.patch
-Patch9: %{name}-bzrtp.patch
Patch10: %{name}-gcc.patch
-Patch11: gcc13.patch
URL: http://www.linphone.org/technical-corner/mediastreamer2/overview
%{?with_opengl:BuildRequires: OpenGL-GLX-devel}
%{?with_sdl:BuildRequires: SDL-devel >= 1.2.0}
@@ -89,12 +85,12 @@ BuildRequires: xorg-lib-libXv-devel
%{?with_bcg729:Requires: bcg729 >= 1.1.1-1}
%{?with_matroska:Requires: bcmatroska2 >= 5.1}
Requires: bctoolbox >= 0.4.0
-%{?with_zrtp:Requires: bzrtp >= 5.2.51}
+%{?with_zrtp:Requires: bzrtp >= 5.2.109}
%{?with_opengl:Requires: glew >= 1.5}
Requires: libtheora >= 1.0-0.alpha7
Requires: libvpx >= 0.9.6
Requires: opus >= 0.9.0
-Requires: ortp >= 5.1
+Requires: ortp >= 5.2.109
%{?with_pulseaudio:Requires: pulseaudio-libs >= 0.9.21}
Requires: spandsp >= 0.0.6
Requires: speex >= 1:1.2-beta3
@@ -169,11 +165,7 @@ Statyczne biblioteki mediastreamer.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
%patch10 -p1
-%patch11 -p1
# cmake checks for python3, so don't require python 2 as well
%{__sed} -i -e '1s,/usr/bin/python$,%{__python3},' tools/xxd.py
diff --git a/gcc13.patch b/gcc13.patch
deleted file mode 100644
index 12ba30c..0000000
--- a/gcc13.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mediastreamer2-5.1.72/src/utils/qrcode_image.hpp.orig 2022-11-18 15:22:23.000000000 +0100
-+++ mediastreamer2-5.1.72/src/utils/qrcode_image.hpp 2023-10-01 22:13:26.787540196 +0200
-@@ -20,6 +20,7 @@
- #ifndef qrcode_image_h
- #define qrcode_image_h
-
-+#include <cstdint>
- #include <zxing/LuminanceSource.h>
-
- class QRCodeImage : public zxing::LuminanceSource {
diff --git a/mediastreamer-bzrtp.patch b/mediastreamer-bzrtp.patch
deleted file mode 100644
index 9b60b77..0000000
--- a/mediastreamer-bzrtp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mediastreamer2-5.1.72/CMakeLists.txt.orig 2023-04-18 18:55:06.621077196 +0200
-+++ mediastreamer2-5.1.72/CMakeLists.txt 2023-04-18 19:09:58.046247931 +0200
-@@ -559,7 +559,7 @@ if(GSM_FOUND)
- list(APPEND LINK_LIBS ${GSM_LIBRARIES})
- list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${GSM_INCLUDE_DIRS})
- endif()
--if(BZRTP_FOUND)
-+if(bzrtp_FOUND)
- list(APPEND LINK_LIBS bzrtp)
- list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${BZRTP_INCLUDE_DIRS})
- set(HAVE_ZRTP 1)
diff --git a/mediastreamer-cmake-upnp.patch b/mediastreamer-cmake-upnp.patch
deleted file mode 100644
index 38ccd12..0000000
--- a/mediastreamer-cmake-upnp.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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)
- cmake_dependent_option(ENABLE_ZRTP "Build with ZRTP support." YES "ENABLE_SRTP" 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()
- if(ENABLE_PCAP)
- find_package(PCAP QUIET)
- endif()
-+if(ENABLE_UPNP)
-+ find_library(UPNP upnp)
-+ if(NOT UPNP)
-+ message(WARNING "Could not find UPNP library.")
-+ set(ENABLE_UPNP OFF CACHE BOOL "Build with UPnP support." FORCE)
-+ endif()
-+endif()
- if(ENABLE_SRTP)
- if(NOT DISABLE_SRTP_SEARCH)
- find_package(SRTP "2" REQUIRED)
-@@ -449,6 +458,11 @@ endif()
- if(HAVE_DLOPEN)
- list(APPEND LINK_LIBS dl)
- endif()
-+if(ENABLE_UPNP)
-+ list(APPEND LINK_LIBS upnp ixml)
-+ list(APPEND MEDIASTREAMER2_INCLUDE_DIRS /usr/include/upnp)
-+ add_definitions(-D_GNU_SOURCE)
-+endif()
- if(ALSA_FOUND)
- list(APPEND LINK_LIBS asound)
- list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${ALSA_INCLUDE_DIRS})
---- mediastreamer2-4.5.22/src/CMakeLists.txt.orig 2021-07-09 21:45:54.498880091 +0200
-+++ mediastreamer2-4.5.22/src/CMakeLists.txt 2021-07-09 21:45:58.885522993 +0200
-@@ -140,6 +140,15 @@ if (APPLE)
- list(APPEND VOIP_SOURCE_FILES_OBJC utils/apple_utils.h utils/apple_utils.m)
- endif()
-
-+if(ENABLE_UPNP)
-+ list(APPEND VOIP_SOURCE_FILES_C
-+ upnp/upnp_igd.c
-+ upnp/upnp_igd_private.h
-+ upnp/upnp_igd_cmd.c
-+ upnp/upnp_igd_utils.c
-+ upnp/upnp_igd_utils.h
-+ )
-+endif()
- if(ENABLE_ALSA)
- list(APPEND VOIP_SOURCE_FILES_C audiofilters/alsa.c)
- endif()
diff --git a/mediastreamer-gsm.patch b/mediastreamer-gsm.patch
deleted file mode 100644
index 6bd4855..0000000
--- a/mediastreamer-gsm.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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 @@
- */
-
- #include "mediastreamer2/msfilter.h"
--#include <gsm/gsm.h>
-+#include <gsm.h>
-
- #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:42:12.959583145 +0200
-@@ -31,12 +31,12 @@ set(_GSM_ROOT_PATHS
- )
-
- find_path(GSM_INCLUDE_DIRS
-- NAMES gsm/gsm.h
-+ NAMES gsm.h
- HINTS _GSM_ROOT_PATHS
-- PATH_SUFFIXES include
-+ PATH_SUFFIXES include/gsm include
- )
- if(GSM_INCLUDE_DIRS)
-- set(HAVE_GSM_GSM_H 1)
-+ set(HAVE_GSM_H 1)
- endif()
-
- find_library(GSM_LIBRARIES
-@@ -48,7 +48,7 @@ find_library(GSM_LIBRARIES
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(GSM
- DEFAULT_MSG
-- GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_GSM_H
-+ GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_H
- )
-
--mark_as_advanced(GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_GSM_H)
-+mark_as_advanced(GSM_INCLUDE_DIRS GSM_LIBRARIES HAVE_GSM_H)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mediastreamer.git/commitdiff/c21e49af2e7e14c60b24482b1de23ee71c256ad1
More information about the pld-cvs-commit
mailing list