Added patches to make it compile with vdr-1.5.7

Package-Manager: portage-2.1.3.6

6 files changed, 203 insertions, 15 deletions

diff --git a/media-plugins/vdr-text2skin/ChangeLog b/media-plugins/vdr-text2skin/ChangeLog
index cd9e0e2f949e..d72fdbbe7b85 100644
--- a/media-plugins/vdr-text2skin/ChangeLog
+++ b/media-plugins/vdr-text2skin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-text2skin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.1 2007/05/15 14:12:32 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.2 2007/08/19 12:13:11 zzam Exp $
+
+  19 Aug 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/20070506/05_vdr-1.5.4.diff, +files/20070506/06_vdr-1.5.7.diff,
+  files/20070506/series, vdr-text2skin-1.0.20070506.ebuild:
+  Added patches to make it compile with vdr-1.5.7
 
 *vdr-text2skin-1.0.20070506 (15 May 2007)
 
diff --git a/media-plugins/vdr-text2skin/Manifest b/media-plugins/vdr-text2skin/Manifest
index b4d6c1214793..0943865d5147 100644
--- a/media-plugins/vdr-text2skin/Manifest
+++ b/media-plugins/vdr-text2skin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 20070506/01_gcc-4.diff 1855 RMD160 0f91d9e4355a0daeb3b2a179816bfcbe0a448c1a SHA1 6a9a7848d5fb424505c16d7a60e91bed7928b95c SHA256 469cd4f775a11da21a23e2799c886f5c6b173a5f9504b4c401559954860f6bc8
 MD5 6d9f3425465a1a298c5d4f2314c6be7e files/20070506/01_gcc-4.diff 1855
 RMD160 0f91d9e4355a0daeb3b2a179816bfcbe0a448c1a files/20070506/01_gcc-4.diff 1855
@@ -14,19 +17,27 @@ AUX 20070506/04_no_direct_blit.diff 440 RMD160 101738bd5ac6359deb016965d6cf3024e
 MD5 00745d482462ef3588eaf39d77f2b40c files/20070506/04_no_direct_blit.diff 440
 RMD160 101738bd5ac6359deb016965d6cf3024e6a2efe2 files/20070506/04_no_direct_blit.diff 440
 SHA256 c4cdabc7e629cf71c8e6cd15dbc548e1997352c75065ad7809b3c0b84fda22b0 files/20070506/04_no_direct_blit.diff 440
-AUX 20070506/series 67 RMD160 55b0d0d074267b75d5e72eccf5135579a38739da SHA1 1f97b7615b2009f8275dff260bed9c9fce2df89c SHA256 4cc3f3e8813016eb749c2c102c3aec8a17ca7c960be29903f598bd07431f9fad
-MD5 a19fcb397ad8cdeb2db4e3d4177a1d83 files/20070506/series 67
-RMD160 55b0d0d074267b75d5e72eccf5135579a38739da files/20070506/series 67
-SHA256 4cc3f3e8813016eb749c2c102c3aec8a17ca7c960be29903f598bd07431f9fad files/20070506/series 67
+AUX 20070506/05_vdr-1.5.4.diff 1815 RMD160 6caa9d437a25a3ff3131c4af517f142dc4a2a2de SHA1 9c24a0ba573d3a9ef293e7f8d1fa1c226a04b91a SHA256 98c1a1dccf9c6a83b5410a791ed7b6b3a3fb59843359168147f1cf51417341a1
+MD5 a832d729eb3c2b4672176ad2a425f5d2 files/20070506/05_vdr-1.5.4.diff 1815
+RMD160 6caa9d437a25a3ff3131c4af517f142dc4a2a2de files/20070506/05_vdr-1.5.4.diff 1815
+SHA256 98c1a1dccf9c6a83b5410a791ed7b6b3a3fb59843359168147f1cf51417341a1 files/20070506/05_vdr-1.5.4.diff 1815
+AUX 20070506/06_vdr-1.5.7.diff 3122 RMD160 9afd5c427501d75aea76edb50280ad447ca1b8b8 SHA1 a904d4f856757df4dc268fe1911bebafc332fdcb SHA256 2033f10e2f5db48b4cca558ac344324930fc15406992383e706f1a13299e0178
+MD5 bb305e6320bbe5f549c420162a24f9fc files/20070506/06_vdr-1.5.7.diff 3122
+RMD160 9afd5c427501d75aea76edb50280ad447ca1b8b8 files/20070506/06_vdr-1.5.7.diff 3122
+SHA256 2033f10e2f5db48b4cca558ac344324930fc15406992383e706f1a13299e0178 files/20070506/06_vdr-1.5.7.diff 3122
+AUX 20070506/series 103 RMD160 9dfa6935af03ec681ab2865732f06b625f5f5c5c SHA1 d2dd914a6f2800b65862afddc9c72c614d4a0217 SHA256 5b90bb703eb4bb6601def782f04a38970a54a6913ffebcf73db0143eb7a519b2
+MD5 acd7e1374ddf6379623cb4dc7e0654cf files/20070506/series 103
+RMD160 9dfa6935af03ec681ab2865732f06b625f5f5c5c files/20070506/series 103
+SHA256 5b90bb703eb4bb6601def782f04a38970a54a6913ffebcf73db0143eb7a519b2 files/20070506/series 103
 DIST text2skin-1.1-cvs_ext-0.10-patched-20070506.tar.bz2 81003 RMD160 536b22e3d61ee9978319dd301b5360f220fc3b3d SHA1 a9efacdd26a03ae39234cb3c7772509802ae7e13 SHA256 e1e6314a14568402e75c9b9fb5a81d76877d22e37c81ff102c380fdaed676d0f
-EBUILD vdr-text2skin-1.0.20070506.ebuild 1344 RMD160 0eafca699c21dab0026b6dd84c8c9b3bf77ab3b0 SHA1 545852d4dc11e86ea026bdea0d881033d63df215 SHA256 eafdc15bb9d3764fee2793fe22910762ff74be2cd46cd64f36b622b432e0d91a
-MD5 ee041c22fe51d41209108f7acf6d8f6b vdr-text2skin-1.0.20070506.ebuild 1344
-RMD160 0eafca699c21dab0026b6dd84c8c9b3bf77ab3b0 vdr-text2skin-1.0.20070506.ebuild 1344
-SHA256 eafdc15bb9d3764fee2793fe22910762ff74be2cd46cd64f36b622b432e0d91a vdr-text2skin-1.0.20070506.ebuild 1344
-MISC ChangeLog 640 RMD160 a3d7e808ac0da756a0653bb41653cb685944499a SHA1 cfd6432be76868ea93ee30235705b88bd0b4f826 SHA256 1ea82fc4c92a54d00ef1590090399da42ce14b46f724017dfc929ab187e69cde
-MD5 1fa46a0b7d1e7990df5a150c6949f7c8 ChangeLog 640
-RMD160 a3d7e808ac0da756a0653bb41653cb685944499a ChangeLog 640
-SHA256 1ea82fc4c92a54d00ef1590090399da42ce14b46f724017dfc929ab187e69cde ChangeLog 640
+EBUILD vdr-text2skin-1.0.20070506.ebuild 1421 RMD160 83bf30cae794b171bba7e72ea9f95946dc14893a SHA1 e3f321b5202797636348ebb775053e67c9602a5a SHA256 1785affb299237d6e5fe4b2516d2264d9606866524f8bfe1b08a8763ff4fbb69
+MD5 b0fd3c9e45249ae39550f709a6fe0ffa vdr-text2skin-1.0.20070506.ebuild 1421
+RMD160 83bf30cae794b171bba7e72ea9f95946dc14893a vdr-text2skin-1.0.20070506.ebuild 1421
+SHA256 1785affb299237d6e5fe4b2516d2264d9606866524f8bfe1b08a8763ff4fbb69 vdr-text2skin-1.0.20070506.ebuild 1421
+MISC ChangeLog 876 RMD160 9dcd6f68aeaca4a2d7baa7ee42ec7e4494861f81 SHA1 eb05fad9878bebad8baa076d306c174ebd5cb85d SHA256 ac1ff126082e6c41d074b5e3ed2c9b112d9da2eccd6b4238bfd9746de72dd377
+MD5 91f55dfe07383f84d17a05428f02dacf ChangeLog 876
+RMD160 9dcd6f68aeaca4a2d7baa7ee42ec7e4494861f81 ChangeLog 876
+SHA256 ac1ff126082e6c41d074b5e3ed2c9b112d9da2eccd6b4238bfd9746de72dd377 ChangeLog 876
 MISC metadata.xml 254 RMD160 f04eaf436b177162c4bc30410e0be18c10aa7eb8 SHA1 0eb18080a9e96806e546958b2f13a3ec24288d21 SHA256 8071ffd41e5c7bd3f22bd02b1bc6b2967a6b53836836ede58a62a99eddea2b9b
 MD5 991bfee1cf6c6f64dbe97f2c1209cf36 metadata.xml 254
 RMD160 f04eaf436b177162c4bc30410e0be18c10aa7eb8 metadata.xml 254
@@ -34,3 +45,10 @@ SHA256 8071ffd41e5c7bd3f22bd02b1bc6b2967a6b53836836ede58a62a99eddea2b9b metadata
 MD5 8d60dc6cb58c25b9e769db4ff7f60ed7 files/digest-vdr-text2skin-1.0.20070506 331
 RMD160 817bde9b2e5559bcc254c08e8add52cd1f0cdc3c files/digest-vdr-text2skin-1.0.20070506 331
 SHA256 57dad08e6025e0daf3493a379daaf229cc79bbde8dd81e1272c85146d43b6618 files/digest-vdr-text2skin-1.0.20070506 331
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFGyDPet2vP6XvVdOcRAohJAJ9VrkPTOp/uIBwFxvEIsMCHcDp4iACg0/lD
+Cn5YqcAK4RyKyOChDIu7FaM=
+=qWBN
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-text2skin/files/20070506/05_vdr-1.5.4.diff b/media-plugins/vdr-text2skin/files/20070506/05_vdr-1.5.4.diff
new file mode 100644
index 000000000000..8269ca01701a
--- /dev/null
+++ b/media-plugins/vdr-text2skin/files/20070506/05_vdr-1.5.4.diff
@@ -0,0 +1,66 @@
+Index: text2skin-1.1-cvs_ext-0.10/graphtft/font.c
+===================================================================
+--- text2skin-1.1-cvs_ext-0.10.orig/graphtft/font.c
++++ text2skin-1.1-cvs_ext-0.10/graphtft/font.c
+@@ -38,6 +38,15 @@ cGraphtftFont::~cGraphtftFont()
+ 
+ bool cGraphtftFont::Load(string Filename, string CacheName, int Size, int Language, int Width, int format)
+ {
++#if VDRVERSNUM >= 10507
++    if ( _cache.find(CacheName) != _cache.end() )
++        return true;
++    cFont* newFont = cFont::CreateFont(Filename.c_str(), Size);
++    if ( newFont == NULL )
++        return false;
++    _cache[CacheName] = newFont;
++    return true;
++#else
+ 	if ( _cache.find(CacheName) != _cache.end() )
+ 		return true;	
+ 	
+@@ -187,6 +196,7 @@ bool cGraphtftFont::Load(string Filename
+ 	delete(font_data);
+ 	// Something went wrong!
+ 	return false;
++#endif
+ }
+ 
+ const cFont* cGraphtftFont::GetFont(string CacheName){
+@@ -209,11 +219,13 @@ void cGraphtftFont::Clear()
+ 	for (; it != _cache.end(); ++it)
+ 		delete((*it).second);
+ 	_cache.clear();
++#if VDRVERSNUM < 10507
+ 
+ 	del_map::iterator del_it = _del.begin();
+ 	for (; del_it != _del.end(); ++del_it)
+ 		delete((*del_it).second);
+ 	_del.clear();
++#endif
+ }
+ 				
+ cGraphtftFont GraphtftFont;
+Index: text2skin-1.1-cvs_ext-0.10/graphtft/font.h
+===================================================================
+--- text2skin-1.1-cvs_ext-0.10.orig/graphtft/font.h
++++ text2skin-1.1-cvs_ext-0.10/graphtft/font.h
+@@ -24,7 +24,9 @@ class cGraphtftFont
+ {
+ private:
+ 	typedef map<string,cFont*> cache_map;
++#if VDRVERSNUM < 10507
+ 	typedef map<string,cFont::tPixelData*> del_map;
++#endif
+ 	
+ public:
+ 	cGraphtftFont();
+@@ -40,7 +42,9 @@ private:
+ 	FT_Face			_face;
+ 	FT_GlyphSlot		_slot;
+ 	cache_map 		_cache;
++#if VDRVERSNUM < 10507
+ 	del_map			_del;
++#endif
+ 
+ };
+ 
diff --git a/media-plugins/vdr-text2skin/files/20070506/06_vdr-1.5.7.diff b/media-plugins/vdr-text2skin/files/20070506/06_vdr-1.5.7.diff
new file mode 100644
index 000000000000..7728fa337915
--- /dev/null
+++ b/media-plugins/vdr-text2skin/files/20070506/06_vdr-1.5.7.diff
@@ -0,0 +1,94 @@
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/font.c.orig	2007-08-13 08:54:41.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/font.c	2007-08-13 09:17:43.000000000 -0700
+@@ -31,8 +31,13 @@
+ 	const cFont *res = NULL;
+ #ifdef HAVE_FREETYPE
+ 	char *cachename;
++#if VDRVERSNUM >= 10507
++	asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, I18nCurrentLanguage());
++	if (mFontCache.Load(Path + "/" + Filename, cachename, Size, I18nCurrentLanguage(), Width))
++#else
+ 	asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, Setup.OSDLanguage);
+ 	if (mFontCache.Load(Path + "/" + Filename, cachename, Size, Setup.OSDLanguage, Width))
++#endif
+ 		res = mFontCache.GetFont(cachename);
+ 	else
+ 		esyslog("ERROR: Text2Skin: Couldn't load font %s:%d", Filename.c_str(), Size);
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c.orig	2007-08-13 07:34:10.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c	2007-08-13 08:53:31.000000000 -0700
+@@ -491,7 +491,11 @@
+ 
+ cText2SkinI18n::~cText2SkinI18n() {
+ 	for (int i = 0; mPhrases[i][0]; ++i) {
++#if VDRVERSNUM >= 10507
++		for (int j = 0; j < I18nLanguages()->Size(); ++j)
++#else
+ 		for (int j = 0; j < I18nNumLanguages; ++j)
++#endif
+ 			free((void*)mPhrases[i][j]);
+ 	}
+ 	free(mPhrases);
+@@ -507,7 +511,11 @@
+ 			memset(&p, 0, sizeof(tI18nPhrase));
+ 			Text += 17;
+ 
++#if VDRVERSNUM >= 10507
++			for (i = 0; i < I18nLanguages()->Size(); ++i) {
++#else
+ 			for (i = 0; i < I18nNumLanguages; ++i) {
++#endif
+ 				char *langs = strdup(I18nLanguageCode(i));
+ 				char *ptr = langs, *ep;
+ 				std::string text;
+@@ -525,7 +533,11 @@
+ 			}
+ 
+ 			int idx = mNumPhrases++;
++#if VDRVERSNUM >= 10507
++			for (i = 0; i < I18nLanguages()->Size(); ++i)
++#else
+ 			for (i = 0; i < I18nNumLanguages; ++i)
++#endif
+ 				if (!p[i]) p[i] = "";
+ 			mPhrases = (tI18nPhrase*)realloc(mPhrases, (mNumPhrases + 1) * sizeof(tI18nPhrase));
+ 			memcpy(mPhrases[idx], p, sizeof(tI18nPhrase));
+@@ -539,7 +551,9 @@
+ 
+ bool cText2SkinI18n::Load(const std::string &Filename) {
+ 	if (cText2SkinFile::Load(Filename)) {
++#if VDRVERSNUM <= 10506
+ 		I18nRegister(mPhrases, mIdentity.c_str());
++#endif
+ 		return true;
+ 	}
+ 	return false;
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/status.c.orig	2007-08-13 09:54:04.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/status.c	2007-08-13 09:57:10.000000000 -0700
+@@ -130,8 +130,13 @@
+ 
+ void cText2SkinStatus::OsdClear(void) 
+ {
++#if VDRVERSNUM >= 10507
++	if (I18nCurrentLanguage() != mLastLanguage) {
++		mLastLanguage = I18nCurrentLanguage();
++#else
+ 	if (Setup.OSDLanguage != mLastLanguage) {
+ 		mLastLanguage = Setup.OSDLanguage;
++#endif
+ 		cxString::Reparse();
+ 	}
+ 	
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c.orig	2007-08-13 09:46:25.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c	2007-08-13 10:30:11.000000000 -0700
+@@ -49,7 +49,11 @@
+ 
+ bool cText2SkinPlugin::Start(void) {
+ 	RegisterI18n(Phrases);
++#if VDRVERSNUM >= 10507
++	Text2SkinStatus.SetLanguage(I18nCurrentLanguage());
++#else
+ 	Text2SkinStatus.SetLanguage(Setup.OSDLanguage);
++#endif
+ 	cText2SkinLoader::Start();
+ 	return true;
+ }
diff --git a/media-plugins/vdr-text2skin/files/20070506/series b/media-plugins/vdr-text2skin/files/20070506/series
index 951062a93e72..d163a73f63ab 100644
--- a/media-plugins/vdr-text2skin/files/20070506/series
+++ b/media-plugins/vdr-text2skin/files/20070506/series
@@ -2,3 +2,5 @@
 02_uint64.diff
 03_gentoo.diff
 04_no_direct_blit.diff
+05_vdr-1.5.4.diff
+06_vdr-1.5.7.diff
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild
index 068e58f3be8b..8e67634b6915 100644
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild
+++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.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-text2skin/vdr-text2skin-1.0.20070506.ebuild,v 1.3 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild,v 1.4 2007/08/19 12:13:11 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -25,7 +25,10 @@ DEPEND=">=media-video/vdr-1.3.18
 PATCHES="
 	${FILESDIR}/${MY_PV}/01_gcc-4.diff
 	${FILESDIR}/${MY_PV}/02_uint64.diff
-	${FILESDIR}/${MY_PV}/03_gentoo.diff"
+	${FILESDIR}/${MY_PV}/03_gentoo.diff
+	${FILESDIR}/${MY_PV}/05_vdr-1.5.4.diff
+	${FILESDIR}/${MY_PV}/06_vdr-1.5.7.diff
+	"
 
 S="${WORKDIR}/${MY_BASE}"