Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	x264.spec
@@ -1,27 +1,19 @@ # norootforbuild -#!BuildIgnore: post-build-checks + +%define soname 94 +%define svn 20100425 %define binname x264 %define realname libx264 -%define soname 67 -%define svn 20090627 -%define sonamecompa 66 -%define svncompa 20090228 -%define sonamecompb 65 -%define svncompb 20090119 -%define sonamecompc 64 -%define svncompc 20081001 Name: %{binname} Summary: A free h264/avc encoder - encoder binary -Version: 0.0svn%{svn} -Release: 15 +Version: 0.%{soname}svn%{svn} +Release: 0.pm.1.1 License: GNU General Public License (GPL) -Group: Productivity/Multimedia/Video +Group: Productivity/Multimedia/Video/Editors and Convertors URL: http://developers.videolan.org/x264.html Source0: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245.tar.bz2 -Source1: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svncompa}-2245.tar.bz2 -Source2: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svncompb}-2245.tar.bz2 -Source3: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svncompc}-2245.tar.bz2 +Patch0: x264-rewrite-ffmpeg-defaults.patch BuildRoot: %{_tmppath}/build-root-%{name} Requires: %{realname}-%{soname} = %{version}-%{release} BuildRequires: nasm @@ -59,7 +51,7 @@ %package -n %{realname}-%{soname} Summary: A free h264/avc encoder - encoder binary -Group: Productivity/Multimedia/Video +Group: Productivity/Multimedia/Video/Editors and Convertors %description -n %{realname}-%{soname} x264 is a free library for encoding next-generation H264/AVC video @@ -72,51 +64,6 @@ mplayer/mencoder with H264 encoding support. -%package -n %{realname}-%{sonamecompa} -Summary: A free h264/avc encoder - encoder binary -Group: Productivity/Multimedia/Video - -%description -n %{realname}-%{sonamecompa} -x264 is a free library for encoding next-generation H264/AVC video -streams. The code is written from scratch by Laurent Aimar, Loren -Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans -Rullgard, Radek Czyz, Christian Heine (asm), Alex Izvorski (asm), and -Alex Wright. It is released under the terms of the GPL license. This -package contains a static library and a header needed for the -development with libx264. This library is needed to build -mplayer/mencoder with H264 encoding support. - - -%package -n %{realname}-%{sonamecompb} -Summary: A free h264/avc encoder - encoder binary -Group: Productivity/Multimedia/Video - -%description -n %{realname}-%{sonamecompb} -x264 is a free library for encoding next-generation H264/AVC video -streams. The code is written from scratch by Laurent Aimar, Loren -Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans -Rullgard, Radek Czyz, Christian Heine (asm), Alex Izvorski (asm), and -Alex Wright. It is released under the terms of the GPL license. This -package contains a static library and a header needed for the -development with libx264. This library is needed to build -mplayer/mencoder with H264 encoding support. - - -%package -n %{realname}-%{sonamecompc} -Summary: A free h264/avc encoder - encoder binary -Group: Productivity/Multimedia/Video - -%description -n %{realname}-%{sonamecompc} -x264 is a free library for encoding next-generation H264/AVC video -streams. The code is written from scratch by Laurent Aimar, Loren -Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans -Rullgard, Radek Czyz, Christian Heine (asm), Alex Izvorski (asm), and -Alex Wright. It is released under the terms of the GPL license. This -package contains a static library and a header needed for the -development with libx264. This library is needed to build -mplayer/mencoder with H264 encoding support. - - %package -n %{realname}-devel Summary: Libraries and include file for the x264 encoder Group: Development/Libraries/C and C++ @@ -138,90 +85,26 @@ %debug_package %prep -%setup -q -n "x264-snapshot-%{svn}-2245" -b 1 -b 2 -b 3 +%setup -q -n "x264-snapshot-%{svn}-2245" +%patch0 -p1 %build -%ifarch i586 -#no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu -%configure --enable-shared --enable-pic --disable-asm -%else -%configure --enable-shared \ -%if 0%{?sles_version} == 10 - --disable-asm \ -%endif - --enable-pic -%endif -%__make %{?jobs:-j%{jobs}} - -cd ../x264-snapshot-%{svncompa}-2245 -%ifarch i586 -#no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu -%configure --enable-shared --enable-pic --disable-asm -%else -%configure --enable-shared \ -%if 0%{?sles_version} == 10 - --disable-asm \ -%endif - --enable-pic -%endif -%__make %{?jobs:-j%{jobs}} - -cd ../x264-snapshot-%{svncompb}-2245 -%ifarch i586 -#no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu -%configure --enable-shared --enable-pic --disable-asm -%else -%configure --enable-shared \ -%if 0%{?sles_version} == 10 - --disable-asm \ -%endif - --enable-pic -%endif -%__make %{?jobs:-j%{jobs}} - -cd ../x264-snapshot-%{svncompc}-2245 -%ifarch i586 -#no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu -%configure --enable-shared --enable-pic --disable-asm -%else -%configure --enable-shared \ -%if 0%{?sles_version} == 10 - --disable-asm \ -%endif - --enable-pic -%endif +%configure --enable-shared --enable-pic %__make %{?jobs:-j%{jobs}} %install %makeinstall -%__rm -f "%{buildroot}/%{_libdir}/libx264.so" -%__ln_s libx264.so.%{soname} "%{buildroot}%{_libdir}/libx264.so" - -cd ../x264-snapshot-%{svncompa}-2245 -%{__install} -m 644 libx264.so.%{sonamecompa} %{buildroot}%{_libdir}/ - -cd ../x264-snapshot-%{svncompb}-2245 -%{__install} -m 644 libx264.so.%{sonamecompb} %{buildroot}%{_libdir}/ - -cd ../x264-snapshot-%{svncompc}-2245 -%{__install} -m 644 libx264.so.%{sonamecompc} %{buildroot}%{_libdir}/ +%{__rm} -f "%{buildroot}/%{_libdir}/libx264.so" +%{__rm} -f "%{buildroot}/%{_libdir}/libx264.a" +%{__ln_s} libx264.so.%{soname} "%{buildroot}%{_libdir}/libx264.so" %clean -%__rm -rf "%{buildroot}" +[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} %post -n %{realname}-%{soname} -p /sbin/ldconfig %postun -n %{realname}-%{soname} -p /sbin/ldconfig -%post -n %{realname}-%{sonamecompa} -p /sbin/ldconfig -%postun -n %{realname}-%{sonamecompa} -p /sbin/ldconfig - -%post -n %{realname}-%{sonamecompb} -p /sbin/ldconfig -%postun -n %{realname}-%{sonamecompb} -p /sbin/ldconfig - -%post -n %{realname}-%{sonamecompc} -p /sbin/ldconfig -%postun -n %{realname}-%{sonamecompc} -p /sbin/ldconfig - %files %defattr(-,root,root) %doc doc/*.txt @@ -231,25 +114,116 @@ %defattr(0644,root,root) %attr(0755,root,root) %{_libdir}/libx264.so.%{soname} -%files -n %{realname}-%{sonamecompa} -%defattr(0644,root,root)
[-] [+]	Added	x264-rewrite-ffmpeg-defaults.patch ^
@@ -0,0 +1,15 @@ +diff -ur x264-snapshot-20091211-2245.orig/encoder/encoder.c x264-snapshot-20091211-2245/encoder/encoder.c +--- x264-snapshot-20091211-2245.orig/encoder/encoder.c 2009-12-11 12:32:20.000000000 +0100 ++++ x264-snapshot-20091211-2245/encoder/encoder.c 2009-12-15 22:49:49.452559815 +0100 +@@ -454,9 +454,8 @@ + score += h->param.analyse.inter == 0 && h->param.analyse.i_subpel_refine == 8; + if( score >= 5 ) + { +- x264_log( h, X264_LOG_ERROR, "broken ffmpeg default settings detected\n" ); +- x264_log( h, X264_LOG_ERROR, "use an encoding preset (vpre)\n" ); +- return -1; ++ /* broken ffmpeg defaults, set to h264 defaults */ ++ x264_param_default( &h->param ); + } + } +
	Deleted	x264-snapshot-20090119-2245.tar.bz2 ^
	Deleted	x264-snapshot-20090228-2245.tar.bz2 ^
	Deleted	x264-snapshot-20090627-2245.tar.bz2 ^
	Changed	x264-snapshot-20100425-2245.tar.bz2 ^