update to 2.16.1 [release 2.16.1-1mamba;Mon Nov 13 2017]

mediastreamer-2.16.1-x86-fix-conversion-error-2.patch

@@ -0,0 +1,11 @@
+--- mediastreamer2-2.16.1/src/otherfilters/mspcapfileplayer.c.orig	2017-11-27 14:38:26.992825972 +0100
++++ mediastreamer2-2.16.1/src/otherfilters/mspcapfileplayer.c	2017-11-27 14:39:52.968135619 +0100
+@@ -238,7 +238,7 @@
+ 						}
+ 						diff_ms = (d->pcap_timeref == MSPCAPFilePlayerTimeRefRTP) ?
+ 							 ((ts - d->pcap_initial_ts) * 1000) / d->rate
+-							: 1000 * (d->pcap_hdr->ts.tv_sec - d->pcap_initial_timeval.tv_sec)
++							: (unsigned int)1000 * (d->pcap_hdr->ts.tv_sec - d->pcap_initial_timeval.tv_sec)
+ 							+ (d->pcap_hdr->ts.tv_usec - d->pcap_initial_timeval.tv_usec) / 1000;
+ 
+ 						if ((f->ticker->time - d->pcap_initial_time) >= diff_ms) {

mediastreamer-2.16.1-x86-fix-conversion-error.patch

@@ -0,0 +1,22 @@
+From e0cafd72c071f956ca72b02f6568ce00a4a904f0 Mon Sep 17 00:00:00 2001
+From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
+Date: Tue, 14 Nov 2017 16:42:06 +0100
+Subject: [PATCH] Fix conversion errors with some compilers.
+
+---
+ include/mediastreamer2/msfilter.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/mediastreamer2/msfilter.h b/include/mediastreamer2/msfilter.h
+index 4775cd57a..02991629f 100644
+--- a/include/mediastreamer2/msfilter.h
++++ b/include/mediastreamer2/msfilter.h
+@@ -596,7 +596,7 @@ MS2_PUBLIC MS2_DEPRECATED void ms_filter_log_statistics(void);
+ the method index (_cnt_) and the argument size */
+ /* I hope using this to avoid type mismatch (calling a method on the wrong filter)*/
+ #define MS_FILTER_METHOD_ID(_id_,_cnt_,_argsize_) \
+-	(  (((unsigned long)(_id_)) & 0xFFFF)<<16 | (_cnt_<<8) | (_argsize_ & 0xFF ))
++	(unsigned int)(((((unsigned int)(_id_)) & 0xFFFF)<<16) | (((unsigned int)(_cnt_))<<8) | (((unsigned int)_argsize_) & 0xFF))
+ 
+ /**
+  * Macro to create a method id, unique per filter.

mediastreamer.spec

@@ -1,38 +1,50 @@
+### AUTOUPDATE-OFF: 8
 Name:          mediastreamer
-Version:       2.12.1
+Version:       2.16.1
-Release:       3mamba
+Release:       1mamba
 Summary:       A GPL licensed library to make audio and video real-time streaming and processing
 Group:         Applications/Multimedia
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.linphone.org/eng/documentation/dev/mediastreamer2.html
-Source:        http://download.savannah.gnu.org/releases/linphone/mediastreamer/mediastreamer-%{version}.tar.gz
+Source:        https://github.com/BelledonneCommunications/mediastreamer2.git/%{version}/mediastreamer2-%{version}.tar.bz2
+Patch0:        mediastreamer-2.16.1-x86-fix-conversion-error.patch
+Patch1:        mediastreamer-2.16.1-x86-fix-conversion-error-2.patch
+#Source:        http://download.savannah.gnu.org/releases/linphone/mediastreamer/mediastreamer-%{version}.tar.gz
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
+BuildRequires: libGL-devel
+BuildRequires: libGLU-devel
+BuildRequires: libX11-devel
+BuildRequires: libXau-devel
+BuildRequires: libXdmcp-devel
+BuildRequires: libXext-devel
+BuildRequires: libXv-devel
 BuildRequires: libalsa-devel
 BuildRequires: libavcodec-ffmpeg-devel
 BuildRequires: libavutil-ffmpeg-devel
+BuildRequires: libbctoolbox-devel
+BuildRequires: libbsd-devel
 BuildRequires: libgcc
+BuildRequires: libglew-devel
 BuildRequires: libgsm-devel
+BuildRequires: libjpeg-devel
 BuildRequires: libogg-devel
+BuildRequires: libopus-devel
 BuildRequires: libortp-devel
-BuildRequires: libpthread-stubs-devel
+BuildRequires: libpcap-devel
+BuildRequires: libpolarssl-devel
 BuildRequires: libpulseaudio-devel
 BuildRequires: libspeex-devel
 BuildRequires: libstdc++6-devel
 BuildRequires: libswscale-ffmpeg-devel
 BuildRequires: libtheora-devel
+BuildRequires: libupnp-devel
 BuildRequires: libv4l-devel
 BuildRequires: libvpx-devel
-BuildRequires: libX11-devel
-BuildRequires: libXau-devel
 BuildRequires: libxcb-devel
-BuildRequires: libXdmcp-devel
-BuildRequires: libXext-devel
-BuildRequires: libXv-devel
-BuildRequires: pkg-config
 ## AUTOBUILDREQ-END
 BuildRequires: libpulseaudio-devel >= 9.0-1mamba
 BuildRequires: libortp-devel >= 0.22
@@ -66,11 +78,14 @@ This package contains libraries and header files for developing applications tha
 %debug_package
 
 %prep
-%setup -q
+%setup -q -n mediastreamer2-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
+./autogen.sh
 %configure \
-   CFLAGS="%{optflags} -Wno-unused-function -Wno-error=deprecated-declarations"
+   CFLAGS="%{optflags} -DMS2_GIT_VERSION=\"\\\"unknown\\\"\""
 
 %make
 
@@ -90,6 +105,7 @@ This package contains libraries and header files for developing applications tha
 %defattr(-,root,root)
 %{_bindir}/mediastream
 %{_bindir}/msaudiocmp
+%{_bindir}/pcap_playback
 %{_datadir}/images/nowebcamCIF.jpg
 
 %files -n lib%{name}
@@ -113,6 +129,9 @@ This package contains libraries and header files for developing applications tha
 #%doc ChangeLog NEWS README
 
 %changelog
+* Mon Nov 13 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 2.16.1-1mamba
+- update to 2.16.1
+
 * Sat Jun 25 2016 Automatic Build System <autodist@mambasoft.it> 2.12.1-3mamba
 - rebuilt by autoport with build requirements: libpulseaudio-devel>=9.0-1mamba