- up to 2.8.2

- BR: ortp-devel >= 0.17.0
- BR: spandsp-devel
- BR: xorg-lib-libXv-devel
- BR: sed >=4.0
- fixed sed.h path using sed
- added --enable-static - static is switch off by default
- added --disable-tests - testing cause build failure.
- find_lang macro added

Changed files:
    mediastreamer-nov4l1.atch -> 1.2
    mediastreamer.spec -> 1.8

diff --git a/mediastreamer-nov4l1.atch b/mediastreamer-nov4l1.atch
index 45994a18e88c4e4e1387a81b9ef1728bb8fe01b0..5939ddeca3f6774a50222168c6e019c079604c30 100644 (file)
--- a/mediastreamer-nov4l1.atch
+++ b/mediastreamer-nov4l1.atch
@@ -1,31 +1,9 @@
---- mediastreamer-2.7.3/src/Makefile.am.org    2011-07-26 12:36:37.063189252 +0200
-+++ mediastreamer-2.7.3/src/Makefile.am        2011-07-26 12:36:46.156753147 +0200
-@@ -117,7 +117,7 @@
- endif
- 
- if BUILD_V4L
--libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
-+libmediastreamer_la_SOURCES+= msv4l2.c
- endif
- 
- if BUILD_WIN32
---- mediastreamer-2.7.3/configure.ac.org       2011-07-26 12:36:43.506685448 +0200
-+++ mediastreamer-2.7.3/configure.ac   2011-07-26 12:36:49.163495727 +0200
-@@ -591,7 +591,7 @@
- AC_SUBST(PACKAGE_DATA_DIR)
- 
- dnl check for video4linux headers
--AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
-+AC_CHECK_HEADERS(linux/videodev2.h)
- if test "${ac_cv_header_linux_videodev_h}" = "yes" || \
-       test "${ac_cv_header_linux_videodev2_h}" = "yes" ; then
-       found_v4l=yes
---- mediastreamer-2.7.3/tests/mediastream.c~   2011-03-28 15:04:21.000000000 +0200
-+++ mediastreamer-2.7.3/tests/mediastream.c    2011-07-26 12:46:46.168577005 +0200
-@@ -178,7 +178,6 @@
-       rtp_profile_set_payload(&av_profile,112,&payload_type_ilbc);
-       rtp_profile_set_payload(&av_profile,113,&payload_type_amr);
- #ifdef VIDEO_ENABLED
+--- mediastreamer-2.8.2/tests/mediastream.c~   2012-02-17 10:16:20.000000000 +0100
++++ mediastreamer-2.8.2/tests/mediastream.c    2012-06-06 23:14:21.000000000 +0200
+@@ -430,7 +430,6 @@
+ #if defined (__ios) && defined (HAVE_X264)
+       libmsx264_init(); /*no plugin on IOS*/
+ #endif
 -      rtp_profile_set_payload(&av_profile,26,&payload_type_jpeg);
        rtp_profile_set_payload(&av_profile,98,&payload_type_h263_1998);
        rtp_profile_set_payload(&av_profile,97,&payload_type_theora);

diff --git a/mediastreamer.spec b/mediastreamer.spec
index 509d97b5e610901e4d4fd8e5605ace51771f80e0..6c1f85a7504e54fb5bf66900e81671938823ce0a 100644 (file)
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -1,11 +1,11 @@
 Summary:       Audio/Video real-time streaming
 Name:          mediastreamer
-Version:       2.7.3
+Version:       2.8.2
 Release:       1
 License:       LGPL
 Group:         Libraries
 Source0:       http://mirror.lihnidos.org/GNU/savannah/linphone/mediastreamer/%{name}-%{version}.tar.gz
-# Source0-md5: 5213307f557d86aa648f1a53a885138c
+# Source0-md5: e51ea9d5fce1396b374d10473dfbadec
 Patch0:                %{name}-nov4l1.atch
 URL:           http://www.linphone.org/eng/documentation/dev/mediastreamer2.html
 BuildRequires: SDL-devel
@@ -19,10 +19,13 @@ BuildRequires:      libgsm-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libtheora-devel
 BuildRequires: libv4l-devel
-BuildRequires: ortp-devel >= 0.16.1
+BuildRequires: ortp-devel >= 0.17.0
 BuildRequires: pkgconfig
+BuildRequires: sed >= 4.0
+BuildRequires: spandsp-devel
 BuildRequires: speex-devel
 BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXv-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,13 +52,17 @@ Static mediastreamer library.
 %prep
 %setup -q
 %patch0 -p1
+%{__sed} -i 's,gsm/gsm.h,gsm.h,g' configure.ac src/gsm.c
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+       --enable-static \
+       --disable-tests
+
 %{__make}
 
 %install
@@ -64,13 +71,18 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# Remove duplicated documentation
+rm -fr $RPM_BUILD_ROOT/usr/share/doc/mediastreamer/mediastreamer-2.8.2/html/
+
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libmediastreamer.so.*.*