Author: blekot Date: Wed Jun 6 23:28:01 2012 GMT Module: packages Tag: HEAD ---- Log message: - 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
---- Files affected: packages/mediastreamer: mediastreamer-nov4l1.atch (1.1 -> 1.2) , mediastreamer.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: packages/mediastreamer/mediastreamer-nov4l1.atch diff -u packages/mediastreamer/mediastreamer-nov4l1.atch:1.1 packages/mediastreamer/mediastreamer-nov4l1.atch:1.2 --- packages/mediastreamer/mediastreamer-nov4l1.atch:1.1 Tue Jul 26 13:16:02 2011 +++ packages/mediastreamer/mediastreamer-nov4l1.atch Thu Jun 7 01:27:56 2012 @@ -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); ================================================================ Index: packages/mediastreamer/mediastreamer.spec diff -u packages/mediastreamer/mediastreamer.spec:1.7 packages/mediastreamer/mediastreamer.spec:1.8 --- packages/mediastreamer/mediastreamer.spec:1.7 Tue Jul 26 13:15:55 2011 +++ packages/mediastreamer/mediastreamer.spec Thu Jun 7 01:27:56 2012 @@ -1,12 +1,12 @@ # $Revision$, $Date$ 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 @@ -20,10 +20,13 @@ 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 @@ -50,13 +53,17 @@ %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 @@ -65,13 +72,18 @@ %{__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.*.* @@ -95,6 +107,17 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2012/06/06 23:27:56 blekot +- 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 + Revision 1.7 2011/07/26 11:15:55 arekm - up to 2.7.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/mediastreamer/mediastreamer-nov4l1.atch?r1=1.1&r2=1.2 http://cvs.pld-linux.org/packages/mediastreamer/mediastreamer.spec?r1=1.7&r2=1.8 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit