gegl: remove deprecated usage of img_convert-function from ffmpeg

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 79 insertions, 4 deletions

diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index c203676a2f7c..f7e11c19b018 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gegl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.24 2009/04/06 14:21:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.25 2009/05/26 23:42:35 hanno Exp $
+
+  26 May 2009; Hanno Boeck <hanno@gentoo.org> gegl-0.0.22.ebuild,
+  +files/replace-imgconvert-by-swsscale.patch:
+  Don't use deprecated img_convert function, patch from Pardus.
 
   06 Apr 2009; Brent Baude <ranger@gentoo.org> gegl-0.0.22.ebuild:
   Marking gegl-0.0.22 ppc for bug 258344
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index c0ebba28480d..84fcca7fadff 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gegl-0.0.18-newffmpeg.diff 889 RMD160 506707235c92c0d8c0177b46af534352b246cb89 SHA1 74efdb5af757f94c271bd8fa39d27b8f6a7016c7 SHA256 4456bd53335a382860413b4332ffa8e5b0dc7d8ff2d6ee9aa3b80758998b52d3
 AUX gegl-0.0.22-locale_h.diff 282 RMD160 e3b6efcd91de6da23442c5da5ae9eaec2ee079b5 SHA1 59d008f5b9b971d44b859927dbbe4adedbbe5104 SHA256 7cbd5937ceb20dacd5abd9bf0180422d95ae85bd79e71b6d639d4d5d7f6fa28d
 AUX gegl-18-configure-ac.patch 12354 RMD160 ae12c9c7dab1c6251ac29d53ad141d9416a51579 SHA1 a5de6e8660bbeac0c52e6a002898f1bb5a64df02 SHA256 892f152ecc22a3d306137f498e9a5ef38fe24414573cdae7bb17f3d5d21d1581
 AUX gegl-20-configure-ac.patch 13263 RMD160 df2f13719b23f45f04dcbce5a2e611f0b21636fb SHA1 67416e82775ac6cf30346128ba83af2420aa9280 SHA256 f27a68381a41f50125e1ec20efb5913feac0ea23dbeb565364a7feeeeb77d917
+AUX replace-imgconvert-by-swsscale.patch 2154 RMD160 fcf0e6c524a3e2071e474bdb62c4ccf3df1cfa09 SHA1 b8202e020c28cd70ca7aa96421edee940abf7a9c SHA256 d0470dd22814afffbbb2fffa7fc9488129b9cae715f26c8330eea913550885dc
 DIST gegl-0.0.20.tar.bz2 1224221 RMD160 b4bc7169eafa4fea512f1190f1ad835d688c4080 SHA1 37be399b58d50a87134f2dfad389a476e1155874 SHA256 708bb6afef9dc896caeaa618238bd67dd8548be5b774ce3c67664b716b550db7
 DIST gegl-0.0.22.tar.bz2 1255087 RMD160 5090297c6249a53e3731ecf4b8d3eeeb26768c39 SHA1 de684d4c8d9eaa9b7e283c55c5f779e5bdabee78 SHA256 857233c84fe4a215466582eeeac3e719059f2d467f700a9f6885c35f55caa65b
 EBUILD gegl-0.0.20.ebuild 2842 RMD160 f6fb42329104fdd83aa4534831179414cfbb9caa SHA1 add5f0b6ad1a46ee5bb0a5b88a58e5f536b54db3 SHA256 15f629e364f9b9ba5d665277b4d52afc41e7f41d9abab5252db7da2d479dbdae
-EBUILD gegl-0.0.22.ebuild 2358 RMD160 7fc8720dfe7e1e9d7f40de68c90558a00fd5a131 SHA1 439b543faf366e55fd2484ff7ce276ac96e29917 SHA256 f912aa5e0f6ab37dc20e9deb0110ec0ddd0ce33b5824361d026804a025e602a3
-MISC ChangeLog 3040 RMD160 61e42045345704991dc71c1def5e0963efe8b4b6 SHA1 735de9cf3407450d98eceef7109d7c9d75207b99 SHA256 ccabe6a34c0491be416578c7a3ea1ee8fab13988995f23eb3d931bc9500f7fed
+EBUILD gegl-0.0.22.ebuild 2436 RMD160 15d475c79efedd6f05e69baaf9bfa33cf019fa0d SHA1 e2bba099ce784f82715eb0df6e5957dc087ae9b7 SHA256 b817300c3dfa09b4d64717e6f8f2f02d073350bbc01f5bbe73ad140a163cfeb2
+MISC ChangeLog 3217 RMD160 2d37c3689233044f176ec1a7ead18c5662907c11 SHA1 e2f106a59e625146520fd026ebebdf9be955c7ac SHA256 32a7f989ede0aad035df1ff4a31e4242553e5f1d36eb34fb6caf10b2f4444707
 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkocfm0ACgkQr2QksT29OyDAOwCffsgq3wyvbPGAC1aczMlKnJBD
+Zq8AmwXnKNtWV2ZbjYnPHEEvmMEyA/X7
+=RLUT
+-----END PGP SIGNATURE-----
diff --git a/media-libs/gegl/files/replace-imgconvert-by-swsscale.patch b/media-libs/gegl/files/replace-imgconvert-by-swsscale.patch
new file mode 100644
index 000000000000..2cf5601e1665
--- /dev/null
+++ b/media-libs/gegl/files/replace-imgconvert-by-swsscale.patch
@@ -0,0 +1,58 @@
+Index: gegl-0.0.22/operations/workshop/external/ff-save.c
+===================================================================
+--- gegl-0.0.22.orig/operations/workshop/external/ff-save.c
++++ gegl-0.0.22/operations/workshop/external/ff-save.c
+@@ -19,6 +19,8 @@
+ #include "config.h"
+ #include <glib/gi18n-lib.h>
+ 
++#include <libswscale/swscale.h>
++
+ 
+ #ifdef GEGL_CHANT_PROPERTIES
+ 
+@@ -640,6 +642,7 @@ write_video_frame (GeglChantO *op,
+   int       out_size, ret;
+   AVCodecContext *c;
+   AVFrame  *picture_ptr;
++  struct SwsContext *img_convert_ctx;
+ 
+   c = st->codec;
+ 
+@@ -649,10 +652,22 @@ write_video_frame (GeglChantO *op,
+          to the codec pixel format if needed */
+       fill_yuv_image (op, p->tmp_picture, p->frame_count, c->width,
+                       c->height);
+-      /* FIXME: img_convert is deprecated. Update code to use sws_scale(). */
++      /* FIXME: img_convert is deprecated. Update code to use sws_scale().
+       img_convert ((AVPicture *) p->picture, c->pix_fmt,
+                    (AVPicture *) p->tmp_picture, PIX_FMT_RGB24,
+                    c->width, c->height);
++      */
++      img_convert_ctx = sws_getContext(c->width, c->height, c->pix_fmt,
++                                       c->width, c->height, PIX_FMT_RGB24,
++                                       SWS_BICUBIC, NULL, NULL, NULL);
++
++      if (img_convert_ctx == NULL)
++        fprintf(stderr, "ff_save: Cannot initialize conversion context.");
++      else
++      {
++        sws_scale(img_convert_ctx, p->tmp_picture->data, p->tmp_picture->linesize,
++                  0, c->height, p->picture->data, p->picture->linesize);
++      }
+     }
+   else
+     {
+Index: gegl-0.0.22/operations/workshop/external/Makefile.am
+===================================================================
+--- gegl-0.0.22.orig/operations/workshop/external/Makefile.am
++++ gegl-0.0.22/operations/workshop/external/Makefile.am
+@@ -21,7 +21,7 @@ endif
+ if HAVE_AVFORMAT
+ ops += ff_save.la
+ ff_save_la_SOURCES = ff-save.c
+-ff_save_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS)
++ff_save_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS) -lswscale
+ ff_save_la_CFLAGS = $(AVFORMAT_CFLAGS)
+ endif
+ 
diff --git a/media-libs/gegl/gegl-0.0.22.ebuild b/media-libs/gegl/gegl-0.0.22.ebuild
index 8c599475c13d..881e0b7f6d66 100644
--- a/media-libs/gegl/gegl-0.0.22.ebuild
+++ b/media-libs/gegl/gegl-0.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.0.22.ebuild,v 1.10 2009/04/06 14:21:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.0.22.ebuild,v 1.11 2009/05/26 23:42:35 hanno Exp $
 
 inherit eutils
 
@@ -32,6 +32,7 @@ DEPEND=">=media-libs/babl-0.0.20
 	raw? ( >=media-libs/libopenraw-0.0.5 )
 	sdl? ( media-libs/libsdl )
 	svg? ( >=gnome-base/librsvg-2.14.0 )"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	if use doc && ! built_with_use 'media-gfx/imagemagick' 'png'; then
@@ -44,6 +45,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-locale_h.diff"
+	epatch "${FILESDIR}/replace-imgconvert-by-swsscale.patch"
 }
 
 src_compile() {