rpms/vdr-text2skin/devel vdr-text2skin-1.1cvs-vdr154.patch, NONE, 1.1 vdr-text2skin-1.1cvs-vdr157.patch, NONE, 1.1 vdr-text2skin.spec, 1.4, 1.5

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/vdr-text2skin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30936

Modified Files:
	vdr-text2skin.spec 
Added Files:
	vdr-text2skin-1.1cvs-vdr154.patch 
	vdr-text2skin-1.1cvs-vdr157.patch 
Log Message:
* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-22.20051217cvs
- Apply VDR 1.5+ patches from e-tobi.net Debian package.


vdr-text2skin-1.1cvs-vdr154.patch:

--- NEW FILE vdr-text2skin-1.1cvs-vdr154.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4.dpatch by Stone <syphyr at gmail.com>
##
## Thomas Günther <tom at toms-cafe.de>
##   - Added compatibility to VDR < 1.5.4
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Changes for VDR >= 1.5.4.

@DPATCH@
--- text2skin/graphtft/font.c
+++ text2skin/graphtft/font.c
@@ -41,6 +41,7 @@
 	if ( _cache.find(CacheName) != _cache.end() )
 		return true;	
 	
+#if VDRVERSNUM < 10503
 	int error = FT_New_Face(_library, Filename.c_str(), format, &_face);
 
 	// every thing ok?
@@ -187,6 +188,17 @@
 	delete(font_data);
 	// Something went wrong!
 	return false;
+#else
+#if VDRVERSNUM < 10504
+	cFont* newFont = new cFreetypeFont(*AddDirectory(FONTDIR, Filename.c_str()), Size);
+#else
+	cFont* newFont = cFont::CreateFont(Filename.c_str(), Size);
+#endif
+	if ( newFont == NULL )
+		return false;
+	_cache[CacheName] = newFont;
+	return true;
+#endif
 }
 
 const cFont* cGraphtftFont::GetFont(string CacheName){
@@ -210,10 +222,12 @@
 		delete((*it).second);
 	_cache.clear();
 
+#if VDRVERSNUM < 10503
 	del_map::iterator del_it = _del.begin();
 	for (; del_it != _del.end(); ++del_it)
 		delete((*del_it).second);
 	_del.clear();
+#endif
 }
 				
 cGraphtftFont GraphtftFont;
--- text2skin/graphtft/font.h
+++ text2skin/graphtft/font.h
@@ -24,7 +24,9 @@
 {
 private:
 	typedef map<string,cFont*> cache_map;
+#if VDRVERSNUM < 10503
 	typedef map<string,cFont::tPixelData*> del_map;
+#endif
 	
 public:
 	cGraphtftFont();
@@ -40,7 +42,9 @@
 	FT_Face			_face;
 	FT_GlyphSlot		_slot;
 	cache_map 		_cache;
+#if VDRVERSNUM < 10503
 	del_map			_del;
+#endif
 
 };
 

vdr-text2skin-1.1cvs-vdr157.patch:

--- NEW FILE vdr-text2skin-1.1cvs-vdr157.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch by Stone <syphyr at gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Changes for VDR >= 1.5.7.

@DPATCH@
--- 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;
 }


Index: vdr-text2skin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/vdr-text2skin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vdr-text2skin.spec	6 Jan 2008 18:34:02 -0000	1.4
+++ vdr-text2skin.spec	6 Apr 2008 18:22:41 -0000	1.5
@@ -8,7 +8,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.1
-Release:        21.%{cvs}cvs%{?dist}
+Release:        22.%{cvs}cvs%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
@@ -21,6 +21,8 @@
 Patch1:         %{name}-1.1cvs-freetype22.patch
 Patch2:         %{name}-1.1cvs-skindir.patch
 Patch3:         %{name}-1.1cvs-includes.patch
+Patch4:         %{name}-1.1cvs-vdr154.patch
+Patch5:         %{name}-1.1cvs-vdr157.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?_with_imagemagick:1}
@@ -47,19 +49,28 @@
 
 %prep
 %setup -q -c
+
 cd text2skin
+
 %patch0 -p0
 %patch1 -p0
 sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH2} | patch -p1
 %patch3 -p0
+%patch4 -p1
+%patch5 -p1
+
 find . -depth -type d -name CVS | xargs rm -r
+
 for f in HISTORY README.de Docs/*.txt ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 done
+
 chmod -x contrib/*.pl
+
 sed -i -e /strip/d -e /O2/d Makefile
 sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)\(/linux\)\?/include||g' Makefile
 sed -i -e s/VDRVERSION/APIVERSION/g Makefile
+
 cd ..
 
 
@@ -73,12 +84,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 cd text2skin
 install -dm 755 $RPM_BUILD_ROOT%{plugindir}
 install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
+cd ..
+
 install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-cd ..
+
 install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin/fonts
 
 
@@ -106,6 +120,9 @@
 
 
 %changelog
+* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-22.20051217cvs
+- Apply VDR 1.5+ patches from e-tobi.net Debian package.
+
 * Fri Jan  4 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-21.20051217cvs
 - Fix build with gcc 4.3's cleaned up C++ headers.