commit 85ee47be56ca7e91dc852b30891f516bb82aebd4
Author: Jakub Bogusz <[email protected]>
Date: Mon Apr 10 20:17:25 2023 +0200
- updated to 5.1.72 (last GPL-licensed version)
build.patch | 11 ++++++-----
mediastreamer-bounds.patch | 11 -----------
mediastreamer-cmake-SDL.patch | 12 ++++++------
mediastreamer-cmake-link.patch | 10 +++++-----
mediastreamer-cmake-upnp.patch | 16 ++++++++--------
mediastreamer.spec | 14 ++++++++------
6 files changed, 33 insertions(+), 41 deletions(-)
---
diff --git a/mediastreamer.spec b/mediastreamer.spec
index 68695f8..0b943fd 100644
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -25,13 +25,14 @@
Summary: Audio/Video real-time streaming
Summary(pl.UTF-8): Przesyłanie strumieni audio/video w czasie rzeczywistym
Name: mediastreamer
-Version: 4.5.22
-Release: 2
+# note: 5.2.x is AGPL-licensed; see DEVEL-5.2 branch
+Version: 5.1.72
+Release: 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: 3cdcfb0a1e3bd1b2774ca1da6316dae6
+# Source0-md5: 8b27b959e5872ac9625ab6740aab7376
Patch0: build.patch
Patch1: %{name}-cmake-link.patch
Patch2: libupnp-1.14.patch
@@ -41,7 +42,6 @@ Patch5: %{name}-cmake-SDL.patch
Patch6: %{name}-types.patch
Patch7: %{name}-gsm.patch
Patch8: %{name}-cmake-upnp.patch
-Patch9: %{name}-bounds.patch
Patch10: %{name}-gcc.patch
URL: http://www.linphone.org/technical-corner/mediastreamer2/overview
%{?with_opengl:BuildRequires: OpenGL-GLX-devel}
@@ -68,6 +68,7 @@ BuildRequires: libtheora-devel >= 1.0-0.alpha7
BuildRequires: libupnp-devel >= 1.8
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: pkgconfig
@@ -166,7 +167,6 @@ Statyczne biblioteki mediastreamer.
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
%patch10 -p1
# cmake checks for python3, so don't require python 2 as well
@@ -227,8 +227,10 @@ done
# for external plugins
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-4.5.0/html
+%{__rm} -r $RPM_BUILD_ROOT/usr/share/doc/mediastreamer2-5.1.0/html
%find_lang %{name}
diff --git a/build.patch b/build.patch
index 6c314f8..f9f9a0e 100644
--- a/build.patch
+++ b/build.patch
@@ -17,8 +17,8 @@
AC_MSG_NOTICE([$PACKAGE_NAME-$PACKAGE_VERSION A mediastreaming
library for telephony application.])
AC_MSG_NOTICE([licensed under the terms of the General Public License (GPL)])
---- mediastreamer2-4.5.22/src/Makefile.am.orig 2021-06-24 23:55:04.000000000
+0200
-+++ mediastreamer2-4.5.22/src/Makefile.am 2021-07-05 18:00:26.701108988
+0200
+--- mediastreamer2-5.1.72/src/Makefile.am.orig 2022-11-18 15:22:23.000000000
+0100
++++ mediastreamer2-5.1.72/src/Makefile.am 2023-04-10 08:48:04.099613394
+0200
@@ -83,6 +83,7 @@ libmediastreamer_base_la_SOURCES= base/m
base/mswebcam.c \
base/mtu.c \
@@ -76,7 +76,7 @@
videofilters/ffmpegjpegwriter.c
endif
-@@ -304,20 +309,31 @@ libmediastreamer_voip_la_SOURCES+= voip/
+@@ -304,21 +309,32 @@ libmediastreamer_voip_la_SOURCES+= voip/
voip/msvideoqualitycontroller.c \
voip/msvideo_neon.c \
voip/msvideo_neon.h \
@@ -88,6 +88,7 @@
- videofilters/nowebcam.c
videofilters/ffmpegnowebcam.c voip/nowebcam.h \
+ videofilters/nowebcam.c voip/nowebcam.h
\
videofilters/extdisplay.c \
+ videofilters/msanalysedisplay.c \
utils/bits_rw.c \
utils/x11_helper.c \
utils/stream_regulator.c
utils/stream_regulator.h \
@@ -111,12 +112,12 @@
if ORTP_ENABLED
libmediastreamer_voip_la_SOURCES+= voip/videostream.c
endif
-@@ -469,7 +485,7 @@ endif
+@@ -470,7 +486,7 @@ endif
AM_OBJCFLAGS=$(AM_CFLAGS)
-imgdir=$(datadir)/images/
-+imgdir=$(pkgdatadir)/images/
++imgdir=$(pkgdatadir)/images
img_DATA=voip/nowebcamCIF.jpg
diff --git a/mediastreamer-bounds.patch b/mediastreamer-bounds.patch
deleted file mode 100644
index 0bbe15b..0000000
--- a/mediastreamer-bounds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mediastreamer2-4.5.22/src/audiofilters/pulseaudio.c.orig 2021-06-24
23:55:04.000000000 +0200
-+++ mediastreamer2-4.5.22/src/audiofilters/pulseaudio.c 2021-07-18
10:10:08.244595475 +0200
-@@ -229,7 +229,7 @@
- * output: sink and bidirectionnal cards into sink list, source only card
into source list
- * merging is based on pulse audio card description */
- int pulse_card_compare(pa_device_t *sink, pa_device_t *source) {
-- return strncmp(sink->description, source->description, 512);
-+ return strncmp(sink->description, source->description, PA_STRING_SIZE);
- }
-
- static void pulse_card_merge_lists(pa_device_t *pa_device, bctbx_list_t
**pa_source_list) {
diff --git a/mediastreamer-cmake-SDL.patch b/mediastreamer-cmake-SDL.patch
index 09d4690..2406db1 100644
--- a/mediastreamer-cmake-SDL.patch
+++ b/mediastreamer-cmake-SDL.patch
@@ -1,8 +1,8 @@
---- mediastreamer2-4.5.22/CMakeLists.txt.orig 2021-07-09 18:37:34.690096407
+0200
-+++ mediastreamer2-4.5.22/CMakeLists.txt 2021-07-09 19:32:39.148861285
+0200
-@@ -287,7 +287,13 @@ endif()
- if(NOT APPLE AND NOT ANDROID AND OPENGL_FOUND OR GLX_FOUND)
- find_package(Glew REQUIRED)
+--- mediastreamer2-5.1.72/CMakeLists.txt.orig 2023-04-10 18:45:22.718792262
+0200
++++ mediastreamer2-5.1.72/CMakeLists.txt 2023-04-10 19:00:27.760555896
+0200
+@@ -325,7 +325,13 @@ if(NOT APPLE AND NOT ANDROID AND OPENGL_
+ set(MS2_USE_OLD_OPENGL_PROTOTYPE TRUE)#Before 1.11, Glew have
few different headers from OpenGL Specs
+ endif()
endif()
-# TODO: Handle SDL option
+if(ENABLE_SDL)
@@ -15,7 +15,7 @@
if(ENABLE_THEORA)
find_package(Theora)
if(NOT THEORA_FOUND)
-@@ -453,6 +459,9 @@ if(GLEW_FOUND)
+@@ -498,6 +504,9 @@ if(GLEW_FOUND)
list(APPEND LINK_LIBS GLEW)
list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${GLEW_INCLUDE_DIRS})
endif()
diff --git a/mediastreamer-cmake-link.patch b/mediastreamer-cmake-link.patch
index bd0b054..fbb8316 100644
--- a/mediastreamer-cmake-link.patch
+++ b/mediastreamer-cmake-link.patch
@@ -1,15 +1,15 @@
---- mediastreamer2-4.5.22/CMakeLists.txt.orig 2021-06-24 23:55:04.000000000
+0200
-+++ mediastreamer2-4.5.22/CMakeLists.txt 2021-07-07 06:15:26.781790314
+0200
-@@ -371,7 +371,7 @@ include_directories(
+--- mediastreamer2-5.1.72/CMakeLists.txt.orig 2022-11-18 15:22:23.000000000
+0100
++++ mediastreamer2-5.1.72/CMakeLists.txt 2023-04-10 18:45:02.855566537
+0200
+@@ -418,7 +418,7 @@ include_directories(
)
set(MEDIASTREAMER2_INCLUDE_DIRS )
-set(LINK_LIBS bctoolbox ortp)
+set(LINK_LIBS bctoolbox ortp pthread)
-
if(WIN32)
if(NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT
CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-@@ -440,7 +440,7 @@ if(X11_FOUND)
+ list(APPEND LINK_LIBS ole32 oleaut32 uuid Winmm Ws2_32)
+@@ -487,7 +487,7 @@ if(X11_FOUND)
list(APPEND MEDIASTREAMER2_INCLUDE_DIRS ${X11_INCLUDE_DIRS})
endif()
if(XV_FOUND)
diff --git a/mediastreamer-cmake-upnp.patch b/mediastreamer-cmake-upnp.patch
index 7952e30..38ccd12 100644
--- a/mediastreamer-cmake-upnp.patch
+++ b/mediastreamer-cmake-upnp.patch
@@ -1,6 +1,6 @@
---- mediastreamer2-4.5.22/CMakeLists.txt.orig 2021-07-09 20:43:58.295679157
+0200
-+++ mediastreamer2-4.5.22/CMakeLists.txt 2021-07-09 21:46:38.291976177
+0200
-@@ -81,6 +81,8 @@ option(ENABLE_PACKAGE_SOURCE "Create 'pa
+--- 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)
@@ -9,10 +9,10 @@
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)
-@@ -161,6 +163,13 @@ if(ENABLE_PCAP)
+@@ -183,6 +185,13 @@ endif()
+ if(ENABLE_PCAP)
find_package(PCAP QUIET)
endif()
-
+if(ENABLE_UPNP)
+ find_library(UPNP upnp)
+ if(NOT UPNP)
@@ -21,9 +21,9 @@
+ endif()
+endif()
if(ENABLE_SRTP)
- find_package(SRTP)
- if(NOT SRTP_FOUND)
-@@ -402,6 +411,11 @@ endif()
+ if(NOT DISABLE_SRTP_SEARCH)
+ find_package(SRTP "2" REQUIRED)
+@@ -449,6 +458,11 @@ endif()
if(HAVE_DLOPEN)
list(APPEND LINK_LIBS dl)
endif()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mediastreamer.git/commitdiff/85ee47be56ca7e91dc852b30891f516bb82aebd4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
