Hello community, here is the log from the commit of package mediastreamer2 for openSUSE:Factory checked in at 2013-06-06 13:06:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mediastreamer2 (Old) and /work/SRC/openSUSE:Factory/.mediastreamer2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mediastreamer2" Changes: -------- --- /work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer2.changes 2012-10-26 00:23:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mediastreamer2.new/mediastreamer2.changes 2013-06-06 13:06:05.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jun 3 21:53:45 UTC 2013 - [email protected] + +- Add 0001-Fixes-for-new-versions-of-ffmpeg.patch: fix for new + ffmpeg API. +- Spec cleanup. +- Call ldconfig for shared library. +- Enable conditional build for "video" configure option. + +------------------------------------------------------------------- New: ---- 0001-Fixes-for-new-versions-of-ffmpeg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mediastreamer2.spec ++++++ --- /var/tmp/diff_new_pack.rvHqJ8/_old 2013-06-06 13:06:05.000000000 +0200 +++ /var/tmp/diff_new_pack.rvHqJ8/_new 2013-06-06 13:06:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mediastreamer2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,30 +15,37 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -Summary: Audio/Video real-time streaming -Name: mediastreamer2 + %define lname libmediastreamer1 + +Name: mediastreamer2 Version: 2.8.2 Release: 0 +Summary: Audio/Video real-time streaming License: GPL-2.0+ Group: Productivity/Telephony/Utilities -URL: http://www.mediastreamer2.com +Url: http://www.mediastreamer2.com Source0: mediastreamer-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-UPSTREAM Fix new ffmpeg API change Yann Diorcet <[email protected]> +Patch0: 0001-Fixes-for-new-versions-of-ffmpeg.patch BuildRequires: gcc-c++ -BuildRequires: pkg-config -BuildRequires: libtool BuildRequires: intltool -BuildRequires: pkgconfig(speex) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xv) -BuildRequires: pkgconfig(theora) -BuildRequires: spandsp-devel BuildRequires: libgsm-devel -BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(libpulse) BuildRequires: libortp-devel +BuildRequires: libtool BuildRequires: libv4l-devel +BuildRequires: pkg-config +BuildRequires: spandsp-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(speex) +BuildRequires: pkgconfig(theora) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xv) +%if 0%{?packman_bs} +BuildRequires: libffmpeg-devel +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Mediastreamer2 is a GPL licensed library to make audio and video @@ -57,7 +64,7 @@ %package devel Summary: Headers, libraries and docs for the mediastreamer2 library Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %lname = %{version} %description devel Mediastreamer2 is a GPL licensed library to make audio and video @@ -69,21 +76,28 @@ %prep %setup -q -n mediastreamer-%{version} +%patch0 -p1 %build -%configure --enable-shared --disable-video -CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS -CXXFLAGS="${CXXFLAGS:-%optflags}"; export CXXFLAGS +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +%configure \ + --enable-shared \ +%if 0%{?packman_bs} + --enable-video +%else + --disable-video +%endif make %{?_smp_mflags} %install %makeinstall %find_lang mediastreamer -rm -f "%buildroot/%_libdir"/*.la +rm -f "%{buildroot}/%{_libdir}"/*.la -%post -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files -f mediastreamer.lang %defattr(-,root,root,-) @@ -94,7 +108,7 @@ %files -n %lname %defattr(-,root,root) -%_libdir/libmediastreamer.so.1* +%{_libdir}/libmediastreamer.so.1* %files devel %defattr(-,root,root,-) ++++++ 0001-Fixes-for-new-versions-of-ffmpeg.patch ++++++ >From f586917ea4d66f9ba8910f0967a8830e54d50784 Mon Sep 17 00:00:00 2001 From: Yann Diorcet <[email protected]> Date: Tue, 5 Jun 2012 11:07:48 +0200 Subject: [PATCH] Fixes for new versions of ffmpeg --- src/h264dec.c | 2 ++ src/videoenc.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/h264dec.c b/src/h264dec.c index c4a84ee..5229b5e 100644 --- a/src/h264dec.c +++ b/src/h264dec.c @@ -45,7 +45,9 @@ typedef struct _DecData{ static void ffmpeg_init(){ static bool_t done=FALSE; if (!done){ +#ifdef FF_API_AVCODEC_INIT avcodec_init(); +#endif avcodec_register_all(); done=TRUE; } diff --git a/src/videoenc.c b/src/videoenc.c index 21d016f..fb35760 100644 --- a/src/videoenc.c +++ b/src/videoenc.c @@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static bool_t avcodec_initialized=FALSE; +#ifndef FF_I_TYPE +#define FF_I_TYPE AV_PICTURE_TYPE_I +#endif + #ifdef ENABLE_LOG_FFMPEG void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) @@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) void ms_ffmpeg_check_init(){ if(!avcodec_initialized){ +#ifdef FF_API_AVCODEC_INIT avcodec_init(); +#endif avcodec_register_all(); avcodec_initialized=TRUE; #ifdef ENABLE_LOG_FFMPEG @@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){ if (s->profile==0){ s->codec=CODEC_ID_H263; }else{ + /* c->flags|=CODEC_FLAG_H263P_UMV; c->flags|=CODEC_FLAG_AC_PRED; c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; - /* c->flags|=CODEC_FLAG_OBMC; c->flags|=CODEC_FLAG_AC_PRED; */ -- 1.8.1.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
