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

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

5 files changed, 68 insertions, 18 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/Manifest b/media-libs/gegl/Manifest
index f09d1d4be6c2..a25bda5a77be 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -6,7 +6,7 @@ AUX gegl-0.0.22-locale_h.diff 282 SHA256 7cbd5937ceb20dacd5abd9bf0180422d95ae85b
 AUX gegl-0.1.8-cve-2012-4433-4757cdf7.patch 2118 SHA256 b9d0d3a304525af4524d18650a31f49b5ddfc2363ade8c07c37f728db3258f39 SHA512 0f6d9d55c94c7643ce13fe592c460987bfd5b0fef7b13ee080a6f71f904700727bd36f950c4b5fd9969f81be1d31e091218e3c3e01ed05d1fb01dd4dc4b03ed5 WHIRLPOOL 9705c5c5a745b1cb71621cb0a24c3958f2344876f10442d3dfcaa160763f78791bf2efbbe299d4119a799757371e2171f8dda55c2c2fa0c795223e002819a76c
 AUX gegl-0.2.0-cve-2012-4433-1e92e523.patch 2365 SHA256 0351770b65c4620868e575ba8e3f5d4e46b09fcf83cb52231ecdc42b2bc96bac SHA512 f27c89ac3b7742da348f75190cb1d5ad2569ab71a188b42a64e23a6254489770c701714e8de49602fdb8e8f063c3c9130abac330dceacee15603098bc1b70348 WHIRLPOOL 107f7ae3d7aa6eac22a5c127cc2dcc1387f808bbab4254cb55aebbc5f1e70be2dbf9b40d6b79c2b62fdc5edde5f2384164ec3b441c281829ba89b366131c873a
 AUX gegl-0.2.0-cve-2012-4433-4757cdf7.patch 1952 SHA256 6ecb465e6fc060417b353418c23c1d97d664666f652f2c4967d7fa6e0125fc84 SHA512 c48ed73b4a042263464819981e5f9fb0c0fc7abe8291840da9e839833a8cd548077fa99fed4b523a5bbac120d4336d2007a243baa359b40a0f0e3ff633bffa57 WHIRLPOOL 34287b2ae70f0d2f61c1aa817e767b3db6041857ce6a09a85371177ae31575d3b73d1f2efe6dccdb6776bdbf9cc518a06e7ed77662eeee85fe4658bb13815dc7
-AUX gegl-0.2.0-ffmpeg-0.11.diff 515 SHA256 1f18ad7b397bcb6bc225a5eedea8e7516d60e6c6ae49814da53ca47f0953f4fe SHA512 4d8ea87bec1f2e8b83477e95cb8b59c02ca50ddab0e308f4c2a5c26682db2d130c2db1a9f28eaa6cd73e3b48d4542986eeb0668ca5cdc6a693a80f75e3592c65 WHIRLPOOL 721dec0599bbf924f311b29461eb56b90ada158eb0f416ff4c2082367bc09043bffbfc8fda421413599064f4c7f1309a4f50118c43bacadeb485c8e890233f76
+AUX gegl-0.2.0-ffmpeg-0.11.diff 2022 SHA256 79b2385d828a6e9506f715b423bd5fd1e0ad3d62f3f02bdfe336952f1f3ca46f SHA512 b2d56e4abaae76d7995e8e454b023a5f1e4e74e3bf1f3cbe9663040031762941c3947db5de312ee516733f23e03d72d779794ab7f206e7334b14e298c0ceb493 WHIRLPOOL 2dbd04451a4372289bed0f34fdc8283b85b55bd2d75c32c9b08507a7404e5f5d4274076df300f8caac25df31361f855ca30c19df4d45683136878ebb9ef5603a
 AUX gegl-doubledestdir.diff 438 SHA256 a39da1569b510092ba345f52f33486fc246165ffd0f84d0129d29e77a26ccc2b SHA512 dcfd999de171ebc80a4016d380793ea5bf39bfb4839715acd01a26edd28dea0a81cc31e92343934a6940f5aece8b2fc476f3328ba45343a3995e79040560b131 WHIRLPOOL da248cfb52a39157d0ef010121182151a00ad684e354c8d3fd2110d64344ca80f77acea5cf0c22ee6467a63ca43d6c2efc846d74137d1a9262d56baa042bad1f
 AUX replace-imgconvert-by-swsscale.patch 2154 SHA256 d0470dd22814afffbbb2fffa7fc9488129b9cae715f26c8330eea913550885dc SHA512 e988ea43516b5664ed8e359e1d964875916540f617b810e958f0644efc98f41abaed6c6cac41c049524dd85decf8819382fb49a5ddd3df42c12747a16fed79e1 WHIRLPOOL 0f28afaf5b9bedb18b178f5df9eddbfc6219899a189e16e15bbeed5da1d1417c55988cf1b6ee5da643fe7494c53f54c2d531cf2d543c94f03869279947b73ef0
 DIST gegl-0.1.6.tar.bz2 4118465 SHA256 a166225625eebfb57fd417c88cf1fa6e29b1d308d50ac3bd9ef30bad9f3726d1 SHA512 dc1cd83d822fc52293357601172b066eca842b74b459b0efce2348a60cfd57116e37b4ee926829fb7859355a48c2fee082fc057d72f2a8cf3f7de02e11247a5f WHIRLPOOL 1cd5cdb0714f79982918a8bb9ff9b653e242d1c472fc8b43b64042cefe905f225fd9499598ef9522dd871e629b87ac62b9f158e20df9eaf16a82b512e3402f63
@@ -16,15 +16,15 @@ EBUILD gegl-0.1.6-r1.ebuild 2957 SHA256 0e86587d32b6387a9786db121602d5753a8f6e7c
 EBUILD gegl-0.1.6.ebuild 2743 SHA256 6829f93779057e10caf9a985556190e72ff64371511f952971f28c421dfa6884 SHA512 a5ee9f166ed68698c55e1a1da561536705c9c8282dcb949694eeae751dd31748972b943c2f4cab38ffde9caad12eeb60e45639e0cabffaa594e6006a87bfb3f0 WHIRLPOOL e6dbf18465bf4112dde66c20c4e87fe47634d119cc787db48390f2e6324fd76e93c3a1f6372c0ad4b7b3fd89d868ec3c5a04efb84c45f2782f782d5e79210445
 EBUILD gegl-0.1.8-r1.ebuild 3413 SHA256 c3a016c6ca5d9e889e68552c6af85b34718dbce5825949c8d4b1334aa0b3e759 SHA512 c6d7b97ec39b7fca698a5b2e2ffa4da2690a2b45630746920102e4e0e5f99ca43abb76cbb6b68786990be448bd0faf8ae984112aa881da6b2bad7316280f3346 WHIRLPOOL 01c3f567c5171dbe21eee204c587a588ee63c7cf848362d95a2c05edb4334de19fd8a80450369e16fb58d120e590bb4d574a5f83572fe3e1a6d5e8a7839ea743
 EBUILD gegl-0.1.8.ebuild 3215 SHA256 3eb7db2d937e0dc698bea674f40fc1b4bb810a8e40267e28eef7ac21a1f4b708 SHA512 34c57cb573ec2387b69128dd3a2b523f6ef8120f17e84c29a05961f88b75203b91cf53500f4e323aa41523c71cce4900486da06f3fe627ce1c87740fda046242 WHIRLPOOL c04c028d7d12c42f007ca31a8dc3ef18c99213c6a760e9802e92d42a2cfef6f47afa918eff29ae77539346b45ee223579fb6af08cca40226c7335daae6910248
-EBUILD gegl-0.2.0-r1.ebuild 3468 SHA256 b6eb774d3dbe030dc8f21ac6a3d27dd15cad594c359a053e9bba73096b9c3cce SHA512 879ac85fb55d6d3114ef30a5d5a599a44a4aad0ba2c554c9ad6bfd150f2d1c3d0d424aadbdce8b78334d9a0985e1ceb324816b36a01eece67ff130d38e46ee1b WHIRLPOOL db9cd9acef943e86df7ab126aca8b33e40ae126d09cb31c80913e3204cb71df3145019276c4b78c29c3dc0839dd6b7679ae61894974d3a2006f7471ca9fae021
-EBUILD gegl-0.2.0.ebuild 3262 SHA256 a06b1b6df11911cb9a2e8c81e6278118d20af1491534f53d69489b8d53cf29d7 SHA512 2a4410f0a349e6a1e3859209efad411922a8b96bbb26db24381068db00e501f780f4220a32951699a50faef2fe13d3aed217fbe94bcc2df4df70b50473c3911f WHIRLPOOL ddf9cb998fe164000efb13406af8b2029516e3147df112ca54df70f1686af2310349e7513e9b25789925cb50dccd9e5cf694c10809f8916c38aa385c8c5cb59d
+EBUILD gegl-0.2.0-r1.ebuild 3510 SHA256 f27060a197048acfff082d54a1733385a9b8ef44d4e479b25d9060d97d9561b0 SHA512 d4776a42d6aa36a9e329a38908582ae41ff9775904f0756ded6dc233102ad8c668d7cf1b0029aa65022a2a5ad9c89f35f07c887ae4596fce2eabb54987e0e559 WHIRLPOOL 8933efbe6c84de8a66a2abf3cb2aea2fe3d13a95e8be4a13a87a5bf23855f633bc0123c5314a4c69bbc9d08e5fdcf9b530dd7228e5b54677db5efcf130d65ecf
+EBUILD gegl-0.2.0.ebuild 3306 SHA256 5abb3122550e7d6ce38a19882448eb0585569506d6a9c111a9bddb98f54114be SHA512 d63eaf38b8d071009b561040d169071f53d00ac003cf3278d4a84dfb665ac2958d0e833702d6ba3237685347a3bafc61f1bb8ab4c316cc90002724ddd61f16e8 WHIRLPOOL 41ef434bf73b549292a98e8c2b7c3bec589820626e93a5e1943d6767398342d5446ae119c281f8d517bbbb18161caae2e2b494bacb7d3956ad9a971289fc7cba
 EBUILD gegl-9999.ebuild 3213 SHA256 64924f23669fe5a6ea8579f30eeec24df6f3f05a852ee52cea6de7aa591a3fa8 SHA512 53377b14f7d843bcf7ef15a6cbc7222927c9d362102544c6bba056fccc0815df3e221eeeafc1e2d982279b0a010c95698f7a84d4ec0f44a9b87e17aba40da221 WHIRLPOOL b1612ce56475dfd9674966e4353455e60abe90eb1c5bc2034eb682d77539f8e978c6f9b7d6109d9ae9162427513411852acb18b731ec363a933df8848f2b48f3
-MISC ChangeLog 10913 SHA256 fa4b66da9b14945a14128044aef6e2341d96ffc64d1c750c4a6200a7ea805bb5 SHA512 869132fc2da489903b30e512023ebbc2e6d15e1324f37c3e6b487e72a1b30857cac9c1d338f51d1cb0478237fb1adf45710cd52b24e2720d633c97209eff5a24 WHIRLPOOL 19cb69ac6a437ccff77a9685a600262e1ba74484a359fdaa38491cfbb743d2af385eb9195f42c25fa3325547d6391934d6f0acd6f8630ee42f8ec4764a750d68
+MISC ChangeLog 11134 SHA256 48c97af4e01376e5f549840626090bad3afedc65c5a6bedb9e48c8e431269a53 SHA512 4ae91fd60a54cad4ae7ac3ce142fa7c61bd7125569ff2300b37030059679e54c8cb9885d1737657c540074c87451c696ddc394a200db2ee18321ed90e49fd6a3 WHIRLPOOL 9ca71cccf4131462a0d530de06b168e98d29d4d8a9c5225ab3a1305d3102f1bf4ede1871621323747bfc491c6dc4de0fe834474a920dad109b606df28bce7e33
 MISC metadata.xml 546 SHA256 76148af87ef72e06a1daae6476a80a97058f4f9e5d115c0603e156aeb3fd492d SHA512 0aab6757fb995142f0407c2b9aa35fdd7d18566541ca2dd06134451482287d0fb9b3fabf3b744644edba43d7d5b5838558c622792c041144d1b160f44cf48fb4 WHIRLPOOL a073c9fe5d73789ed6ba380b1c0337948300765d1e509f0097be34f1bdbbdebf8863608dbdfa63b0430695d9f22ae0c3b2a2513cba1520a6fc4178419854bee5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEn2ssACgkQ/ejvha5XGaMWEACfTU/rqM373M6AU26wUWMa7mKF
-b+0An3RjnzshtVEXsIXN4aY+CGhwRZup
-=2oss
+iEYEAREIAAYFAlF7HRgACgkQsAvGakAaFgDOvwCfZXge2hNWmizOVT7i/B4L63yC
+GJIAoNZY5guHoZ5teINTFxvXwM5aOGXN
+=cWLJ
 -----END PGP SIGNATURE-----
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 )