Changes - j0ke.net Open Build Service

Changes of Revision 18

[-] [+]	Changed	ffmpeg.spec
@@ -2,7 +2,7 @@ %define name ffmpeg %define version 0.4.9 -%define release 9.svn20080209 +%define release 9.svn20080302 %define major 0 %define lib libffmpeg %define libname %{lib}%{major} @@ -16,7 +16,7 @@ Summary(de): Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder URL: http://ffmpeg.sourceforge.net -Source0: ffmpeg-0.4.9-svn20080202.tar.bz2 +Source0: ffmpeg-0.4.9-svn20080302.tar.bz2 Patch0: ffmpeg_configure.diff Patch1: ffmpeg-img_convert-SWSCALE.diff @@ -42,7 +42,7 @@ %endif Requires: zlib Requires: faad2 >= 2.5 -Requires: faac >= 1.25 +Requires: libfaac0 >= 1.25 Requires: amrnb Requires: amrwb %if %suse_version >= 930 @@ -76,7 +76,7 @@ BuildRequires: zlib-devel BuildRequires: faad2 >= 2.5 BuildRequires: faad2-devel >= 2.5 -BuildRequires: faac >= 1.25 +BuildRequires: libfaac-devel >= 1.25 BuildRequires: libx264-devel BuildRequires: xvid-devel BuildRequires: libmp4v2-devel @@ -110,6 +110,7 @@ %package -n %{libname} Group: System/Libraries Summary: Shared library part of ffmpeg +Summary(de): Bibliotheken zu ffmpeg Requires: lame Requires: libogg Requires: libvorbis @@ -120,7 +121,7 @@ Requires: slang Requires: zlib Requires: faad2 >= 2.5 -Requires: faac >= 1.25 +Requires: libfaac0 >= 1.25 Requires: xvid Requires: libmp4v2 Requires: libx264-57 @@ -156,7 +157,8 @@ %package -n %{lib}-devel Group: System/Libraries -Summary: Header files and static library for the ffmpeg codec library +Summary: Header files and static library for the ffmpeg library +Summary(de): Header Dateien und statische Bibliotheken für die ffmpeg Bibliothek Requires: %{libname} = %{version}-%{release} Requires: lame Requires: libogg-devel @@ -167,7 +169,7 @@ Requires: slang-devel Requires: zlib-devel Requires: faad2-devel -Requires: faac +Requires: libfaac-devel Requires: xvid-devel Requires: libmp4v2-devel Requires: libx264-devel @@ -270,7 +272,7 @@ --disable-altivec \ %endif --enable-libx264 --enable-libamr-nb --enable-libamr-wb \ - --enable-libdc1394 --enable-nonfree + --enable-libdc1394 --enable-nonfree --enable-pthreads #--enable-libg729a %{__make} %{?jobs:-j%{jobs}} @@ -284,11 +286,17 @@ mandir=%{buildroot}%{_mandir} \ includedir=%{buildroot}%{_includedir} \ install -%{__install} -m 644 libavcodec/opt.h %{buildroot}%{_includedir}/%{name}/opt.h +%{__mkdir_p} %{buildroot}%{_includedir}/%{name} %{__install} -d %{buildroot}%{_libdir}/libavcodec %{__rm} -rf doc/.svn %{__rm} -f doc/Makefile pushd %{buildroot}%{_libdir}/libavcodec && %{__ln_s} -f ../libavcodec.a && popd +pushd %{buildroot}%{_includedir}/%{name} && %{__ln_s} -f ../libavcodec/.h . && popd +pushd %{buildroot}%{_includedir}/%{name} && %{__ln_s} -f ../libavdevice/.h . && popd +pushd %{buildroot}%{_includedir}/%{name} && %{__ln_s} -f ../libavformat/.h . && popd +pushd %{buildroot}%{_includedir}/%{name} && %{__ln_s} -f ../libavutil/.h . && popd +pushd %{buildroot}%{_includedir}/%{name} && %{__ln_s} -f ../libpostproc/.h . && popd +pushd %{buildroot}%{_includedir}/%{name} && %{__ln_s} -f ../libswscale/.h . && popd %clean [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} @@ -312,8 +320,7 @@ %files -n %{lib}-devel %defattr(-,root,root) -%{_includedir}/%{name} -%{_includedir}/postproc/postprocess.h +%{_includedir}/ %{_libdir}/.so %{_libdir}/.a %{_libdir}/libavcodec/*
	Added	ffmpeg-0.4.9-svn20080302.tar.bz2 ^