Changes - j0ke.net Open Build Service

Changes of Revision 14

[-] [+]	Changed	ffmpeg.spec
@@ -1,19 +1,17 @@ -# norootforbuild - -%define lib libffmpeg -%define majoravcodec 53 +%define lib libffmpeg +%define majoravcodec 54 %define libavcodec libavcodec %define libnameavcodec %{libavcodec}%{majoravcodec} -%define majoravdevice 53 +%define majoravdevice 54 %define libavdevice libavdevice %define libnameavdevice %{libavdevice}%{majoravdevice} -%define majoravformat 53 +%define majoravformat 54 %define libavformat libavformat %define libnameavformat %{libavformat}%{majoravformat} %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 @@ -25,61 +23,76 @@ %define majorswresample 0 %define libswresample libswresample %define libnameswresample %{libswresample}%{majorswresample} -%define lastrelease 0.10 +%define majoravresample 0 +%define libavresample libavresample +%define libnameavresample %{libavresample}%{majoravresample} +%define lastrelease 1.0.1 %bcond_without avfilter %bcond_without libvpx -%bcond_with libfaac -%bcond_with libopenjpeg - +%bcond_with libfaac +%bcond_with libopenjpeg +%if 0%{?suse_version} >= 1140 +%bcond_without pulse +%else +%bcond_with pulse +%endif Name: ffmpeg Version: %{lastrelease} -Release: 3 -License: LGPL v2 or later and some code GPL v2 or later -Group: Productivity/Multimedia/Video/Editors and Convertors +Release: 3.1 +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 -URL: http://www.ffmpeg.org +Url: http://www.ffmpeg.org +Group: Productivity/Multimedia/Video/Editors and Convertors Source0: ffmpeg-%{version}.tar.bz2 Source1: ffmpeg.rpmlintrc -BuildRoot: %{_tmppath}/%{name}-buildroot -Provides: libav = %{version}-%{release} -Obsoletes: libav < %{version}-%{release} -BuildRequires: yasm +Source2: baselibs.conf +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: libav = %{version} +Obsoletes: libav < %{version} +BuildRequires: SDL-devel +BuildRequires: alsa-devel +BuildRequires: freetype2-devel +BuildRequires: imlib2-devel BuildRequires: libgsm BuildRequires: libgsm-devel -BuildRequires: imlib2-devel +BuildRequires: libjack-devel BuildRequires: libmp3lame-devel BuildRequires: libogg-devel -BuildRequires: libvorbis-devel BuildRequires: libtheora-devel >= 1.1 +BuildRequires: libvorbis-devel BuildRequires: ncurses-devel -BuildRequires: libjack-devel -BuildRequires: alsa-devel -BuildRequires: freetype2-devel -BuildRequires: SDL-devel BuildRequires: slang-devel BuildRequires: xorg-x11-devel +BuildRequires: yasm BuildRequires: zlib-devel +%if %{with pulse} +BuildRequires: libpulse-devel +%endif %if %{with libfaac} BuildRequires: libfaac-devel >= 1.28 %endif -BuildRequires: libx264-devel -BuildRequires: libxvidcore-devel -BuildRequires: texinfo -BuildRequires: libopencore-amr-devel BuildRequires: libdc1394 BuildRequires: libdc1394-devel -BuildRequires: speex-devel -BuildRequires: schroedinger-devel BuildRequires: liboil-devel >= 0.3.15 -BuildRequires: dirac-devel >= 1.0.0 +BuildRequires: libopencore-amr-devel BuildRequires: librtmp-devel BuildRequires: libva-devel +BuildRequires: libx264-devel +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: libopus-devel +BuildRequires: libass-devel +%endif %if %{with libopenjpeg} BuildRequires: libopenjpeg-devel %endif @@ -89,12 +102,14 @@ BuildRequires: libvpx-devel %endif %endif -Requires: %{libnameavcodec} = %{version}-%{release} -Requires: %{libnameavdevice} = %{version}-%{release} -Requires: %{libnameavformat} = %{version}-%{release} -Requires: %{libnameavutil} = %{version}-%{release} -Requires: %{libnamepostproc} = %{version}-%{release} -Requires: %{libnameswscale} = %{version}-%{release} +Requires: %{libnameavcodec} = %{version} +Requires: %{libnameavdevice} = %{version} +Requires: %{libnameavformat} = %{version} +Requires: %{libnameavutil} = %{version} +Requires: %{libnamepostproc} = %{version} +Requires: %{libnameswscale} = %{version} +Requires: %{libnameswresample} = %{version} +Requires: %{libnameavresample} = %{version} %description ffmpeg is a hyper fast realtime audio/video encoder, a streaming server @@ -112,16 +127,11 @@ Dateiformate basierend auf einer DCT/motion compensation konvertiern. Sound wird in einen MPEG audio layer 2 oder AC3 Stream geschrieben. - %package -n %{libnameavcodec} Group: System/Libraries Summary: FFmpeg %{libavcodec} -Provides: %{libavcodec} = %{version}-%{release} -Provides: libffmpeg = %{version}-%{release} -Obsoletes: libffmpeg < %{version}-%{release} -Provides: libffmpeg0 = %{version}-%{release} -Obsoletes: libffmpeg0 < %{version}-%{release} -Requires: %{libnameavutil} = %{version}-%{release} +Provides: %{libavcodec} = %{version} +Requires: %{libnameavutil} = %{version} %description -n %{libnameavcodec} ffmpeg %{libavcodec} shared library @@ -129,14 +139,14 @@ %description -n %{libnameavcodec} -l de ffmpeg %{libavcodec} Bibliothek - %package -n %{libnameavdevice} Group: System/Libraries Summary: FFmpeg %{libavdevice} -Provides: %{libavdevice} = %{version}-%{release} -Requires: %{libnameavcodec} = %{version}-%{release} -Requires: %{libnameavformat} = %{version}-%{release} -Requires: %{libnameavutil} = %{version}-%{release} +Provides: %{libavdevice} = %{version} +Requires: %{libnameavcodec} = %{version} +Requires: %{libnameavformat} = %{version} +Requires: %{libnameavutil} = %{version} +Requires: %{libnameswresample} = %{version} %description -n %{libnameavdevice} ffmpeg %{libavdevice} shared library @@ -144,15 +154,14 @@ %description -n %{libnameavdevice} -l de ffmpeg %{libavdevice} Bibliothek - %package -n %{libnameavformat} Group: System/Libraries Summary: FFmpeg %{libavformat} -Provides: %{libavformat} = %{version}-%{release} -Requires: %{libnameavcodec} = %{version}-%{release} -Requires: %{libnameavutil} = %{version}-%{release} +Provides: %{libavformat} = %{version} +Requires: %{libnameavcodec} = %{version}
[-] [+]	Added	baselibs.conf ^
@@ -0,0 +1,9 @@ +libavcodec54 +libavdevice54 +libavformat54 +libavutil51 +libavfilter3 +libpostproc52 +libswscale2 +libswresample0 +libavresample0
	Changed	ffmpeg-1.0.1.tar.bz2 ^