gegl: fix compilation with ffmpeg 0.11.

Package-Manager: portage-2.1.11.6/cvs/Linux x86_64

4 files changed, 46 insertions, 18 deletions

diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index f5598339a4ac..c71479e5e1fd 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gegl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.71 2012/05/30 13:43:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.72 2012/07/13 11:25:35 hanno Exp $
+
+  13 Jul 2012; Hanno Boeck <hanno@gentoo.org> gegl-0.2.0.ebuild,
+  +files/gegl-0.2.0-ffmpeg-0.11.diff:
+  Build with ffmpeg 0.11, patch from linuxfromscratch.
 
   30 May 2012; Alexis Ballier <aballier@gentoo.org> gegl-0.2.0.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index ba356628356c..c5c1597e93cb 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,22 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 0.1.6-ffmpeg.patch 1288 RMD160 1d087764d314061d57d959e4b1fbc9fad3c6865a SHA1 d62d4987f1c0fc256f5968271fc65cce0cc4c195 SHA256 1de42f9403602c6c96bcaefb4140221607f8e3e98f2c856e208357c1722a94d2
-AUX gegl-0.0.22-locale_h.diff 282 RMD160 e3b6efcd91de6da23442c5da5ae9eaec2ee079b5 SHA1 59d008f5b9b971d44b859927dbbe4adedbbe5104 SHA256 7cbd5937ceb20dacd5abd9bf0180422d95ae85bd79e71b6d639d4d5d7f6fa28d
-AUX gegl-doubledestdir.diff 438 RMD160 0b5f29d54e57d65f9e9ce58ccaf049235a176118 SHA1 975ee3a2346c14ad67c3dd2667f54cbea316bbd4 SHA256 a39da1569b510092ba345f52f33486fc246165ffd0f84d0129d29e77a26ccc2b
-AUX replace-imgconvert-by-swsscale.patch 2154 RMD160 fcf0e6c524a3e2071e474bdb62c4ccf3df1cfa09 SHA1 b8202e020c28cd70ca7aa96421edee940abf7a9c SHA256 d0470dd22814afffbbb2fffa7fc9488129b9cae715f26c8330eea913550885dc
-DIST gegl-0.1.6.tar.bz2 4118465 RMD160 8b7bf74fe769cee289b336b5d815b370aa3a125d SHA1 27bedcfd077da7a6913b82966dbec904b22c121d SHA256 a166225625eebfb57fd417c88cf1fa6e29b1d308d50ac3bd9ef30bad9f3726d1
-DIST gegl-0.1.8.tar.bz2 5532682 RMD160 5ebd7663285a57205661868452e650ba41b9df7f SHA1 3d4d902580f5c5122b01b5188b6b5da03089ecac SHA256 106b9574b6d5fb282683794f7a7f090a1a3f4a388890e592b202827a4ca76f75
-DIST gegl-0.2.0.tar.bz2 7502040 RMD160 cc10365cff27dd42b002bf305f82de54d8c158fa SHA1 764cc66cb3c7b261b8fc18a6268a0e264a91d573 SHA256 df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426
-EBUILD gegl-0.1.6.ebuild 2743 RMD160 564534a8319d52d099c0c6a9c32d4685c308e69b SHA1 9c8eeae80e6515f9cb3302eb5ee192a9cd2d67e0 SHA256 6829f93779057e10caf9a985556190e72ff64371511f952971f28c421dfa6884
-EBUILD gegl-0.1.8.ebuild 3215 RMD160 eacc03e5a85155901428748c360b0ccf395e1e9a SHA1 b0eadef12f07a5a4d6fac666ea229ec41ab711c2 SHA256 3eb7db2d937e0dc698bea674f40fc1b4bb810a8e40267e28eef7ac21a1f4b708
-EBUILD gegl-0.2.0.ebuild 3221 RMD160 72cc78d74b79ed5f609fcd7237fde4bca3064bb4 SHA1 ed349f4e51825ecdc1caa9d4cbe672615a432d93 SHA256 1d1843b79e2ccf3d90468133b953532be6c9c8388bb42046dc06eb536ba7e428
-MISC ChangeLog 9717 RMD160 867706135f4da2d0eec006c689f424dedaa065f3 SHA1 a926cf9d61b7b3d0ae1e5e874b637b6f626552a6 SHA256 e2890f497daaa458645e1a4d0a0caa79f5c4fe9578d11440487cade10de9b620
-MISC metadata.xml 546 RMD160 4e82c297f300d5d81ad31b0d2fe22795d5524f07 SHA1 21d66fb7eac01b8b307889c60ae27d66f51a05eb SHA256 88e6627c76d098d9a94925379e0a39c2a509858c614c9513ac05e62f15cb649e
+AUX 0.1.6-ffmpeg.patch 1288 SHA256 1de42f9403602c6c96bcaefb4140221607f8e3e98f2c856e208357c1722a94d2 SHA512 7df01359c7bea588b01ede213a34950e6208a5c17b3224ea7a0c300fb522797e96a1400c31a237c9438c8adf0da9ea2f531c0bc74592d4315743c2f6e23921d8 WHIRLPOOL d305576300f9969af2095bf403ed5b00c0f59433b5ef7a972f465dc3a9fd90aebd15ce0246d6cd65a4f19d3dbbdadd6e7eba37cb286ca7303e539fe66500447b
+AUX gegl-0.0.22-locale_h.diff 282 SHA256 7cbd5937ceb20dacd5abd9bf0180422d95ae85bd79e71b6d639d4d5d7f6fa28d SHA512 cde065207208f99f4d16662c6cbddf6f5046ef722f05fa147e0648a56a3c963dcfeac2ced317e08d7ee5994727355f2ffb1766a35fc20b08b3a5d6e3743330c9 WHIRLPOOL c0ff6d406097a5693a0c004edd599888c010064b28c3ce4fb8afc6971b30f096a39f749171c3fbf7ec1b7edcbcbb3a5cb74586b2e7a826429a8a98c473c529c9
+AUX gegl-0.2.0-ffmpeg-0.11.diff 515 SHA256 1f18ad7b397bcb6bc225a5eedea8e7516d60e6c6ae49814da53ca47f0953f4fe SHA512 4d8ea87bec1f2e8b83477e95cb8b59c02ca50ddab0e308f4c2a5c26682db2d130c2db1a9f28eaa6cd73e3b48d4542986eeb0668ca5cdc6a693a80f75e3592c65 WHIRLPOOL 721dec0599bbf924f311b29461eb56b90ada158eb0f416ff4c2082367bc09043bffbfc8fda421413599064f4c7f1309a4f50118c43bacadeb485c8e890233f76
+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
+DIST gegl-0.1.8.tar.bz2 5532682 SHA256 106b9574b6d5fb282683794f7a7f090a1a3f4a388890e592b202827a4ca76f75
+DIST gegl-0.2.0.tar.bz2 7502040 SHA256 df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8 WHIRLPOOL 74e9c18b095526b1d053f0700b3c3776197a5c1066cb77adb7c83f154aae9087319f7b7f0379fb9e895a5ef3ac62ebf05e2158c1d18180bafcef41dff096c01d
+EBUILD gegl-0.1.6.ebuild 2743 SHA256 6829f93779057e10caf9a985556190e72ff64371511f952971f28c421dfa6884 SHA512 a5ee9f166ed68698c55e1a1da561536705c9c8282dcb949694eeae751dd31748972b943c2f4cab38ffde9caad12eeb60e45639e0cabffaa594e6006a87bfb3f0 WHIRLPOOL e6dbf18465bf4112dde66c20c4e87fe47634d119cc787db48390f2e6324fd76e93c3a1f6372c0ad4b7b3fd89d868ec3c5a04efb84c45f2782f782d5e79210445
+EBUILD gegl-0.1.8.ebuild 3215 SHA256 3eb7db2d937e0dc698bea674f40fc1b4bb810a8e40267e28eef7ac21a1f4b708 SHA512 34c57cb573ec2387b69128dd3a2b523f6ef8120f17e84c29a05961f88b75203b91cf53500f4e323aa41523c71cce4900486da06f3fe627ce1c87740fda046242 WHIRLPOOL c04c028d7d12c42f007ca31a8dc3ef18c99213c6a760e9802e92d42a2cfef6f47afa918eff29ae77539346b45ee223579fb6af08cca40226c7335daae6910248
+EBUILD gegl-0.2.0.ebuild 3262 SHA256 a06b1b6df11911cb9a2e8c81e6278118d20af1491534f53d69489b8d53cf29d7 SHA512 2a4410f0a349e6a1e3859209efad411922a8b96bbb26db24381068db00e501f780f4220a32951699a50faef2fe13d3aed217fbe94bcc2df4df70b50473c3911f WHIRLPOOL ddf9cb998fe164000efb13406af8b2029516e3147df112ca54df70f1686af2310349e7513e9b25789925cb50dccd9e5cf694c10809f8916c38aa385c8c5cb59d
+MISC ChangeLog 9873 SHA256 f3b4b23357b12edb75818d0b10fe559900e000995c414fa627b1b7b17d919d23 SHA512 b5f5db6401e7e2f1262da7b1bfec99e8e7ecdc93e49bde59fb930682433383c0c5aa7efa33830cbabb5ccd86fef1cbd7e94d457d791029f5aa9cd6ff4ce31355 WHIRLPOOL cd7d107971b39649367efc54c284403267776939f33ebba9736c4cd6269d7315e12ee585375a1bbf313ef0935988096b34399598af62660e9d5c6e6171d245ad
+MISC metadata.xml 546 SHA256 88e6627c76d098d9a94925379e0a39c2a509858c614c9513ac05e62f15cb649e SHA512 9b51f4ac8b1aaee4a86c34a47c77d670dcf48a68f9173669baf0847568269fe849d2c481feba5c1e629263c0115120c72f44ebfd9371c937cf47d643d37e3904 WHIRLPOOL 37aae9f8e5d643287328b0cdaaae06f2026011d2e29561d15f53e2e1fa67d27bfa5a0d2eb780b51068e025442136998ddf7ae2e3febc918076c9fe5db2c9f558
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/GJB0ACgkQvFcC4BYPU0p14gCfY1zz+qsskwwrYRMAyzNl3/8z
-/3wAnjdUDCUCO1GkFIHLZtQaF9kdM8SX
-=9LET
+iQIcBAEBCAAGBQJQAAW2AAoJEKWIAHK7tR5C5e8P/2uNHvC5ajp2jueCGTZkilNu
+wGBv+dmHFzOxxfdsPipvP5Gjdst4vagWpyvp2nJ7K2qkOJzcmd0kof0t83JWMgLD
+jisidGwVkKjI8ob99a23+mjdf9wqJ2LSs9fPi5dDBIko4TSJpvo4PS9e1P3oG/1z
+qqCfwSjfeiBpmAVJlSJkSyrKW3QSglM5hvZOrURdMYPEZ0IiIn0hYioduxZPd1pt
+PDBXb1bxIQRLoO532DDUD/ZTW/eJfYPKcmRdFXCf2+Q7OhvApHODmH6bkqataLDH
+wHcntAkorz5LAee//nU87TVWxdW3U1ghgQ8hc9XXZKFbkLhHLzFsE+bzKA9WiZwV
+bMsZIBeKpp+O7faJo/uX9nANOAwm2kN41Vo7l3J2PEySPQXvtTj8FjXLkQsnamvJ
+ccRE1Ociwnz4jvNWvI3QtgTr3RMMuiYVJDNDZbyLJvZrh6jVAcCnjtEk9nqHdj+Y
+HGgWT3WVvvDFk054wzCQELA9Ze/Jye7Mhlen81heFUCnjNKus98vntk2GRSMh0WD
+o67hi3VMd2pY8JayybfWsUv1j+plZcME+VPSYYgrL9EqorA3xWgY0TyxBPzpa0kg
+50nA1nUx51wZW/5NCIjtG670CzieXVTs+Q2vBUYc5LPnQGr9x/hdvOKpddN39PXi
+JuxSSvXJZ4J1ye1rlvle
+=A6Y2
 -----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
new file mode 100644
index 000000000000..a33ec6f7fdcf
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff
@@ -0,0 +1,12 @@
+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 @@
+       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);
+       if (err < 0)
+         {
+           print_error (o->path, err);
diff --git a/media-libs/gegl/gegl-0.2.0.ebuild b/media-libs/gegl/gegl-0.2.0.ebuild
index 675fbe9a9161..57ca828e4eb3 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
 # 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.4 2012/05/30 13:43:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0.ebuild,v 1.5 2012/07/13 11:25:35 hanno Exp $
 
 EAPI=4
 
@@ -54,6 +54,7 @@ RESTRICT="test"
 DOCS=( ChangeLog INSTALL README NEWS )
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
 	# fix OSX loadable module filename extension
 	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
 	# don't require Apple's OpenCL on versions of OSX that don't have it