Changes - j0ke.net Open Build Service

Changes of Revision 6

[-] [+]	Changed	ffmpeg.changes
@@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Sun Feb 5 20:15:18 UTC 2012 - cs@linux-administrator.com +Fri May 31 11:33:03 UTC 2013 - cs@linux-administrator.com -- re-import +- re-import
[-] [+]	Changed	ffmpeg.spec ^
@@ -11,7 +11,7 @@ %define majoravutil 51 %define libavutil libavutil %define libnameavutil %{libavutil}%{majoravutil} -%define majoravfilter 2 +%define majoravfilter 3 %define libavfilter libavfilter %define libnameavfilter %{libavfilter}%{majoravfilter} %define majorpostproc 52 @@ -26,7 +26,7 @@ %define majoravresample 0 %define libavresample libavresample %define libnameavresample %{libavresample}%{majoravresample} -%define lastrelease 0.11.2 +%define lastrelease 1.0.6 %bcond_without avfilter %bcond_without libvpx @@ -40,7 +40,7 @@ Name: ffmpeg Version: %{lastrelease} -Release: 1.9 +Release: 1.8 License: LGPL-2.0+ and some code GPL-2.0+ Summary: Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder Summary(de): Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder @@ -84,10 +84,20 @@ BuildRequires: libxvidcore-devel BuildRequires: schroedinger-devel BuildRequires: speex-devel +BuildRequires: libtwolame-devel BuildRequires: texinfo %if 0%{?suse_version} <= 1130 BuildRequires: libdc1394_control12-devel %endif +%if 0%{?suse_version} >= 1140 +BuildRequires: libass-devel +BuildRequires: libopus-devel +%else +BuildRequires: libass-devel +BuildRequires: fontconfig-devel >= 2.4.2 +BuildRequires: enca-devel +BuildRequires: fribidi-devel >= 0.19.0 +%endif %if %{with libopenjpeg} BuildRequires: libopenjpeg-devel %endif @@ -97,6 +107,7 @@ BuildRequires: libvpx-devel %endif %endif +BuildRequires: pkgconfig(vo-aacenc) Requires: %{libnameavcodec} = %{version} Requires: %{libnameavdevice} = %{version} Requires: %{libnameavformat} = %{version} @@ -385,12 +396,19 @@ --enable-libvpx \ %endif %endif +%if 0%{?suse_version} >= 1140 + --enable-libopus --enable-libass \ +%else + --enable-libass \ +%endif --enable-libmp3lame --enable-libvorbis --enable-libtheora \ --enable-libspeex --enable-libxvid --enable-libx264 \ --enable-libschroedinger --enable-libgsm \ --enable-libopencore-amrnb --enable-libopencore-amrwb \ --enable-postproc --enable-libdc1394 --enable-librtmp \ - --enable-libfreetype --enable-avresample + --enable-libfreetype --enable-avresample --enable-libtwolame \ + --enable-libvo-aacenc + make %{?_smp_mflags} V=1 %install
[-] [+]	Changed	baselibs.conf ^
@@ -1,9 +1,9 @@ libavcodec54 libavdevice54 -libavfilter2 libavformat54 libavutil51 +libavfilter3 libpostproc52 +libswscale2 libswresample0 libavresample0 -libswscale2
	Changed	ffmpeg-1.0.6.tar.bz2 ^