Added vdr-1.5.3 patch.

Package-Manager: portage-2.1.3_rc5

4 files changed, 39 insertions, 15 deletions

diff --git a/media-plugins/vdr-director/ChangeLog b/media-plugins/vdr-director/ChangeLog
index 7119e8afeb9b..ea45ea4a5651 100644
--- a/media-plugins/vdr-director/ChangeLog
+++ b/media-plugins/vdr-director/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-director
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-director/ChangeLog,v 1.4 2007/05/05 16:09:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-director/ChangeLog,v 1.5 2007/06/24 13:45:27 zzam Exp $
+
+  24 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-director-0.2.8-vdr.1.5.3.diff, vdr-director-0.2.8-r1.ebuild:
+  Added vdr-1.5.3 patch.
 
 *vdr-director-0.2.8-r1 (05 May 2007)
 
diff --git a/media-plugins/vdr-director/Manifest b/media-plugins/vdr-director/Manifest
index 0d7954cd5f88..9c6bc5726d5f 100644
--- a/media-plugins/vdr-director/Manifest
+++ b/media-plugins/vdr-director/Manifest
@@ -5,19 +5,23 @@ AUX vdr-director-0.2.8-i18n-addendum.diff 625 RMD160 dadad73b2849a465683667a72ef
 MD5 a29b658edc54b441bbecac1dbff0b035 files/vdr-director-0.2.8-i18n-addendum.diff 625
 RMD160 dadad73b2849a465683667a72ef3e7a7e295eb86 files/vdr-director-0.2.8-i18n-addendum.diff 625
 SHA256 7aacbb96d9954819377299fa75070ec419121146adcfa89567be68601ecf2154 files/vdr-director-0.2.8-i18n-addendum.diff 625
+AUX vdr-director-0.2.8-vdr.1.5.3.diff 503 RMD160 f44a800ad49a482a3f90ec7eb8a6038094c1a21d SHA1 cb8b47c49f701c6379b3ab2e968a0e1d137cf92b SHA256 e213954fdab021854b1492674d3e87a2aced798e5e891b74a17849d6ebccd1ad
+MD5 9e6cae83d882bff7dde640675536bbfe files/vdr-director-0.2.8-vdr.1.5.3.diff 503
+RMD160 f44a800ad49a482a3f90ec7eb8a6038094c1a21d files/vdr-director-0.2.8-vdr.1.5.3.diff 503
+SHA256 e213954fdab021854b1492674d3e87a2aced798e5e891b74a17849d6ebccd1ad files/vdr-director-0.2.8-vdr.1.5.3.diff 503
 DIST vdr-director-0.2.8.tar.gz 13658 RMD160 b252010e7e4f5aba3271bae253455a575babbe43 SHA1 17386ab0d63753f49a1dfd142282180cb1f71948 SHA256 d77e6c6ea3e1a2cf0fd3873631c755675376e3fee71eba45c8040712b5cf66e8
-EBUILD vdr-director-0.2.8-r1.ebuild 630 RMD160 89c3a3d829c52e39f083c848009ce128ad703635 SHA1 30fb1e225f078496a0dea6635051b4640af03561 SHA256 b9bfd5c35d8bedee06c763940f65cee15c422ea59f2585ed7484a0c32dd8f786
-MD5 e05d3fb1c4abab2304207ac168415271 vdr-director-0.2.8-r1.ebuild 630
-RMD160 89c3a3d829c52e39f083c848009ce128ad703635 vdr-director-0.2.8-r1.ebuild 630
-SHA256 b9bfd5c35d8bedee06c763940f65cee15c422ea59f2585ed7484a0c32dd8f786 vdr-director-0.2.8-r1.ebuild 630
+EBUILD vdr-director-0.2.8-r1.ebuild 663 RMD160 86a5e9a8eac8f384bd25da8162038ed79fc7f0de SHA1 3b36cc94d2765dd3a036f1dd691cb934679aaca5 SHA256 248a6d52414a10ec7d9df5dc67f6e6ea3debf743a68b7cf1ffe197a3b62006df
+MD5 df1c47998a001c6a41d26883e85c11a5 vdr-director-0.2.8-r1.ebuild 663
+RMD160 86a5e9a8eac8f384bd25da8162038ed79fc7f0de vdr-director-0.2.8-r1.ebuild 663
+SHA256 248a6d52414a10ec7d9df5dc67f6e6ea3debf743a68b7cf1ffe197a3b62006df vdr-director-0.2.8-r1.ebuild 663
 EBUILD vdr-director-0.2.8.ebuild 579 RMD160 c6d5d33f09c63a4265824e073177fe4132073cf5 SHA1 a4749509b9e0500d3fe5dc371c254343470b2042 SHA256 dba7524a376a75bfd621db435708c6897819d97763e58f22005ae8e9713d0076
 MD5 5bd41cb8c92e630b702a2b80fd0ecf04 vdr-director-0.2.8.ebuild 579
 RMD160 c6d5d33f09c63a4265824e073177fe4132073cf5 vdr-director-0.2.8.ebuild 579
 SHA256 dba7524a376a75bfd621db435708c6897819d97763e58f22005ae8e9713d0076 vdr-director-0.2.8.ebuild 579
-MISC ChangeLog 952 RMD160 0513756098ec370d1fe2a2d156bef535c452aa19 SHA1 55adcd6aeb284fae836c8327da9d005ebb8b8903 SHA256 4d7927ca3fdb3b3e6b5358e833413229b24122188f7de9571814ef57bf4f2d0e
-MD5 f28b5cc6e11f6dabc62aa06182137db4 ChangeLog 952
-RMD160 0513756098ec370d1fe2a2d156bef535c452aa19 ChangeLog 952
-SHA256 4d7927ca3fdb3b3e6b5358e833413229b24122188f7de9571814ef57bf4f2d0e ChangeLog 952
+MISC ChangeLog 1105 RMD160 a0d4a2336849e1ca0d0628654b412688e51ffe69 SHA1 60df00220f35cece3b4c46cdeeee9e608293e8eb SHA256 ff01f2db47c69c37544d329dd6ca87d6235f23b327eec6e59248990f2df6eef1
+MD5 92b87263d38e1e6d607c13ee6f38144c ChangeLog 1105
+RMD160 a0d4a2336849e1ca0d0628654b412688e51ffe69 ChangeLog 1105
+SHA256 ff01f2db47c69c37544d329dd6ca87d6235f23b327eec6e59248990f2df6eef1 ChangeLog 1105
 MISC metadata.xml 366 RMD160 47eb120aa5e750ef4e517e920cff9d7f794411d8 SHA1 d6cdf0a90d23bfa7267a178d2aa6a80c4a568303 SHA256 ec515df5db0342a15f6c49264c1c1884514c78eabcb26af36b894fe37486c1db
 MD5 7881e598b92bc1158a5367cac036719f metadata.xml 366
 RMD160 47eb120aa5e750ef4e517e920cff9d7f794411d8 metadata.xml 366
@@ -29,9 +33,9 @@ MD5 3e9f5ef11569d9d302304118693348b1 files/digest-vdr-director-0.2.8-r1 253
 RMD160 e15e30a48490fe911efb5aa82a1417b2c85127d2 files/digest-vdr-director-0.2.8-r1 253
 SHA256 c84fb915cfae49c2205e844f35a58da65245aab6a405bf1ee068bd644b35a9e0 files/digest-vdr-director-0.2.8-r1 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGPKw9t2vP6XvVdOcRAhDDAJ9BzODiUR+eqoAGEH/uGMjCyP928gCfRy+Z
-+8Ft/+Kpt5N3yppI6v7yIFQ=
-=v7da
+iD8DBQFGfnWXt2vP6XvVdOcRAq9JAKCLP/tQw1yaVvlpYq4RdhJtp8YVygCePADx
+1OCL454h3crBuKas8Qh7BTI=
+=IySO
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-director/files/vdr-director-0.2.8-vdr.1.5.3.diff b/media-plugins/vdr-director/files/vdr-director-0.2.8-vdr.1.5.3.diff
new file mode 100644
index 000000000000..7d923a69d2d4
--- /dev/null
+++ b/media-plugins/vdr-director/files/vdr-director-0.2.8-vdr.1.5.3.diff
@@ -0,0 +1,15 @@
+diff -ru director-0.2.8-orig/directorosd.c director-0.2.8/directorosd.c
+--- director-0.2.8-orig/directorosd.c	2007-06-24 15:28:04.733376979 +0200
++++ director-0.2.8/directorosd.c	2007-06-24 15:29:34.741637063 +0200
+@@ -323,7 +323,11 @@
+ 		char *buffer=0;
+ 		asprintf(&buffer,"1 %s %d", Channel->Name(), number);
+ 				
++#if VDRVERSNUM < 10503
+ 		int theHeigth = font->Height('A');
++#else
++		int theHeigth = font->Height("A");
++#endif
+ 		int m_height = (number * theHeigth) + 10;
+ 		
+ 		//get the width		
diff --git a/media-plugins/vdr-director/vdr-director-0.2.8-r1.ebuild b/media-plugins/vdr-director/vdr-director-0.2.8-r1.ebuild
index 27ac7717b086..71f40849d3f6 100644
--- a/media-plugins/vdr-director/vdr-director-0.2.8-r1.ebuild
+++ b/media-plugins/vdr-director/vdr-director-0.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-director/vdr-director-0.2.8-r1.ebuild,v 1.1 2007/05/05 16:09:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-director/vdr-director-0.2.8-r1.ebuild,v 1.2 2007/06/24 13:45:27 zzam Exp $
 
 inherit vdr-plugin
 
@@ -15,5 +15,6 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.3.34"
 
-PATCHES="${FILESDIR}/${P}-i18n-addendum.diff"
+PATCHES="${FILESDIR}/${P}-i18n-addendum.diff
+	${FILESDIR}/${P}-vdr.1.5.3.diff"