Update the gegl ffmpeg patch to be more correct.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

1 files changed, 33 insertions, 30 deletions

diff --git a/media-libs/gegl/files/0.1.6-ffmpeg.patch b/media-libs/gegl/files/0.1.6-ffmpeg.patch
index 98169c721b0c..66730f286dc9 100644
--- a/media-libs/gegl/files/0.1.6-ffmpeg.patch
+++ b/media-libs/gegl/files/0.1.6-ffmpeg.patch
@@ -1,30 +1,33 @@
-diff -urN gegl-0.1.6.old/operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c
---- gegl-0.1.6.old/operations/external/ff-load.c	2011-05-01 18:10:42.000000000 +0200
-+++ gegl-0.1.6/operations/external/ff-load.c	2011-05-01 18:15:58.000000000 +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 -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c

+--- gegl-0.1.6.old//operations/external/ff-load.c   2011-01-24 19:03:30.000000000 -0300

++++ gegl-0.1.6/operations/external/ff-load.c    2011-05-04 09:59:48.910379742 -0300

+@@ -69,17 +69,17 @@

+ {

+   switch (err)

+     {

+-    case AVERROR_NUMEXPECTED:

++    case AVERROR(EDOM):

+       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"

+                  "  for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n",

+                  filename);

+       break;

+-    case AVERROR_INVALIDDATA:

++    case AVERROR(EINVAL):

+       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;