From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 5 Jul 2021 17:01:20 +0000 (+0200)
Subject: - updated to 4.5.22
X-Git-Tag: auto/th/mediastreamer-4.5.22-1^2~8
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=5bc87a06de094a61e6d3f42b953165d6da48ec7e;p=packages%2Fmediastreamer.git

- updated to 4.5.22
- updated build patch
---

diff --git a/build.patch b/build.patch
index e823e36..6c314f8 100644
--- a/build.patch
+++ b/build.patch
@@ -13,13 +13,13 @@
 @@ -1,5 +1,5 @@
  dnl Process this file with autoconf to produce a configure script.
 -AC_INIT([mediastreamer],[2.15.1])
-+AC_INIT([mediastreamer],[4.4.2])
++AC_INIT([mediastreamer],[4.5.22])
  
  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.4.2/src/Makefile.am.orig	2020-09-24 11:44:00.000000000 +0200
-+++ mediastreamer2-4.4.2/src/Makefile.am	2020-09-27 14:14:05.564721694 +0200
-@@ -83,6 +83,7 @@
+--- 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
+@@ -83,6 +83,7 @@ libmediastreamer_base_la_SOURCES=	base/m
  					base/mswebcam.c \
  					base/mtu.c \
  					base/msasync.c \
@@ -27,7 +27,7 @@
  					otherfilters/void.c \
  					otherfilters/itc.c
  libmediastreamer_voip_la_SOURCES=
-@@ -117,6 +118,8 @@
+@@ -118,6 +119,8 @@ libmediastreamer_voip_la_SOURCES+=	voip/
  					voip/bandwidthcontroller.c \
  					crypto/zrtp.c \
  					voip/stun.c \
@@ -36,7 +36,7 @@
  					crypto/ms_srtp.c \
  					crypto/dtls_srtp.c \
  					voip/msiframerequestslimiter.c \
-@@ -152,6 +155,8 @@
+@@ -153,6 +156,8 @@ libmediastreamer_voip_la_SOURCES+=	audio
  					utils/g722.h \
  					utils/g722_decode.c \
  					utils/g722_encode.c \
@@ -45,7 +45,7 @@
  					audiofilters/msg722.c \
  					audiofilters/l16.c \
  					audiofilters/genericplc.h \
-@@ -257,7 +262,7 @@
+@@ -258,7 +263,7 @@ if BUILD_V4L2
  libmediastreamer_voip_la_SOURCES+=	videofilters/msv4l2.c
  endif
  
@@ -54,13 +54,14 @@
  libmediastreamer_voip_la_SOURCES+=	videofilters/drawdib-display.c
  endif
  
-@@ -270,17 +275,16 @@
+@@ -271,17 +276,17 @@ libmediastreamer_voip_la_SOURCES+=	video
  endif
  
  if BUILD_MATROSKA
 -libmediastreamer_voip_la_SOURCES+=	videofilters/mkv.c \
+-					utils/mkv_reader.c utils/mkv_reader.h
 +libmediastreamer_voip_la_SOURCES+=	videofilters/mkv.cpp \
- 					utils/mkv_reader.c utils/mkv_reader.h
++					utils/mkv_reader.cpp utils/mkv_reader.h
  endif
  
  if BUILD_AVCODEC
@@ -70,11 +71,12 @@
  					utils/ffmpeg-priv.h \
  					utils/ffmpeg-priv.c \
 -					videofilters/h264dec.c \
++					utils/jpgloader-ffmpeg.c \
 +					videofilters/h264dec.cpp \
  					videofilters/ffmpegjpegwriter.c
  endif
  
-@@ -303,7 +307,6 @@
+@@ -304,20 +309,31 @@ libmediastreamer_voip_la_SOURCES+=	voip/
  					voip/msvideoqualitycontroller.c \
  					voip/msvideo_neon.c \
  					voip/msvideo_neon.h \
@@ -82,7 +84,10 @@
  					voip/videostarter.c \
  					voip/vp8rtpfmt.c \
  					voip/vp8rtpfmt.h \
-@@ -313,10 +316,22 @@
+ 					videofilters/mire.c \
+-					videofilters/nowebcam.c videofilters/ffmpegnowebcam.c voip/nowebcam.h \
++					videofilters/nowebcam.c voip/nowebcam.h \
+ 					videofilters/extdisplay.c \
  					utils/bits_rw.c \
  					utils/x11_helper.c \
  					utils/stream_regulator.c utils/stream_regulator.h \
@@ -106,7 +111,7 @@
  if ORTP_ENABLED
  libmediastreamer_voip_la_SOURCES+=	voip/videostream.c
  endif
-@@ -468,7 +483,7 @@
+@@ -469,7 +485,7 @@ endif
  
  AM_OBJCFLAGS=$(AM_CFLAGS)
  
diff --git a/mediastreamer.spec b/mediastreamer.spec
index cd600d1..ad7c57b 100644
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -16,13 +16,13 @@
 Summary:	Audio/Video real-time streaming
 Summary(pl.UTF-8):	Przesyłanie strumieni audio/video w czasie rzeczywistym 
 Name:		mediastreamer
-Version:	4.4.2
+Version:	4.5.22
 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:	f2fe330ad7a65dcab407c311f98fc829
+# Source0-md5:	3cdcfb0a1e3bd1b2774ca1da6316dae6
 Patch0:		build.patch
 Patch2:		libupnp-1.14.patch
 URL:		http://www.linphone.org/technical-corner/mediastreamer2/overview