r4900 - in /vdr/vdr-plugin-text2skin/trunk/debian: ./ patches/

[tom-guest at users.alioth.debian.org]

Author: tom-guest
Date: Wed Jun 27 23:49:39 2007
New Revision: 4900

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=4900
Log:
Release for vdrdevel 1.5.5

Added:
    vdr/vdr-plugin-text2skin/trunk/debian/patches/94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4.dpatch
Modified:
    vdr/vdr-plugin-text2skin/trunk/debian/changelog
    vdr/vdr-plugin-text2skin/trunk/debian/patches/00list
    vdr/vdr-plugin-text2skin/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch   (props changed)
    vdr/vdr-plugin-text2skin/trunk/debian/patches/90_APIVERSION.dpatch   (props changed)
    vdr/vdr-plugin-text2skin/trunk/debian/patches/91_cvs-20051107.dpatch   (props changed)
    vdr/vdr-plugin-text2skin/trunk/debian/patches/92_vdr-1.3.38.dpatch   (props changed)
    vdr/vdr-plugin-text2skin/trunk/debian/patches/93_libfreetype6-2.2.1.dpatch   (props changed)

Modified: vdr/vdr-plugin-text2skin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/changelog?rev=4900&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/changelog Wed Jun 27 23:49:39 2007
@@ -1,10 +1,15 @@
-vdr-plugin-text2skin (1.0+cvs20050618-28) UNRELEASED; urgency=low
-
+vdr-plugin-text2skin (1.0+cvs20050618-28) experimental; urgency=low
+
+  [ Thomas Schmidt ]
   * Added XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control
   * Removed version from Build-Dependancy to dpatch - even Sarge has the
     required version
 
- -- Thomas Schmidt <tschmidt at debian.org>  Wed, 16 May 2007 23:40:11 +0200
+  [ Thomas Günther ]
+  * Release for vdrdevel 1.5.5
+  * Added 94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu, 28 Jun 2007 00:34:58 +0200
 
 vdr-plugin-text2skin (1.0+cvs20050618-27) experimental; urgency=low
 

Modified: vdr/vdr-plugin-text2skin/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/patches/00list?rev=4900&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/00list Wed Jun 27 23:49:39 2007
@@ -4,3 +4,4 @@
 91_cvs-20051107
 92_vdr-1.3.38
 93_libfreetype6-2.2.1
+94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4

Propchange: vdr/vdr-plugin-text2skin/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
            ('svn:executable' removed)

Propchange: vdr/vdr-plugin-text2skin/trunk/debian/patches/90_APIVERSION.dpatch
            ('svn:executable' removed)

Propchange: vdr/vdr-plugin-text2skin/trunk/debian/patches/91_cvs-20051107.dpatch
            ('svn:executable' removed)

Propchange: vdr/vdr-plugin-text2skin/trunk/debian/patches/92_vdr-1.3.38.dpatch
            ('svn:executable' removed)

Propchange: vdr/vdr-plugin-text2skin/trunk/debian/patches/93_libfreetype6-2.2.1.dpatch
            ('svn:executable' removed)

Added: vdr/vdr-plugin-text2skin/trunk/debian/patches/94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/patches/94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4.dpatch?rev=4900&op=file
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4.dpatch (added)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4.dpatch Wed Jun 27 23:49:39 2007
@@ -1,0 +1,73 @@
+#! /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.
+
+ at 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
+ 
+ };
+