packages: gegl/gegl.spec, gegl/gegl-ffmpeg-0.8.patch (NEW) - added ffmpeg-0...

[qboosh]

Author: qboosh                       Date: Tue Jun 28 18:50:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added ffmpeg-0.8 patch
- unified docs bcond to "doc"

---- Files affected:
packages/gegl:
   gegl.spec (1.19 -> 1.20) , gegl-ffmpeg-0.8.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gegl/gegl.spec
diff -u packages/gegl/gegl.spec:1.19 packages/gegl/gegl.spec:1.20
--- packages/gegl/gegl.spec:1.19	Mon Jun 27 21:22:08 2011
+++ packages/gegl/gegl.spec	Tue Jun 28 20:50:20 2011
@@ -22,6 +22,7 @@
 # Source0-md5:	d35ffe17dc042652eca3205488ece262
 Patch0:		%{name}-lua.patch
 Patch1:		%{name}-ffmpeg.patch
+Patch2:		%{name}-ffmpeg-0.8.patch
 URL:		http://www.gegl.org/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	SDL-devel
@@ -112,6 +113,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -120,7 +122,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--%{?with_docs:en}%{!?with_docs:dis}able-docs \
+	--enable-docs%{!?with_doc:=no} \
 	%{!?with_mmx:--disable-mmx} \
 	%{!?with_sse:--disable-sse} \
 	--disable-silent-rules \
@@ -162,7 +164,7 @@
 %defattr(644,root,root,755)
 %{_libdir}/libgegl-0.1.a
 
-%if %{with docs}
+%if %{with doc}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gegl
@@ -174,6 +176,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2011/06/28 18:50:20  qboosh
+- added ffmpeg-0.8 patch
+- unified docs bcond to "doc"
+
 Revision 1.19  2011/06/27 19:22:08  arekm
 - release 2
 

================================================================
Index: packages/gegl/gegl-ffmpeg-0.8.patch
diff -u /dev/null packages/gegl/gegl-ffmpeg-0.8.patch:1.1
--- /dev/null	Tue Jun 28 20:50:25 2011
+++ packages/gegl/gegl-ffmpeg-0.8.patch	Tue Jun 28 20:50:20 2011
@@ -0,0 +1,29 @@
+--- gegl-0.1.2/operations/external/ff-load.c.orig	2011-06-28 20:14:52.491649253 +0200
++++ gegl-0.1.2/operations/external/ff-load.c	2011-06-28 20:38:32.935030148 +0200
+@@ -69,7 +69,7 @@
+ {
+   switch (err)
+     {
+-    case AVERROR_NUMEXPECTED:
++    case AVERROR(EINVAL):
+       g_warning ("%s: Incorrect image filename syntax.\n"
+                  "Use '%%d' to specify the image number:\n"
+                  "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
+@@ -79,7 +79,7 @@
+     case AVERROR_INVALIDDATA:
+       g_warning ("%s: Error while parsing header\n", filename);
+       break;
+-    case AVERROR_NOFMT:
++    case AVERROR(EILSEQ):
+       g_warning ("%s: Unknown format\n", filename);
+       break;
+     default:
+@@ -278,7 +278,7 @@
+       for (i = 0; i< p->ic->nb_streams; i++)
+         {
+           AVCodecContext *c = p->ic->streams[i]->codec;
+-          if (c->codec_type == CODEC_TYPE_VIDEO)
++          if (c->codec_type == AVMEDIA_TYPE_VIDEO)
+             {
+               p->video_st = p->ic->streams[i];
+               p->video_stream = i;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gegl/gegl.spec?r1=1.19&r2=1.20&f=u