patch added, fix for compile probs >= vdr-1.5.3

Package-Manager: portage-2.1.2.7

4 files changed, 47 insertions, 14 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 80d55211328e..bb593b789b3b 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.26 2007/05/21 07:36:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.27 2007/06/26 18:39:54 hd_brummy Exp $
+
+  26 Jun 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff,
+  vdr-xineliboutput-1.0.0_rc2.ebuild:
+  patch added, fix for compile probs >= vdr-1.5.3
 
 *vdr-xineliboutput-1.0.0_rc2 (21 May 2007)
 
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index adacef2ffc6f..1830de5c725b 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -5,20 +5,24 @@ AUX confd-1.0.0_pre6 856 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b SHA1 5d
 MD5 9c6ae841c1edf3cf7d8199b0e77c8e09 files/confd-1.0.0_pre6 856
 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b files/confd-1.0.0_pre6 856
 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b files/confd-1.0.0_pre6 856
+AUX vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff 712 RMD160 520c285cb48887ae496d12a598cf356bf9b02843 SHA1 b77920e533d878e445847b9520d4653280c4b3b5 SHA256 a453eb5692f6e85bec1cc7297dd61e25405fac09a01504508262aa7f5246d668
+MD5 e0e62c99b3a20fcd36b86c92028bcf31 files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff 712
+RMD160 520c285cb48887ae496d12a598cf356bf9b02843 files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff 712
+SHA256 a453eb5692f6e85bec1cc7297dd61e25405fac09a01504508262aa7f5246d668 files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff 712
 DIST vdr-xineliboutput-1.0.0rc1.tgz 263435 RMD160 cd6d0ba5271c40be814b9dff2d6c929872138521 SHA1 051239137b7a6598863172cbcb4fcb186a5ae198 SHA256 367f6113aa8d762be7f28d758af11111d62ed9c85d89d897582c8fb954d44a6f
 DIST vdr-xineliboutput-1.0.0rc2.tgz 266010 RMD160 406e48f343258c07e337460754181cd10c180b29 SHA1 867c090a3fd1c8d8c78d7021b2eef0821c71b776 SHA256 e92f2bbc67acd6b5d16ff249055848c0afd4dea04b62e7323c2b2230c8826d08
 EBUILD vdr-xineliboutput-1.0.0_rc1.ebuild 2092 RMD160 6cd22305627c70c92b9cc4a0e479639059cd335f SHA1 b3feacafccb9cbc715a6d054c1b10deb25b64550 SHA256 c40e779d883640331c08870b86eb87e9fff48606c6bf1bee21919d7abaec7b65
 MD5 4cc0e4aca5eada035df378ccea5c787a vdr-xineliboutput-1.0.0_rc1.ebuild 2092
 RMD160 6cd22305627c70c92b9cc4a0e479639059cd335f vdr-xineliboutput-1.0.0_rc1.ebuild 2092
 SHA256 c40e779d883640331c08870b86eb87e9fff48606c6bf1bee21919d7abaec7b65 vdr-xineliboutput-1.0.0_rc1.ebuild 2092
-EBUILD vdr-xineliboutput-1.0.0_rc2.ebuild 2092 RMD160 e64156baeb0a16eee1bf421bbe4a8966223ceaaa SHA1 35d988d53eb0741c440f18c2fe5f3b3df245974e SHA256 ca6bfe866724cc7f6e6a0bf92a1124ad5b26fa5d8c6d5331d39110108b0cb65a
-MD5 c2e1b97ad147473d1b9a96aeabaf5c1e vdr-xineliboutput-1.0.0_rc2.ebuild 2092
-RMD160 e64156baeb0a16eee1bf421bbe4a8966223ceaaa vdr-xineliboutput-1.0.0_rc2.ebuild 2092
-SHA256 ca6bfe866724cc7f6e6a0bf92a1124ad5b26fa5d8c6d5331d39110108b0cb65a vdr-xineliboutput-1.0.0_rc2.ebuild 2092
-MISC ChangeLog 6046 RMD160 67fcbf33d2855e1a24100dee37f6de5ab1b6eac7 SHA1 b872b5db31db151d04f905d1c57303f9e3279527 SHA256 d1aba5dd546e3776aafb8606a193275bdf69c8c60c7cdc40bef2c022ab2b9635
-MD5 a6ab350a2b541e0e65233c6e0ca6cb51 ChangeLog 6046
-RMD160 67fcbf33d2855e1a24100dee37f6de5ab1b6eac7 ChangeLog 6046
-SHA256 d1aba5dd546e3776aafb8606a193275bdf69c8c60c7cdc40bef2c022ab2b9635 ChangeLog 6046
+EBUILD vdr-xineliboutput-1.0.0_rc2.ebuild 2139 RMD160 fe736e8a27d34d4a030949c7924ef52d30a64e87 SHA1 23ba18d0fac60afc9f2558622e6f8cf9e03f3c5b SHA256 7946980d1ff92500dbdf2fa68aae2b8c0116b565da1a0f0df6cf88c3a50cba59
+MD5 e84a0d37ddf5a5588a19a47fb5b0c687 vdr-xineliboutput-1.0.0_rc2.ebuild 2139
+RMD160 fe736e8a27d34d4a030949c7924ef52d30a64e87 vdr-xineliboutput-1.0.0_rc2.ebuild 2139
+SHA256 7946980d1ff92500dbdf2fa68aae2b8c0116b565da1a0f0df6cf88c3a50cba59 vdr-xineliboutput-1.0.0_rc2.ebuild 2139
+MISC ChangeLog 6248 RMD160 1faaddfc7e33446328dd5021fff379f4dad72754 SHA1 e350c9a0c7d120fc51cf238a0032fe37f4bccac5 SHA256 33661396418d3d4c191c7a4c353ebf6771b43b4814a9b39239aaf33218429b92
+MD5 a84916c0b6e9c307db363d70e2f78ead ChangeLog 6248
+RMD160 1faaddfc7e33446328dd5021fff379f4dad72754 ChangeLog 6248
+SHA256 33661396418d3d4c191c7a4c353ebf6771b43b4814a9b39239aaf33218429b92 ChangeLog 6248
 MISC metadata.xml 353 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e SHA1 a8466ebe913ea08351d9415bca28ee107e54a7cb SHA256 48731babb71989233956af5f82f8bd1b24625eab7b26493e43d753621c9ec359
 MD5 3ca7be3c0a30822246151344759d8d7e metadata.xml 353
 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e metadata.xml 353
@@ -30,9 +34,10 @@ MD5 be82a3fb0969db05e62c50b64a532e5f files/digest-vdr-xineliboutput-1.0.0_rc2 27
 RMD160 754c74a00dc483dd1d9770a487a314393e043a00 files/digest-vdr-xineliboutput-1.0.0_rc2 271
 SHA256 5eb4a95a21798033d2dfe5bec56b58704c5efd9a48abd906b3391e7743ae742e files/digest-vdr-xineliboutput-1.0.0_rc2 271
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFGUUvst2vP6XvVdOcRAqjQAJ9u9+zECWWjvUhwrYLvlVJy0Ngh7QCfU9Ra
-euY50NE9P13w79wTBSkZMn4=
-=04nP
+iD8DBQFGgV2rdn07HTTCgIoRAqjLAJ9hvopLG2XK1HItmiCxZXGskGqLIACfSCSu
+9zb72clNK0HxflnrodGgLWQ=
+=dq6x
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff
new file mode 100644
index 000000000000..bfb1d5c0db6d
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_xineliboutput-1.0.0rc2-1.5.3.dpatch by Thomas Günther <tom@toms-cafe.de>
+## http://toms-cafe.de/vdr/download/xineliboutput-1.0.0rc2-1.5.3.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.3.
+
+@DPATCH@
+--- xineliboutput-1.0.0~rc2/tools/iconv.h
++++ xineliboutput-1.0.0~rc2/tools/iconv.h
+@@ -40,7 +40,11 @@ cIConv::cIConv(const char *SrcCharset, c
+   if(!SrcCharset)
+     SrcCharset = "UTF-8";
+   if(!DstCharset)
++#if APIVERSNUM >= 10503
++    DstCharset = cCharSetConv::SystemCharacterTable();
++#else
+     DstCharset = I18nCharSets()[Setup.OSDLanguage];
++#endif
+ 
+   m_ic = iconv_open(DstCharset, SrcCharset);
+
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild
index a2657c87c0c1..29955a7b8bde 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.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-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild,v 1.1 2007/05/21 07:36:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild,v 1.2 2007/06/26 18:39:54 hd_brummy Exp $
 
 inherit vdr-plugin eutils multilib
 
@@ -48,6 +48,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/xineliboutput-${MY_PV}
 
 VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
+PATCHES="${FILESDIR}/${P}-vdr-1.5.3.diff"
 
 enable_in_makefile() {
 	local opt