Changes of Revision 2
| [-] | Changed | ffmpeg.spec |
|
x 1 2 %define libswscale libswscale3 %define libnameswscale %{libswscale}%{majorswscale}4 %define lastrelease 0.65 -%define svnsnapshot 253206 +%define svnsnapshot 257027 8 %bcond_without avfilter9 -%bcond_without mpeg4ip10 %bcond_without libvpx11 +%bcond_with libfaac12 +%bcond_with libopenjpeg13 +14 15 Name: ffmpeg16 Version: %{lastrelease}.%{svnsnapshot}svn17 -Release: 1.pm.3.118 -License: LGPL v2 or later and some code GPL v2 or later19 +Release: 920 +License: LGPL v2 or later and some code GPL v3 or later21 Group: Productivity/Multimedia/Video/Editors and Convertors22 Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder23 Summary(de): Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder24 URL: http://ffmpeg.mplayerhq.hu25 -Source0: ffmpeg-0.6.25320svn.tar.bz226 +Source0: ffmpeg-0.6.25702svn.tar.bz227 Patch0: ffmpeg_configure.diff28 Patch1: ffmpeg_fix_return.diff29 BuildRoot: %{_tmppath}/%{name}-buildroot30 -BuildRequires: libdca-devel31 -BuildRequires: libdca032 BuildRequires: yasm33 BuildRequires: libgsm34 BuildRequires: libgsm-devel35 36 BuildRequires: slang-devel37 BuildRequires: xorg-x11-devel38 BuildRequires: zlib-devel39 +%if %{with libfaac}40 +BuildRequires: libfaac-devel >= 1.2841 +%endif42 BuildRequires: libx264-devel43 BuildRequires: libxvidcore-devel44 -%if %{with mpeg4ip}45 -BuildRequires: libmp4v2-devel46 -%endif47 BuildRequires: texinfo48 BuildRequires: libopencore-amr-devel49 -#BuildRequires: liba52-devel50 BuildRequires: libdc139451 BuildRequires: libdc1394-devel52 BuildRequires: libspeex-devel53 54 BuildRequires: liboil-devel >= 0.3.1555 BuildRequires: libdirac-devel >= 1.0.056 %endif57 -#%if %suse_version >= 110058 -#BuildRequires: libnut-devel59 -#%endif60 BuildRequires: libdc1394_control12-devel61 -#BuildRequires: G.729-devel62 -#BuildRequires: libopenjpeg-devel63 +%if %{with libopenjpeg}64 +BuildRequires: libopenjpeg-devel65 +%endif66 BuildRequires: libvdpau-devel67 %if %{with libvpx}68 %ifarch %ix86 x86_64 amd64 ia32e69 BuildRequires: libvpx-devel70 %endif71 %endif72 +Requires: %{libnameavcore} = %{version}-%{release}73 +Requires: %{libnameavcodec} = %{version}-%{release}74 +Requires: %{libnameavdevice} = %{version}-%{release}75 +Requires: %{libnameavformat} = %{version}-%{release}76 +Requires: %{libnameavfilter} = %{version}-%{release}77 +Requires: %{libnameavutil} = %{version}-%{release}78 +Requires: %{libnamepostproc} = %{version}-%{release}79 +Requires: %{libnameswscale} = %{version}-%{release}80 81 %description82 ffmpeg is a hyper fast realtime audio/video encoder, a streaming server83 84 Group: System/Libraries85 Summary: FFmpeg %{libavcore}86 Provides: %{libavcore} = %{version}-%{release}87 +Requires: %{libnameavutil} = %{version}-%{release}88 89 %description -n %{libnameavcore}90 ffmpeg %{libavcore} shared library91 92 Provides: %{libavcodec} = %{version}-%{release}93 Provides: libffmpeg0 = %{version}-%{release}94 Obsoletes: libffmpeg0 < %{version}-%{release}95 +Requires: %{libnameavcore} = %{version}-%{release}96 +Requires: %{libnameavutil} = %{version}-%{release}97 98 %description -n %{libnameavcodec}99 ffmpeg %{libavcodec} shared library100 101 Group: System/Libraries102 Summary: FFmpeg %{libavdevice}103 Provides: %{libavdevice} = %{version}-%{release}104 +Requires: %{libnameavcore} = %{version}-%{release}105 +Requires: %{libnameavcodec} = %{version}-%{release}106 +Requires: %{libnameavformat} = %{version}-%{release}107 +Requires: %{libnameavutil} = %{version}-%{release}108 109 %description -n %{libnameavdevice}110 ffmpeg %{libavdevice} shared library111 112 Group: System/Libraries113 Summary: FFmpeg %{libavformat}114 Provides: %{libavformat} = %{version}-%{release}115 +Requires: %{libnameavcodec} = %{version}-%{release}116 +Requires: %{libnameavcore} = %{version}-%{release}117 +Requires: %{libnameavutil} = %{version}-%{release}118 119 %description -n %{libnameavformat}120 ffmpeg %{libavformat} shared library121 122 Group: System/Libraries123 Summary: FFmpeg %{libavutil}124 Provides: %{libavfilter} = %{version}-%{release}125 +Requires: %{libnameavcodec} = %{version}-%{release}126 +Requires: %{libnameavcore} = %{version}-%{release}127 +Requires: %{libnameavutil} = %{version}-%{release}128 +Requires: %{libnameswscale} = %{version}-%{release}129 130 %description -n %{libnameavfilter}131 ffmpeg %{libavfilter} shared library132 133 Group: System/Libraries134 Summary: FFmpeg %{libpostproc}135 Provides: %{libpostproc} = %{version}-%{release}136 +Requires: %{libnameavutil} = %{version}-%{release}137 138 %description -n %{libnamepostproc}139 ffmpeg %{libpostproc} shared library140 141 Group: System/Libraries142 Summary: FFmpeg %{libswscale}143 Provides: %{libswscale} = %{version}-%{release}144 +Requires: %{libnameavutil} = %{version}-%{release}145 146 %description -n %{libnameswscale}147 ffmpeg %{libswscale} shared library148 149 Requires: slang-devel150 Requires: zlib-devel151 Requires: libxvidcore-devel152 -%if %{with mpeg4ip}153 -Requires: libmp4v2-devel154 +%if %{with libfaac}155 +Requires: libfaac-devel156 %endif157 Requires: libx264-devel158 Requires: libopencore-amr-devel159 -#Requires: liba52-devel160 Requires: libjack-devel161 Requires: libspeex-devel162 -Requires: libdca-devel163 Requires: libgsm-devel164 Requires: libdc1394165 Requires: libdc1394-devel166 167 Requires: liboil-devel >= 0.3.15168 Requires: libdirac-devel >= 1.0.0169 %endif170 -#%if %suse_version >= 1100171 -#Requires: libnut-devel172 -#%endif173 %if %suse_version > 1020174 Requires: libdc1394_control12-devel175 %endif176 -#Requires: libopenjpeg-devel177 +%if %{with libopenjpeg}178 +Requires: libopenjpeg-devel179 +%endif180 Requires: libvdpau-devel181 Provides: libffmpeg0-devel = %{version}-%{release}182 %ifarch x86_64 amd64 ia32e183 184 Installieren Sie libffmpeg-devel wenn Sie Anwendungen mit ffmpeg Support185 compilieren wollen.186 187 +%debug_package188 +189 +190 %prep191 %setup -q -n %{name}192 %patch0193 194 archflags=" -fPIC"195 %endif196 %ifarch %ix86197 -# archflags=" -pipe -ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"198 archflags=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"199 sed -i -e "s/-fPIC -DPIC//g" libpostproc/Makefile200 %endif201 |
||
| Deleted | ffmpeg-0.6.25320svn.tar.bz2 ^ | |
| Added | ffmpeg-0.6.25702svn.tar.bz2 ^ | |