media-libs/gegl: ffmpeg fixes (bug #459312)

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)

4 files changed, 61 insertions, 11 deletions

diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index 2665063e3c1d..ce22d58af0f9 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/gegl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.78 2013/02/22 20:53:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.79 2013/04/27 00:33:36 sping Exp $
+
+  27 Apr 2013; Sebastian Pipping <sping@gentoo.org> gegl-0.2.0.ebuild,
+  gegl-0.2.0-r1.ebuild, files/gegl-0.2.0-ffmpeg-0.11.diff:
+  Upgrade to libavformat v54 using upstream patch (bug #459312), thanks to
+  Andrew Karpow!
 
   22 Feb 2013; Zac Medico <zmedico@gentoo.org> gegl-0.2.0-r1.ebuild:
   Add ~arm-linux keyword.
diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff
index a33ec6f7fdcf..8e9a328524c3 100644
--- a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff
+++ b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff
@@ -1,12 +1,57 @@
-diff -Naur gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c
---- gegl-0.2.0/operations/external/ff-load.c	2012-04-01 13:17:57.000000000 +0200
-+++ gegl-0.2.0-1/operations/external/ff-load.c	2012-07-11 12:42:05.174756560 +0200
-@@ -271,7 +271,7 @@
+From 97067622352e58f86a24851dacb1f5daa0762897 Mon Sep 17 00:00:00 2001
+From: nick black <nick.black@sprezzatech.com>
+Date: Fri, 14 Dec 2012 04:11:16 +0000
+Subject: port gegl forward to libav 54
+
+---
+diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
+index 442ec5f..75d26e9 100644
+--- a/operations/external/ff-load.c
++++ b/operations/external/ff-load.c
+@@ -137,7 +137,7 @@ ff_cleanup (GeglChantO *o)
+       if (p->enc)
+         avcodec_close (p->enc);
+       if (p->ic)
+-        av_close_input_file (p->ic);
++        avformat_close_input(&p->ic);
+       if (p->lavc_frame)
+         av_free (p->lavc_frame);
+ 
+@@ -216,9 +216,9 @@ decode_frame (GeglOperation *operation,
+             {
+               do
+                 {
+-                  if (av_read_packet (p->ic, &p->pkt) < 0)
++                  if (av_read_frame (p->ic, &p->pkt) < 0)
+                     {
+-                      fprintf (stderr, "av_read_packet failed for %s\n",
++                      fprintf (stderr, "av_read_frame failed for %s\n",
+                                o->path);
+                       return -1;
+                     }
+@@ -271,12 +271,12 @@ prepare (GeglOperation *operation)
        gint err;
  
        ff_cleanup (o);
 -      err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
-+err = avformat_open_input (&p->ic, o->path, NULL, NULL);
++      err = avformat_open_input(&p->ic, o->path, NULL, 0);
        if (err < 0)
          {
            print_error (o->path, err);
+         }
+-      err = av_find_stream_info (p->ic);
++      err = avformat_find_stream_info (p->ic, NULL);
+       if (err < 0)
+         {
+           g_warning ("ff-load: error finding stream info for %s", o->path);
+@@ -312,7 +312,7 @@ prepare (GeglOperation *operation)
+       if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
+         p->enc->flags |= CODEC_FLAG_TRUNCATED;
+ 
+-      if (avcodec_open (p->enc, p->codec) < 0)
++      if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
+         {
+           g_warning ("error opening codec %s", p->enc->codec->name);
+           return;
+--
+cgit v0.9.1
diff --git a/media-libs/gegl/gegl-0.2.0-r1.ebuild b/media-libs/gegl/gegl-0.2.0-r1.ebuild
index 8f760651d73c..a9ffd0f2d3d5 100644
--- a/media-libs/gegl/gegl-0.2.0-r1.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r1.ebuild,v 1.3 2013/02/22 20:53:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r1.ebuild,v 1.4 2013/04/27 00:33:36 sping Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ RDEPEND=">=media-libs/babl-0.1.10[introspection?]
 	sys-libs/zlib
 	cairo? ( x11-libs/cairo )
 	exif? ( media-gfx/exiv2 )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( || ( >=media-video/ffmpeg-0.11 >=media-video/libav-0.8.5 ) )
 	graphviz? ( media-gfx/graphviz )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( >=media-libs/jasper-1.900.1 )
diff --git a/media-libs/gegl/gegl-0.2.0.ebuild b/media-libs/gegl/gegl-0.2.0.ebuild
index 57ca828e4eb3..71b0b11aaf92 100644
--- a/media-libs/gegl/gegl-0.2.0.ebuild
+++ b/media-libs/gegl/gegl-0.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0.ebuild,v 1.5 2012/07/13 11:25:35 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0.ebuild,v 1.6 2013/04/27 00:33:36 sping Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ RDEPEND=">=media-libs/babl-0.1.10[introspection?]
 	sys-libs/zlib
 	cairo? ( x11-libs/cairo )
 	exif? ( media-gfx/exiv2 )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( || ( >=media-video/ffmpeg-0.11 >=media-video/libav-0.8.5 ) )
 	graphviz? ( media-gfx/graphviz )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( >=media-libs/jasper-1.900.1 )