rpms/ffmpegthumbnailer/devel ffmpegthumbnailer-null.patch, NONE, 1.1 ffmpegthumbnailer.spec, 1.6, 1.7

Magnus Tuominen magnu5 at rpmfusion.org
Sun Feb 13 15:04:09 CET 2011


Author: magnu5

Update of /cvs/free/rpms/ffmpegthumbnailer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25096

Modified Files:
	ffmpegthumbnailer.spec 
Added Files:
	ffmpegthumbnailer-null.patch 
Log Message:
* Sun Feb 13 2011 Magnus Tuominen <magnus.tuominen at gmail.com> - 2.0.6-2
- patch NULL reference to make rawhide build


ffmpegthumbnailer-null.patch:
 filmstripfilter.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE ffmpegthumbnailer-null.patch ---
diff -up ffmpegthumbnailer-2.0.6/libffmpegthumbnailer/filmstripfilter.cpp.orig ffmpegthumbnailer-2.0.6/libffmpegthumbnailer/filmstripfilter.cpp
--- ffmpegthumbnailer-2.0.6/libffmpegthumbnailer/filmstripfilter.cpp.orig	2011-02-13 14:44:28.892121640 +0200
+++ ffmpegthumbnailer-2.0.6/libffmpegthumbnailer/filmstripfilter.cpp	2011-02-13 14:44:47.129129279 +0200
@@ -16,6 +16,7 @@
 
 #include "filmstripfilter.h"
 #include "filmstrip.h"
+#include <stddef.h>
 
 namespace ffmpegthumbnailer
 {


Index: ffmpegthumbnailer.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpegthumbnailer/devel/ffmpegthumbnailer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ffmpegthumbnailer.spec	4 Feb 2011 08:05:21 -0000	1.6
+++ ffmpegthumbnailer.spec	13 Feb 2011 14:04:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ffmpegthumbnailer
 Version:        2.0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lightweight video thumbnailer that can be used by file managers
 
 Group:          Applications/Multimedia
@@ -11,7 +11,9 @@
 # patch in upstream svn
 # http://code.google.com/p/ffmpegthumbnailer/source/diff?spec=svn228&r=228&format=side&path=/trunk/Makefile.am
 Patch0:         %{name}-libdl.patch
-
+# patch sent upstream
+# https://code.google.com/p/ffmpegthumbnailer/issues/detail?id=83
+Patch1:         %{name}-null.patch
 BuildRequires:  ffmpeg-devel, libpng-devel, libjpeg-devel
 BuildRequires:  chrpath, automake, autoconf
 
@@ -33,6 +35,7 @@
 chmod -x README INSTALL COPYING AUTHORS
 
 %patch0 -p 1 -b .orig
+%patch1 -p 1 -b .orig
 
 %build
 %configure --enable-png \
@@ -71,6 +74,9 @@
 %{_includedir}/libffmpegthumbnailer/*.h
 
 %changelog
+* Sun Feb 13 2011 Magnus Tuominen <magnus.tuominen at gmail.com> - 2.0.6-2
+- patch NULL reference to make rawhide build
+
 * Fri Jan 04 2011 Magnus Tuominen <magnus.tuominen at gmail.com> - 2.0.6-1
 - version bump
 - patch libdl link issue



More information about the rpmfusion-commits mailing list