#! /bin/sh /usr/share/dpatch/dpatch-run
## 94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4.dpatch by Stone <syphyr@gmail.com>
##
## Thomas Günther <tom@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
 
 };