- added ffmpeg-0.8 patch

- unified docs bcond to "doc"

Changed files:
    gegl-ffmpeg-0.8.patch -> 1.1
    gegl.spec -> 1.20

diff --git a/gegl-ffmpeg-0.8.patch b/gegl-ffmpeg-0.8.patch
new file mode 100644 (file)
index 0000000..7d15033
--- /dev/null
+++ b/gegl-ffmpeg-0.8.patch
@@ -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;

diff --git a/gegl.spec b/gegl.spec
index 8aa1b13b61e4a5ecb6b88fd6db604520fa4a6c79..a2b5c17a51b6aa52c911f8a92dd750edf0c5a83e 100644 (file)
--- a/gegl.spec
+++ b/gegl.spec
@@ -21,6 +21,7 @@ Source0:      ftp://ftp.gtk.org/pub/gegl/0.1/%{name}-%{version}.tar.bz2
 # 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
@@ -111,6 +112,7 @@ Dokumentacja API biblioteki gegl.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -119,7 +121,7 @@ Dokumentacja API biblioteki gegl.
 %{__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 \
@@ -161,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 %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