Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	ffmpeg.spec
@@ -26,26 +26,26 @@ %define libswscale libswscale %define libnameswscale %{libswscale}%{majorswscale} %define lastrelease 0.6 -%define svnsnapshot 25320 +%define svnsnapshot 25702 %bcond_without avfilter -%bcond_without mpeg4ip %bcond_without libvpx +%bcond_with libfaac +%bcond_with libopenjpeg + Name: ffmpeg Version: %{lastrelease}.%{svnsnapshot}svn -Release: 1.pm.3.1 -License: LGPL v2 or later and some code GPL v2 or later +Release: 9 +License: LGPL v2 or later and some code GPL v3 or later Group: Productivity/Multimedia/Video/Editors and Convertors Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder Summary(de): Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder URL: http://ffmpeg.mplayerhq.hu -Source0: ffmpeg-0.6.25320svn.tar.bz2 +Source0: ffmpeg-0.6.25702svn.tar.bz2 Patch0: ffmpeg_configure.diff Patch1: ffmpeg_fix_return.diff BuildRoot: %{_tmppath}/%{name}-buildroot -BuildRequires: libdca-devel -BuildRequires: libdca0 BuildRequires: yasm BuildRequires: libgsm BuildRequires: libgsm-devel @@ -62,14 +62,13 @@ BuildRequires: slang-devel BuildRequires: xorg-x11-devel BuildRequires: zlib-devel +%if %{with libfaac} +BuildRequires: libfaac-devel >= 1.28 +%endif BuildRequires: libx264-devel BuildRequires: libxvidcore-devel -%if %{with mpeg4ip} -BuildRequires: libmp4v2-devel -%endif BuildRequires: texinfo BuildRequires: libopencore-amr-devel -#BuildRequires: liba52-devel BuildRequires: libdc1394 BuildRequires: libdc1394-devel BuildRequires: libspeex-devel @@ -78,18 +77,24 @@ BuildRequires: liboil-devel >= 0.3.15 BuildRequires: libdirac-devel >= 1.0.0 %endif -#%if %suse_version >= 1100 -#BuildRequires: libnut-devel -#%endif BuildRequires: libdc1394_control12-devel -#BuildRequires: G.729-devel -#BuildRequires: libopenjpeg-devel +%if %{with libopenjpeg} +BuildRequires: libopenjpeg-devel +%endif BuildRequires: libvdpau-devel %if %{with libvpx} %ifarch %ix86 x86_64 amd64 ia32e BuildRequires: libvpx-devel %endif %endif +Requires: %{libnameavcore} = %{version}-%{release} +Requires: %{libnameavcodec} = %{version}-%{release} +Requires: %{libnameavdevice} = %{version}-%{release} +Requires: %{libnameavformat} = %{version}-%{release} +Requires: %{libnameavfilter} = %{version}-%{release} +Requires: %{libnameavutil} = %{version}-%{release} +Requires: %{libnamepostproc} = %{version}-%{release} +Requires: %{libnameswscale} = %{version}-%{release} %description ffmpeg is a hyper fast realtime audio/video encoder, a streaming server @@ -112,6 +117,7 @@ Group: System/Libraries Summary: FFmpeg %{libavcore} Provides: %{libavcore} = %{version}-%{release} +Requires: %{libnameavutil} = %{version}-%{release} %description -n %{libnameavcore} ffmpeg %{libavcore} shared library @@ -126,6 +132,8 @@ Provides: %{libavcodec} = %{version}-%{release} Provides: libffmpeg0 = %{version}-%{release} Obsoletes: libffmpeg0 < %{version}-%{release} +Requires: %{libnameavcore} = %{version}-%{release} +Requires: %{libnameavutil} = %{version}-%{release} %description -n %{libnameavcodec} ffmpeg %{libavcodec} shared library @@ -138,6 +146,10 @@ Group: System/Libraries Summary: FFmpeg %{libavdevice} Provides: %{libavdevice} = %{version}-%{release} +Requires: %{libnameavcore} = %{version}-%{release} +Requires: %{libnameavcodec} = %{version}-%{release} +Requires: %{libnameavformat} = %{version}-%{release} +Requires: %{libnameavutil} = %{version}-%{release} %description -n %{libnameavdevice} ffmpeg %{libavdevice} shared library @@ -150,6 +162,9 @@ Group: System/Libraries Summary: FFmpeg %{libavformat} Provides: %{libavformat} = %{version}-%{release} +Requires: %{libnameavcodec} = %{version}-%{release} +Requires: %{libnameavcore} = %{version}-%{release} +Requires: %{libnameavutil} = %{version}-%{release} %description -n %{libnameavformat} ffmpeg %{libavformat} shared library @@ -175,6 +190,10 @@ Group: System/Libraries Summary: FFmpeg %{libavutil} Provides: %{libavfilter} = %{version}-%{release} +Requires: %{libnameavcodec} = %{version}-%{release} +Requires: %{libnameavcore} = %{version}-%{release} +Requires: %{libnameavutil} = %{version}-%{release} +Requires: %{libnameswscale} = %{version}-%{release} %description -n %{libnameavfilter} ffmpeg %{libavfilter} shared library @@ -188,6 +207,7 @@ Group: System/Libraries Summary: FFmpeg %{libpostproc} Provides: %{libpostproc} = %{version}-%{release} +Requires: %{libnameavutil} = %{version}-%{release} %description -n %{libnamepostproc} ffmpeg %{libpostproc} shared library @@ -200,6 +220,7 @@ Group: System/Libraries Summary: FFmpeg %{libswscale} Provides: %{libswscale} = %{version}-%{release} +Requires: %{libnameavutil} = %{version}-%{release} %description -n %{libnameswscale} ffmpeg %{libswscale} shared library @@ -230,15 +251,13 @@ Requires: slang-devel Requires: zlib-devel Requires: libxvidcore-devel -%if %{with mpeg4ip} -Requires: libmp4v2-devel +%if %{with libfaac} +Requires: libfaac-devel %endif Requires: libx264-devel Requires: libopencore-amr-devel -#Requires: liba52-devel Requires: libjack-devel Requires: libspeex-devel -Requires: libdca-devel Requires: libgsm-devel Requires: libdc1394 Requires: libdc1394-devel @@ -247,13 +266,12 @@ Requires: liboil-devel >= 0.3.15 Requires: libdirac-devel >= 1.0.0 %endif -#%if %suse_version >= 1100 -#Requires: libnut-devel -#%endif %if %suse_version > 1020 Requires: libdc1394_control12-devel %endif -#Requires: libopenjpeg-devel +%if %{with libopenjpeg} +Requires: libopenjpeg-devel +%endif Requires: libvdpau-devel Provides: libffmpeg0-devel = %{version}-%{release} %ifarch x86_64 amd64 ia32e @@ -297,6 +315,9 @@ Installieren Sie libffmpeg-devel wenn Sie Anwendungen mit ffmpeg Support compilieren wollen. +%debug_package + + %prep %setup -q -n %{name} %patch0 @@ -312,7 +333,6 @@ archflags=" -fPIC" %endif %ifarch %ix86 -# archflags=" -pipe -ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" archflags=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" sed -i -e "s/-fPIC -DPIC//g" libpostproc/Makefile %endif
	Deleted	ffmpeg-0.6.25320svn.tar.bz2 ^
	Added	ffmpeg-0.6.25702svn.tar.bz2 ^