Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	x264.spec
@@ -1,13 +1,13 @@ # norootforbuild -%define soname 106 -%define svn 20101002 +%define soname 114 +%define svn 20110225 %define realname libx264 Name: x264 Summary: A free h264/avc encoder - encoder binary Version: 0.%{soname}svn%{svn} -Release: 1.pm.1.1 +Release: 3 License: GPLv2+ Group: Productivity/Multimedia/Video/Editors and Convertors URL: http://developers.videolan.org/x264.html @@ -82,7 +82,7 @@ development with libx264. This library is needed to build mplayer/mencoder with H264 encoding support. -%debug_package + %prep %setup -q -n "x264-snapshot-%{svn}-2245" @@ -119,88 +119,7 @@ %defattr(0644,root,root) %{_libdir}/pkgconfig/x264.pc %{_includedir}/x264.h +%{_includedir}/x264_config.h %{_libdir}/libx264.so %changelog -* Sun Oct 3 2010 Manfred.Tremmel@iiv.de -- update to snapshot 20101002 -* Tue Jun 29 2010 ludwig.nussel@gmx.de -- require pkg-config -- link binary against shared library -* Wed Jun 16 2010 Manfred.Tremmel@iiv.de -- update to snapshot 20100615 -* Tue May 18 2010 Manfred.Tremmel@iiv.de -- update to snapshot 20100517 -* Mon Apr 26 2010 Manfred.Tremmel@iiv.de -- update to snapshot 20100425 - now able to create Blue Ray compatible h.264 streams -* Sat Apr 3 2010 Manfred.Tremmel@iiv.de -- update to snapshot 20100402 -* Sun Feb 28 2010 Manfred.Tremmel@iiv.de -- update to snapshot 20100227 -* Wed Feb 17 2010 Manfred.Tremmel@iiv.de -- update to snapshot 20100216 -* Sat Feb 6 2010 Manfred.Tremmel@iiv.de -- update to snapshot 20100205 -* Wed Jan 27 2010 Manfred.Tremmel@iiv.de -- rebuild because of no submit with the last build -* Sat Jan 23 2010 Manfred.Tremmel@iiv.de -- update to snapshot 20100122 -* Sat Jan 2 2010 Manfred.Tremmel@iiv.de -- update to svn 20100101 -* Tue Dec 15 2009 Manfred.Tremmel@iiv.de -- added a patch to fix broken ffmpeg defaults instead of aborting -* Fri Dec 11 2009 Manfred.Tremmel@iiv.de -- update to svn 20091211 -* Mon Nov 23 2009 Manfred.Tremmel@iiv.de -- update to svn 20091123 -* Tue Aug 25 2009 Manfred.Tremmel@iiv.de -- updated to snapshot 20090624 -* Sat Jun 27 2009 Manfred.Tremmel@iiv.de -- updated to snapshot 20090627 -* Sun May 10 2009 Manfred.Tremmel@iiv.de -- updated to snapshot 20090510 -* Tue Mar 10 2009 Manfred.Tremmel@iiv.de -- updated to snapshot 20090310 -* Sat Feb 7 2009 Manfred.Tremmel@iiv.de -- updated to snapshot 20090206 -* Thu Nov 6 2008 Manfred.Tremmel@iiv.de -- updated to snapshot 20081105 -* Sat Oct 4 2008 Manfred.Tremmel@iiv.de -- updated to snapshot 20081004 -* Wed Sep 17 2008 Manfred.Tremmel@iiv.de -- updated to snapshot 20080917 -* Thu Aug 14 2008 Manfred.Tremmel@iiv.de -- updated to snapshot 20080814 -- recompile with new yasm version -* Sat Aug 9 2008 Manfred.Tremmel@iiv.de -- updated to snapshot 20080809 -* Tue Jun 17 2008 Manfred.Tremmel@iiv.de -- updated to snapshot 20080617 -- also included snapshot 20071225 lib for compatibility reasons -* Wed Apr 30 2008 guru@unixtech.be -- fixed file permissions, thanks to Christian Morales Vega <cmorve69@yahoo.es> -* Mon Dec 31 2007 guru@unixtech.be -- made Requires in main package require the exact version-release -- fixed License tag according to 10.3 packaging policies -- added Provides/Obsoletes for proper upgrading of x264=>libx264-devel -* Wed Dec 26 2007 leon@links2linux.de -- updated to snapshot 20071225 -- changed the spec according to the new library policy, thanks Detlef -- changed the group according to SPC guidelines -* Mon Nov 6 2006 detlef@links2linux.de -- update to snapshot-20061031-2245 -* Wed Nov 1 2006 leon@links2linux.de -- new release -* Wed Apr 26 2006 leon@links2linux.de -- updated to the newest tarball (to fix PPC compiling) -- match the new library revision (libx264.so.46) -* Tue Apr 18 2006 leon@links2linux.de -- updated to the newest tarball -- removed the syntax patch since it has been merged -- remove yasm from BuildRequires on x86 -* Wed Mar 22 2006 henne@links2linux.de -- introduce a build section <:) -- full url for source -* Sat Mar 18 2006 leon@links2linux.de -- Initial release for packman.
[-] [+]	Changed	x264-rewrite-ffmpeg-defaults.patch ^
@@ -1,12 +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 @@ +diff -ur x264-snapshot-20110225-2245.orig/encoder/encoder.c x264-snapshot-20110225-2245/encoder/encoder.c +--- x264-snapshot-20110225-2245.orig/encoder/encoder.c 2011-02-25 22:45:04.000000000 +0100 ++++ x264-snapshot-20110225-2245/encoder/encoder.c 2011-02-26 14:24:02.144281162 +0100 +@@ -487,12 +487,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" ); +- x264_log( h, X264_LOG_ERROR, "use an encoding preset (e.g. -vpre medium)\n" ); +- x264_log( h, X264_LOG_ERROR, "preset usage: -vpre <speed> -vpre <profile>\n" ); +- x264_log( h, X264_LOG_ERROR, "speed presets are listed in x264 --help\n" ); +- x264_log( h, X264_LOG_ERROR, "profile is optional; x264 defaults to high\n" ); - return -1; + /* broken ffmpeg defaults, set to h264 defaults */ + x264_param_default( &h->param );
[-] [+]	Changed	x264-use-shared-library.patch ^
@@ -1,7 +1,7 @@ -diff -ur x264-snapshot-20101002-2245.orig/Makefile x264-snapshot-20101002-2245/Makefile ---- x264-snapshot-20101002-2245.orig/Makefile 2010-10-02 22:45:07.000000000 +0200 -+++ x264-snapshot-20101002-2245/Makefile 2010-10-03 13:42:33.072481891 +0200 -@@ -134,9 +134,10 @@ +diff -ur x264-snapshot-20110225-2245.orig/Makefile x264-snapshot-20110225-2245/Makefile +--- x264-snapshot-20110225-2245.orig/Makefile 2011-02-25 22:45:04.000000000 +0100 ++++ x264-snapshot-20110225-2245/Makefile 2011-02-26 14:25:51.568295374 +0100 +@@ -145,9 +145,10 @@ $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO) $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) @@ -14,10 +14,10 @@ checkasm: tools/checkasm.o libx264.a $(CC) -o $@ $+ $(LDFLAGS) -@@ -207,10 +208,12 @@ - install -d $(DESTDIR)$(libdir) +@@ -219,10 +220,12 @@ install -d $(DESTDIR)$(libdir)/pkgconfig install -m 644 x264.h $(DESTDIR)$(includedir) + install -m 644 x264_config.h $(DESTDIR)$(includedir) - install -m 644 libx264.a $(DESTDIR)$(libdir) install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig install x264$(EXE) $(DESTDIR)$(bindir)
	Changed	x264-snapshot-20110225-2245.tar.bz2 ^