add patches to compile with new header structur of imagemagick-6.4.x and gcc-4.3.x

Package-Manager: portage-2.1.4.4

5 files changed, 46 insertions, 8 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index 71f583ce2734..96f64ee9ebcc 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-graphtft
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.5 2008/06/22 11:56:51 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.6 2008/06/22 17:43:34 hd_brummy Exp $
+
+  22 Jun 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-graphtft-0.1.18_alpha-imagemagick-6.4-new_header.diff,
+  +files/gcc-4.3-missing_includes.diff, vdr-graphtft-0.1.18_alpha.ebuild:
+  add patches to compile with new header structur of imagemagick-6.4.x and
+  gcc-4.3.x
 
   22 Jun 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
   -files/vdr-graphtft-0.1.16_alpha-gentoo.diff,
diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest
index 11895ceafd0c..a33cfd7d804c 100644
--- a/media-plugins/vdr-graphtft/Manifest
+++ b/media-plugins/vdr-graphtft/Manifest
@@ -2,20 +2,22 @@
 Hash: SHA1
 
 AUX confd 1233 RMD160 7b0183644d7ff2f2c0488ec10190e40afc11dab3 SHA1 803cf52c0b13cc2b110f8c8706f8fda15bd532a7 SHA256 2ddbe4e535d7f18a002df6760b41f9c24a4cb95695480a210d148bc046582063
+AUX gcc-4.3-missing_includes.diff 388 RMD160 dfe75dd41e5f7484af4a21dd90e8e3f9d35149f9 SHA1 21f9d74cfb7341b431c4599a512299e41d05990a SHA256 73aaf1ca223106be88282565167d85dc6cca67f7a1b75a648d9bcf8fb61afeae
 AUX graphtft-fe 995 RMD160 669a22a7bd3d5d7efdf7468f2f1692d118b77a09 SHA1 722a35ee6c93632d669e789897eaed2b48baec41 SHA256 1f97afe93133b38e0a0679baf7abfa85d532d1908801da1cd1c70e5104338107
 AUX rc-addon.sh 319 RMD160 1d0638b87fa0c352efb6a0dcc4cedb9f45fbb29a SHA1 926fb7e8e104ded4ead49d25d0c2f75f0a0ed73b SHA256 12de96dd173d9de415c016178468b20aa293df3ad75b7eb62ba6fc71737ee585
 AUX vdr-graphtft-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff 2651 RMD160 c9449b8ef2dc1d806fbcfd7ef7e95fd1defcc7a9 SHA1 316ac3e328fe4bedc9bb5dc419c9c0b2f554e8be SHA256 1d68415dd3ffafbd3735102ac2407f5b22a7361209869b6fc780d35aa27f0424
 AUX vdr-graphtft-0.1.18_alpha-gentoo.diff 3937 RMD160 4f97eaa37391286819a1483835b6a0fc4980994a SHA1 afdcdbef95c174093d2d08ff6d81ec2263034f20 SHA256 25b9ba6c4f6da4218ed27f7ee0cb35da4e268d844557882ed8f42dba14892ada
+AUX vdr-graphtft-0.1.18_alpha-imagemagick-6.4-new_header.diff 461 RMD160 4c36203c70182be9b910c801223ff3637584d059 SHA1 f17143aa4552d49aea9c72eaa25b832a040f356d SHA256 ef5eed0e2bb6518cb0b65d90dc43ba3e47a1c339159fe02ce361c9f5ac5ef4e9
 DIST DeepBlue-horchi-0.0.6.tar.bz2 1660439 RMD160 8ac510b9a65f8f4becef94519cf77f083709e96e SHA1 108321c1fc2d9e4e4aae650d9b6e842dfd5d6788 SHA256 75ca7ea853ae9fc3a30b656ab0f6599bc09c10d371b76990156ad9491ad2c8ee
 DIST vdr-graphtft-0.1.18.alpha.tar.bz2 243724 RMD160 dbb1c86f945a64eb352dadb3e4e96f677d9b53d4 SHA1 7b92bcdcd3a101d0f0321859735c2cf1308a020f SHA256 8b77a0b7809b32899646a94e03277933340d697c7268ac5c347a89cde212eadf
-EBUILD vdr-graphtft-0.1.18_alpha.ebuild 2544 RMD160 0e2efbc90c9e556e47643646da14b74a3ab1b9b8 SHA1 49b016548391b9760d3fcf83758fa1581bff0a97 SHA256 13aca81ac1fc545573cbf4c2cc954e9b52c1afd2851838419d031f8920803175
-MISC ChangeLog 1611 RMD160 4811a25321fa9563b5d6dc1a74ac9b2eaba90ebf SHA1 eac467574bfc3d8bc81bc0a263d274c75383f70c SHA256 c336b5359a3b712e90074e67dcf993e3ed32d043f66656102c1400bdccff2c72
+EBUILD vdr-graphtft-0.1.18_alpha.ebuild 2713 RMD160 2ab6090f9d026f52238c5812bf4325144f6e8564 SHA1 e490452a1e2033e723081449a1045f5189514331 SHA256 2209593b66a67958b44530b8dc8388d7745b02da13733936de2b42a840be1d2d
+MISC ChangeLog 1896 RMD160 7cdb49282a97a2b5d22c6e65c16c50510d735e5b SHA1 0e4179affc7ca1f103080433caa2cdf4d17549da SHA256 d8c9038aebd8e79c8ff8906c727095dcbffa8bd9ae7baeb54ea7f3c44d3d1316
 MISC metadata.xml 262 RMD160 7546813a650c87e871e1803630eec93651cf171b SHA1 50f15b18b32db880cb94fa98480e865252f12e0e SHA256 e50bacec7fb98fb225d1d709825110afe8c6e04960458ec53758da0f067a18ff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFIXj4Pdn07HTTCgIoRAiV7AJ9oEVV/irvUxqlaQhyAzhIbfXGRxwCfVsfA
-A6DmZYtNiEzrZibnYuCtZjA=
-=hn7Z
+iD8DBQFIXo9Qdn07HTTCgIoRAi+jAKC8+SSLuZ+PLHlCFc27BcwWnooc0gCfT/up
+/RXlLLap+BACP8zp2jaK+mM=
+=U0bF
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-graphtft/files/gcc-4.3-missing_includes.diff b/media-plugins/vdr-graphtft/files/gcc-4.3-missing_includes.diff
new file mode 100644
index 000000000000..c5124bd445c2
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/gcc-4.3-missing_includes.diff
@@ -0,0 +1,11 @@
+diff -Naur graphtft-0.1.18.alpha.orig/tcpchannel.c graphtft-0.1.18.alpha/tcpchannel.c
+--- graphtft-0.1.18.alpha.orig/tcpchannel.c	2008-06-22 19:32:19.000000000 +0200
++++ graphtft-0.1.18.alpha/tcpchannel.c	2008-06-22 19:32:59.000000000 +0200
+@@ -15,6 +15,7 @@
+ #include <fcntl.h>
+ #include <netdb.h>
+ #include <errno.h>
++#include <string.h>
+ 
+ #include "tcpchannel.h"
+ #include "common.h"
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-imagemagick-6.4-new_header.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-imagemagick-6.4-new_header.diff
new file mode 100644
index 000000000000..e071e6765bb5
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-imagemagick-6.4-new_header.diff
@@ -0,0 +1,14 @@
+diff -Naur graphtft-0.1.18.alpha.orig/Makefile graphtft-0.1.18.alpha/Makefile
+--- graphtft-0.1.18.alpha.orig/Makefile	2008-06-22 19:12:45.000000000 +0200
++++ graphtft-0.1.18.alpha/Makefile	2008-06-22 19:16:56.000000000 +0200
+@@ -122,6 +122,10 @@
+   HAVE_FFMPEG = 1
+ endif
+ 
++ifdef HAVE_IMAGE_MAGICK
++  INCLUDES += -I/usr/include/ImageMagick
++endif
++
+ ifdef HAVE_GTOP
+   GTOP_INC = `pkg-config libgtop-2.0 --cflags`
+   GTOP_LIB = `pkg-config libgtop-2.0 --libs`
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild
index ca3bf00557da..382137c7275f 100644
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.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-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild,v 1.2 2008/05/15 12:22:21 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild,v 1.3 2008/06/22 17:43:34 hd_brummy Exp $
 
 MY_PV="${PV/_alpha/.alpha}"
 MY_P="${PN}-${MY_PV}"
@@ -26,7 +26,8 @@ DEPEND=">=media-video/vdr-1.4.7-r9
 		directfb? ( dev-libs/DirectFB )
 		graphtft-fe? ( $(qt4_min_version 4.0.0) )"
 
-PATCHES=("${FILESDIR}/${P}-gentoo.diff")
+PATCHES=("${FILESDIR}/${P}-gentoo.diff"
+		"${FILESDIR}/gcc-4.3-missing_includes.diff")
 
 S="${WORKDIR}/graphtft-${MY_PV}"
 
@@ -58,6 +59,10 @@ src_unpack() {
 		epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-new_header.diff"
 	fi
 
+	if has_version ">=media-gfx/imagemagick-6.4" ; then
+		epatch "${FILESDIR}/${P}-imagemagick-6.4-new_header.diff"
+	fi
+
 	use directfb && sed -i Makefile \
 		-e "s:#HAVE_DFB = 1:HAVE_DFB = 1:"