fixed includes newer ImageMagick; bug 274159

Package-Manager: portage-2.1.9.24/cvs/Linux i686

4 files changed, 49 insertions, 7 deletions

diff --git a/media-plugins/vdr-music/ChangeLog b/media-plugins/vdr-music/ChangeLog
index 14546d471a9c..05f9ba4accc1 100644
--- a/media-plugins/vdr-music/ChangeLog
+++ b/media-plugins/vdr-music/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-music
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.9 2009/11/06 17:33:17 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.10 2010/12/30 00:02:54 hd_brummy Exp $
+
+  30 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-music-0.2.0.ebuild, +files/vdr-music-0.2.0-ImageMagick-header.diff:
+  fixed includes newer ImageMagick; bug 274159
 
   06 Nov 2009; Vlastimil Babka <caster@gentoo.org> vdr-music-0.2.0.ebuild:
   Depend on virtual/jre instead of hardwired blackdown-jre
diff --git a/media-plugins/vdr-music/Manifest b/media-plugins/vdr-music/Manifest
index c40f865e98e0..401daa7e6e65 100644
--- a/media-plugins/vdr-music/Manifest
+++ b/media-plugins/vdr-music/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX vdr-music-0.2.0-ImageMagick-header.diff 819 RMD160 7dbfaad7ae29f183ffab9c29c1e042e0c97d949a SHA1 6549a41d2e91514e7bb292c7f88424fb5842a61a SHA256 b08f248145d73f54e240c00cb74477ec483e614e199a3033f72cd3c839a587b9
 AUX vdr-music-0.2.0-gcc4.3.diff 352 RMD160 7dfea065cee471b08603d67ba043063ec7947a76 SHA1 d6152d0b5b00ceb002dd15e8b55d1aff2f8961de SHA256 25afec3855c59156e9e4e069e844fb2799e79a074b8d4a70aec2d8e981e097ed
 AUX vdr-music-0.2.0-gentoo.diff 8984 RMD160 ebf9a5e069609d6c328675fe8c4a45b31018ced6 SHA1 20704a658ce816963f5d3821d7dcdc45dc09df2e SHA256 24e86049c3fe7d8f08b3b1f07e9d8da33d12bfb7aae3169eae939773372acadb
 AUX vdr-music-0.2.0-glibc-2.10.patch 3136 RMD160 fe3e98c337117cab97c843bb70389211c0d3f5c2 SHA1 be19cb9ce3d9c7e73faecb4ec61f9a03433fb0f5 SHA256 8a81ba9d30af6090fee17ad3232f0e223c3d0a4838123639059efc2c9a8ac481
@@ -5,6 +9,14 @@ AUX vdr-music-0.2.0-graphtftcoverfix.diff 7418 RMD160 c38b89db49ce9ed07a8b8a08bd
 AUX vdr-music-0.2.0-lyrics.diff 650 RMD160 8355089f1c70542f894659014c910452dc084310 SHA1 7c0c826806e3f3c29c9bbb6b121f1239e5fa8914 SHA256 854319d92e5d4a6840be922d4c891dbb01813fadb2377236379b75e50fdcf12f
 AUX vdr-music-0.2.0-vdr-1.5.x.diff 742 RMD160 a7719705515819f5c991f85f8bb7bc71d0f2b9fa SHA1 18a0b48224b241d4f8333a5dbf12874df913ff76 SHA256 5db123db44bad1309fd478e1ad46f86d01de02f5f1655d766868f569e0c293c9
 DIST vdr-music-0.2.0.tar.gz 507411 RMD160 131aebca586d26d65d4616c5fa2e58a6fa109d11 SHA1 f1bf23c12580299643194278553cf71b901773f1 SHA256 f01149d0d32cc32dabbf8868f2ef0c45540205a102d69138ccedc57976740b20
-EBUILD vdr-music-0.2.0.ebuild 2616 RMD160 5b62f2586894107fb76122e5b01c969210d1e568 SHA1 587780e5338ba1b02354a1a193b435ec24f16199 SHA256 655a354021523927d53d27bf33b8c24122d662089ee4e8d767703e3b83a7ec21
-MISC ChangeLog 1856 RMD160 957bc5a3820f279b972a71248f54a5f86567515b SHA1 c98dca97b98a04324427107abeb3dfb99dec50dc SHA256 bf74b2c49447fd0daef87efa8a2ef62454d709bc384ec718cada3c45709517d8
+EBUILD vdr-music-0.2.0.ebuild 2663 RMD160 3e4a45ee42a4678558518b6cdbf8a0ef11cd3613 SHA1 65592c0e28d61b1df58d3e1d94d8857b2743b1f3 SHA256 60c38a2d4923d613c0dd8c4380adb5ffb011de3ed92989a431f00dd75fadfc65
+MISC ChangeLog 2037 RMD160 024eadebb5a6de6b05a7d54ca7a23e058a5fa5e2 SHA1 acdfa0e4f314382aa6e29a3e20f42b6aaea7294d SHA256 a1229ed33601fc0949f0860a4874c503cfc6535be9e35edfd835a9ace8f87d41
 MISC metadata.xml 504 RMD160 325523ec2d5aeb7302a5b75bf11e8186cf46836a SHA1 2ec61cdc0fc73dc183699d23cb88dd3202927be7 SHA256 ba58537a2d75f5bd8d3237d79f2dbb6cfb2e5fb58426a2be4f20961eb3591b37
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFNG8xidn07HTTCgIoRAutBAKCIJHL/c8gxpylS5SRpj1IHY/wf5gCeJg51
+tG41Mzf8iIHwgciVD9kYUiE=
+=X/ho
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff
new file mode 100644
index 000000000000..2dc217633aa1
--- /dev/null
+++ b/media-plugins/vdr-music/files/vdr-music-0.2.0-ImageMagick-header.diff
@@ -0,0 +1,25 @@
+diff -Naur music-0.2.0.orig/bitmap.c music-0.2.0/bitmap.c
+--- music-0.2.0.orig/bitmap.c	2010-12-30 00:51:40.000000000 +0100
++++ music-0.2.0/bitmap.c	2010-12-30 00:50:33.000000000 +0100
+@@ -10,7 +10,7 @@
+ #define X_DISPLAY_MISSING
+ 
+ #ifdef HAVE_MAGICK
+-#include <Magick++.h>
++#include <ImageMagick/Magick++.h>
+  using namespace Magick;
+  cBitmapCache cMP3Bitmap::mCache(MP3Setup.MaxCacheFill);
+ #else
+diff -Naur music-0.2.0.orig/Makefile music-0.2.0/Makefile
+--- music-0.2.0.orig/Makefile	2010-12-30 00:51:40.000000000 +0100
++++ music-0.2.0/Makefile	2010-12-30 00:50:17.000000000 +0100
+@@ -141,7 +141,8 @@
+ 
+ ifdef HAVE_MAGICK
+ 	DEFINES += -DHAVE_MAGICK
+-	LIBS += -lMagick -lMagick++
++	LIBS += $(shell Magick++-config --libs)
++	INCLUDES += -I/usr/include/ImageMagick
+ else
+ 	DEFINES += -DHAVE_IMLIB2
+ 	LIBS += -lImlib2
diff --git a/media-plugins/vdr-music/vdr-music-0.2.0.ebuild b/media-plugins/vdr-music/vdr-music-0.2.0.ebuild
index 811918947046..baaf70dabedd 100644
--- a/media-plugins/vdr-music/vdr-music-0.2.0.ebuild
+++ b/media-plugins/vdr-music/vdr-music-0.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v 1.7 2009/11/06 17:33:17 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.2.0.ebuild,v 1.8 2010/12/30 00:02:54 hd_brummy Exp $
 
 EAPI="2"
 
@@ -19,7 +19,8 @@ PATCHES=( "${FILESDIR}/${P}-gentoo.diff"
 	"${FILESDIR}/${P}-vdr-1.5.x.diff"
 	"${FILESDIR}/${P}-lyrics.diff"
 	"${FILESDIR}/${P}-gcc4.3.diff"
-	"${FILESDIR}/${P}-glibc-2.10.patch" )
+	"${FILESDIR}/${P}-glibc-2.10.patch"
+	"${FILESDIR}/${P}-ImageMagick-header.diff" )
 
 DEPEND=">=media-video/vdr-1.3.30
 	media-libs/libmad