Fix build with latest imagemagick, by Robin H. Johnson <robbat2@gentoo.org>

Bug #247292
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

4 files changed, 40 insertions, 8 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 329eeb605522..ccde3c3d8dd3 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.576 2008/11/23 16:40:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.577 2008/12/19 13:06:14 aballier Exp $
+
+  19 Dec 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/xine-lib-1.1.15-GetImagePixels.patch, xine-lib-1.1.15-r1.ebuild:
+  Fix build with latest imagemagick, by Robin H. Johnson
+  <robbat2@gentoo.org> Bug #247292
 
   23 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   xine-lib-1.1.15-r1.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index dc0bb65774e2..0de43c89e55f 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xine-lib-1.1.15-GetImagePixels.patch 1209 RMD160 32f9ca2c96ede51238119899520ea1c2a2915654 SHA1 24e2741f1bd6df6c04a0d204966219c63c18e9bf SHA256 8f4d93765f8610117af8fe98fc915d0ef7c6a6373bc126f06be3d3f1d27fb7d1
 AUX xine-lib-1.1.15-buffer_h_ansi.patch 556 RMD160 d6607e3319a1fe0d6f88a40dd775d3064ce8fb5e SHA1 f96f76c22267d3a814caf6db080f81df5070bd5d SHA256 d5aa882549203e56f9f15225e051f2aabc06302396f07aa2a2306cba62451d9b
 AUX xine-lib-1.1.15-ffmpeg.patch 1346 RMD160 a15b850afa2169a4f2cffc551eda067b5290e1b0 SHA1 de8d2d3f755ed87bb9650749ba339974f57a7538 SHA256 6bd74e3646a7bed6bbb8449de25995006d7a011b3e3abdfbf8791334a00b8d85
 AUX xine-lib-1.1.15-libmpeg2-vis.patch 405 RMD160 896298250884a9e3a1b168fe7140835a7112bc53 SHA1 3a3212a629c630e52327f25b3df3c5ecef5b5bbb SHA256 90af2c9a50db6dc358df59c9ab3e4aaed4bc8a8686f2b512e1dffa97b64825fe
 DIST xine-lib-1.1.15.tar.bz2 7478750 RMD160 5c64dd51c05a6e17cb6dfcbb8a9009ba8571c75f SHA1 bcb567ea2a11c5f26b2384d5400b8466ea9048c6 SHA256 07ddf2a9f521417dd2f097534a52ddd9d2883679932f965ae7e7b0125d3c9dcc
-EBUILD xine-lib-1.1.15-r1.ebuild 5708 RMD160 73c2e3080da4983e74f5017e5343cd844f924f02 SHA1 191152e2ec37cfb3bc969e1872dbb88190f0811a SHA256 675ad196a2d7b95be77e99cbc4ec9a75d491943ba1d40ceceaa32010a7aae2e0
-MISC ChangeLog 65626 RMD160 093f68839f3dda617cc6e0c99515843e0e79a964 SHA1 2589bff78b5ccad906bc9fd2d1143c053cca2ea0 SHA256 ffafe9dac37c7f39b4152ea6356e6085b8b525be739af0014fdf7b67742f2d1b
+EBUILD xine-lib-1.1.15-r1.ebuild 5744 RMD160 ab22cf093acea91869dc04659af362a2ca967c91 SHA1 af8903fedde98afe26bf12dbfe312a2163d5f69f SHA256 3c41ba2b91f53333f099008bfddedcb2fa9667a7975587daf81ec4cc1dc72b18
+MISC ChangeLog 65844 RMD160 88f8cc2905299f4651f1f7018434c3b6a558df3f SHA1 827045074f69fa15d2706b60662815dd05a80784 SHA256 32f0c6f83cb23ceda163ebeb3dd37bc0dac172910e9d17d9500c29fdc8cff09d
 MISC metadata.xml 2914 RMD160 bed4bab81a32b49e4923ddfcc02e8338a45ef7ef SHA1 fe3faf7dba7f929241acfe5eaa17b2f66bfb2722 SHA256 efe3b879c59c9971e1ffcd732c2bdbd8f60f2b173fde675a371202ceeb96b0fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkph5gACgkQAiZjviIA2XiNRQCgxSBWjZ1oW8LeZwFCftFHFx8Z
-/WoAnjxniZN9TCBMGABZyDO5XXdMR96b
-=jQsV
+iEYEARECAAYFAklLnEwACgkQvFcC4BYPU0qOZACfcbDWroMvaTADvLpv/dtpbR5I
+7ywAn3egbnKKBNJdedilOdObii62nxRC
+=rLxl
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch
new file mode 100644
index 000000000000..c1c572dc72b3
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch
@@ -0,0 +1,25 @@
+Upstream ImageMagick changed part of the API and did not updated their
+deprecated support stuff, so bump us along for now to avoid having to downgrade.
+
+Gentoo-bug: 247292
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*~' xine-lib-1.1.15.orig/src/libxinevdec/image.c xine-lib-1.1.15/src/libxinevdec/image.c
+--- xine-lib-1.1.15.orig/src/libxinevdec/image.c	2008-06-14 16:15:00.000000000 -0700
++++ xine-lib-1.1.15/src/libxinevdec/image.c	2008-11-26 18:10:16.416309036 -0800
+@@ -110,7 +110,15 @@
+     width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */
+     height = MagickGetImageHeight(wand);
+     img_buf = malloc(width * height * 3);
++/* In 6.4.5.4 MagickGetImagePixels changed to MagickGetAuthenticPixels 
++ * But upstream did not update their deprecated compat stuff.
++ * So do a fun hack to make it work.
++ * - 2008/11/26 Robin H. Johnson <robbat2@gentoo.org>
++ */
++#if MagickLibVersion >= 0x645
++#define MagickGetImagePixels MagickGetAuthenticPixels
++#endif
+     MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf);
+     DestroyMagickWand(wand);
+ 
+     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width);
diff --git a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
index fc114623be77..46f7ab3a4e83 100644
--- a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild,v 1.11 2008/11/23 16:40:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild,v 1.12 2008/12/19 13:06:14 aballier Exp $
 
 EAPI=1
 
@@ -55,7 +55,7 @@ RDEPEND="X? ( x11-libs/libXext
 	vcd? ( media-video/vcdimager )
 	a52? ( >=media-libs/a52dec-0.7.4-r5 )
 	mad? ( media-libs/libmad )
-	imagemagick? ( <media-gfx/imagemagick-6.4.5.7 )
+	imagemagick? ( media-gfx/imagemagick )
 	dts? ( media-libs/libdca )
 	aac? ( >=media-libs/faad2-2.6.1 )
 	>=media-video/ffmpeg-0.4.9_p20070129
@@ -91,6 +91,7 @@ src_unpack() {
 	epatch "$FILESDIR"/${P}-libmpeg2-vis.patch
 	epatch "$FILESDIR"/${P}-buffer_h_ansi.patch
 	epatch "$FILESDIR"/${P}-ffmpeg.patch
+	epatch "$FILESDIR"/${P}-GetImagePixels.patch
 }
 
 src_compile() {