- update matroska deps

[packages/mediastreamer.git] / mediastreamer.spec

diff --git a/mediastreamer.spec b/mediastreamer.spec
index 4fdee6109f5ebb110262b21159ff37258e3c542b..fb8b3d80c3cec1de48f1183e0fe57ef9f7bc02a3 100644 (file)
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -1,6 +1,3 @@
-# TODO:
-# - switch to mbledtls when 2.x is supported (mbed_ssl_init instead of ssl_init)
-# - dtls (polarssl/mbedtls >= 1.4 with DTLS-SRTP support, not released yet)
 #
 # Conditional build:
 %bcond_without bcg729          # support for G279AnnexB in RTC3389 implementation of Comfort Noise Payload
@@ -20,13 +17,14 @@ Summary:    Audio/Video real-time streaming
 Summary(pl.UTF-8):     Przesyłanie strumieni audio/video w czasie rzeczywistym 
 Name:          mediastreamer
 Version:       2.16.1
-Release:       4
+Release:       10
 License:       GPL v2+
 Group:         Libraries
-Source0:       https://linphone.org/releases/sources//mediastreamer/%{name}-%{version}.tar.gz
+Source0:       https://linphone.org/releases/sources/mediastreamer/%{name}-%{version}.tar.gz
 # Source0-md5: 15b8b129a922180855d04d58cdd08d43
 Patch0:                build.patch
 Patch1:                libsrtp2.patch
+Patch2:                libupnp-1.14.patch
 URL:           http://www.linphone.org/technical-corner/mediastreamer2/overview
 %{?with_opengl:BuildRequires:  OpenGL-GLX-devel}
 BuildRequires: SDL-devel >= 1.2.0
@@ -35,28 +33,25 @@ BuildRequires:      SDL-devel >= 1.2.0
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.9
 %{?with_bcg729:BuildRequires:  bcg729-devel >= 1.0}
-BuildRequires: bctoolbox-devel
+BuildRequires: bctoolbox-devel >= 0.4.0
 %{?with_zrtp:BuildRequires:    bzrtp-devel >= 1.0.6}
 BuildRequires: doxygen
 # libavcodec >= 51.0.0, libswscale >= 0.7.0
 BuildRequires: ffmpeg-devel
 BuildRequires: gettext-tools
 %{?with_opengl:BuildRequires:  glew-devel >= 1.5}
-BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: intltool >= 0.40
 BuildRequires: libgsm-devel
 %{?with_pcap:BuildRequires:    libpcap-devel}
 BuildRequires: libtheora-devel >= 1.0-0.alpha7
 BuildRequires: libtool >= 2:2
-BuildRequires: libupnp-devel >= 1.6
-BuildRequires: libupnp-devel < 1.7
+BuildRequires: libupnp-devel
 BuildRequires: libv4l-devel
 BuildRequires: libvpx-devel >= 0.9.6
-%{?with_matroska:BuildRequires:        matroska-foundation-devel}
+%{?with_matroska:BuildRequires:        bcmatroska2-devel}
 BuildRequires: opus-devel >= 0.9.0
 BuildRequires: ortp-devel >= 1.0.0
 BuildRequires: pkgconfig
-BuildRequires: polarssl-devel
 %{?with_portaudio:BuildRequires:       portaudio-devel}
 %{?with_pulseaudio:BuildRequires:      pulseaudio-devel >= 0.9.21}
 BuildRequires: sed >= 4.0
@@ -68,10 +63,11 @@ BuildRequires:      xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXv-devel
 BuildRequires: xxd
 %{?with_bcg729:Requires:       bcg729 >= 1.0}
+Requires:      bctoolbox >= 0.4.0
 %{?with_zrtp:Requires: bzrtp >= 1.0.6}
 %{?with_opengl:Requires:       glew >= 1.5}
 Requires:      libtheora >= 1.0-0.alpha7
-Requires:      libupnp >= 1.6
+Requires:      libupnp
 Requires:      libvpx >= 0.9.6
 Requires:      opus >= 0.9.0
 Requires:      ortp >= 1.0.0
@@ -99,18 +95,17 @@ Requires:   %{name} = %{version}-%{release}
 %{?with_opengl:Requires:       OpenGL-devel}
 %{?with_alsa:Requires: alsa-lib-devel}
 %{?with_bcg729:Requires:       bcg729-devel >= 1.0}
+Requires:      bctoolbox-devel >= 0.4.0
 %{?with_zrtp:Requires: bzrtp-devel >= 1.0.6}
 Requires:      ffmpeg-devel
 %{?with_opengl:Requires:       glew-devel >= 1.5}
 Requires:      libtheora-devel >= 1.0-0.alpha7
-Requires:      libupnp-devel >= 1.6
-Requires:      libupnp-devel < 1.7
+Requires:      libupnp-devel
 Requires:      libv4l-devel
 Requires:      libvpx-devel >= 0.9.6
-%{?with_matroska:Requires:     matroska-foundation-devel}
+%{?with_matroska:Requires:     bcmatroska2-devel}
 Requires:      opus-devel >= 0.9.0
 Requires:      ortp-devel >= 1.0.0
-Requires:      polarssl-devel
 %{?with_portaudio:Requires:    portaudio-devel}
 %{?with_pulseaudio:Requires:   pulseaudio-devel >= 0.9.21}
 Requires:      spandsp-devel >= 0.0.6
@@ -143,6 +138,7 @@ Statyczne biblioteki mediastreamer.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 [ ! -e gitversion.h ] && echo '#define MS2_GIT_VERSION "%{version}"' > src/gitversion.h
 
@@ -156,13 +152,14 @@ Statyczne biblioteki mediastreamer.
 %{__automake}
 %configure \
        --disable-strict \
+       --disable-tests \
        --enable-alsa%{!?with_alsa:=no} \
        %{?with_arts:--enable-artsc} \
        %{?with_bcg729:--enable-bcg729} \
        --enable-external-ortp \
        %{!?with_opengl:--disable-glx} \
        %{!?with_matroska:--disable-matroska} \
-       %{?with_pcap:--enable-pcap} \
+       %{!?with_pcap:--disable-pcap} \
        %{?with_portaudio:--enable-portaudio} \
        --enable-pulseaudio%{!?with_pulseaudio:=no} \
        --disable-silent-rules \
@@ -205,7 +202,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libmediastreamer_voip.so.10
 %dir %{_libdir}/mediastreamer
 %dir %{_libdir}/mediastreamer/plugins
-%{_pixmapsdir}/*.jpg
+%{_pixmapsdir}/nowebcamCIF.jpg
 
 %files devel
 %defattr(644,root,root,755)