version bump; cleanup; some cosmetic

(Portage version: 2.1.6.7/cvs/Linux i686)

2 files changed, 139 insertions, 111 deletions

diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-gentoo.diff
deleted file mode 100644
index c3ed929ba3a6..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-gentoo.diff
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -Naur graphtft-0.1.16.alpha.orig/dfbrenderer/dfbrenderer.c graphtft-0.1.16.alpha/dfbrenderer/dfbrenderer.c
---- graphtft-0.1.16.alpha.orig/dfbrenderer/dfbrenderer.c	2007-12-12 20:15:39.223026383 +0100
-+++ graphtft-0.1.16.alpha/dfbrenderer/dfbrenderer.c	2007-12-12 20:17:01.430709769 +0100
-@@ -333,7 +333,7 @@
-       else
-       {
-          const char* tmp = themePath.c_str();
--         asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
-+         asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
-       }
- 
-       tell(4,"creating imageprovider for %s\n", fpath);
-@@ -383,7 +383,7 @@
- 
-    if (!fontCache.Contains(FontFaceSize(fontName, fontSize)))
-    {
--      asprintf(&fpath, "%s/graphTFT/fonts/%s.ttf", confPath.c_str(), fontName);
-+      asprintf(&fpath, "%s/fonts/%s.ttf", confPath.c_str(), fontName);
- 
-       tell(4,"creating font for %s\n", fpath);
- 
-@@ -444,7 +444,7 @@
- 
-    if (!fontCache.Contains(FontFaceSize(font_name, size)))
-    {
--      asprintf(&fpath, "%s/graphTFT/fonts/%s.ttf", confPath.c_str(), font_name);
-+      asprintf(&fpath, "%s/fonts/%s.ttf", confPath.c_str(), font_name);
- 
-       tell(4,"creating font for %s\n", fpath);
- 
-diff -Naur graphtft-0.1.16.alpha.orig/graphtft.c graphtft-0.1.16.alpha/graphtft.c
---- graphtft-0.1.16.alpha.orig/graphtft.c	2007-12-12 20:15:39.246358112 +0100
-+++ graphtft-0.1.16.alpha/graphtft.c	2007-12-12 20:19:52.292300174 +0100
-@@ -20,6 +20,8 @@
- #include <graphtft.h>
- #include <span.h>
- 
-+#define DATA_DIR "/usr/share/vdr/graphTFT"
-+
- //***************************************************************************
- // cGraphTFTMenu
- //***************************************************************************
-@@ -255,14 +257,7 @@
- 
- #endif
- 
--   // try to get the config dir
--
--   if (!ConfigDirectory())
--      return false;
--
--   // init 
--
--   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
-+   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
- 
- #if APIVERSNUM < 10507
-    RegisterI18n(Phrases);
-@@ -278,7 +273,7 @@
-    if (loadThemes() != 0)
-       return false;
- 
--   return display->Init(_dev, ConfigDirectory(), port);
-+   return display->Init(_dev, DATA_DIR, port);
- }
- 
- //***************************************************************************
-@@ -294,8 +289,8 @@
- 
-    // look for the themes in the config directory
- 
--   asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", 
--            ConfigDirectory());
-+   asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort", 
-+            DATA_DIR);
- 
-    p = popen(buffer, "r");
- 
-diff -Naur graphtft-0.1.16.alpha.orig/imlibrenderer/imlibrenderer.c graphtft-0.1.16.alpha/imlibrenderer/imlibrenderer.c
---- graphtft-0.1.16.alpha.orig/imlibrenderer/imlibrenderer.c	2007-12-12 20:15:39.369682970 +0100
-+++ graphtft-0.1.16.alpha/imlibrenderer/imlibrenderer.c	2007-12-12 20:20:35.006031224 +0100
-@@ -53,7 +53,7 @@
-  
-    // font
- 
--   std::ostringstream path; path <<  confPath.c_str() << "/graphTFT/fonts/";
-+   std::ostringstream path; path <<  confPath.c_str() << "/fonts/";
-    imlib_add_path_to_font_path(path.str().c_str());
-   
-    // new image
-@@ -134,7 +134,7 @@
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    new_image = imlib_load_image(path.str().c_str());
- 
-diff -Naur graphtft-0.1.18.alpha.orig/dspitems.c graphtft-0.1.18.alpha/dspitems.c
---- graphtft-0.1.18.alpha.orig/dspitems.c	2008-04-13 20:04:45.855102424 +0200
-+++ graphtft-0.1.18.alpha/dspitems.c	2008-04-13 20:05:41.912312127 +0200
-@@ -697,7 +697,7 @@
-       if (p[0] != '/')
-       {
-          p = string(GraphTFTSetup.PluginConfPath) 
--            + "/graphTFT/themes/" 
-+            + "/themes/" 
-             + string(theTheme->getDir()) 
-             + "/" + p;
-       }
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff
new file mode 100644
index 000000000000..b747b70b01ca
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff
@@ -0,0 +1,139 @@
+# fix some path for gentoo install ( LFH conform )
+# Joerg Bornkessel <hd_brummy@g.o> 24 Mar 2009
+
+diff -Naur graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c graphtft-0.2.2/dfbrenderer/dfbrenderer.c
+--- graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c	2009-03-24 18:15:02.000000000 +0100
++++ graphtft-0.2.2/dfbrenderer/dfbrenderer.c	2009-03-24 18:17:04.000000000 +0100
+@@ -231,7 +231,7 @@
+       {
+          // make path relative to the themes directory
+ 
+-         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
++         asprintf(&path, "%s/themes/%s/%s", 
+                   confPath.c_str(), themePath.c_str(), p.c_str());
+       }
+       else
+@@ -255,7 +255,7 @@
+    
+    // at least add the default path
+ 
+-   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
++   asprintf(&path, "%s/fonts/", confPath.c_str());
+    tell(0, "Info: Adding font path '%s'", path);
+    fontPaths[count] = path;
+    free(path);
+@@ -464,7 +464,7 @@
+    else
+    {
+       const char* tmp = themePath.c_str();
+-      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
++      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
+    }
+ 
+    tell(4,"creating imageprovider for %s\n", fpath);
+@@ -538,7 +538,7 @@
+    else
+    {
+       const char* tmp = themePath.c_str();
+-      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
++      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
+    }
+ 
+    tell(4,"creating imageprovider for %s\n", fpath);
+diff -Naur graphtft-0.2.2.orig/dspitems.c graphtft-0.2.2/dspitems.c
+--- graphtft-0.2.2.orig/dspitems.c	2009-03-24 18:15:02.000000000 +0100
++++ graphtft-0.2.2/dspitems.c	2009-03-24 18:18:06.000000000 +0100
+@@ -108,7 +108,7 @@
+       if (p[0] != '/')
+       {
+          p = string(GraphTFTSetup.PluginConfPath) 
+-            + "/graphTFT/themes/" 
++            + "/themes/" 
+             + string(Thms::theTheme->getDir()) 
+             + "/" + p;
+       }
+diff -Naur graphtft-0.2.2.orig/graphtft.c graphtft-0.2.2/graphtft.c
+--- graphtft-0.2.2.orig/graphtft.c	2009-03-24 18:15:02.000000000 +0100
++++ graphtft-0.2.2/graphtft.c	2009-03-24 18:20:06.000000000 +0100
+@@ -21,6 +21,8 @@
+ #include <graphtft.h>
+ #include <span.h>
+ 
++#define DATA_DIR "/usr/share/vdr/graphTFT"
++
+ //***************************************************************************
+ // cGraphTFTMenu
+ //***************************************************************************
+@@ -261,14 +263,7 @@
+ 
+ #endif
+ 
+-   // try to get the config dir
+-
+-   if (!ConfigDirectory())
+-      return false;
+-
+-   // init 
+-
+-   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
++   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
+ 
+ #if APIVERSNUM < 10507
+    RegisterI18n(Phrases);
+@@ -284,7 +279,7 @@
+    if (loadThemes() != 0)
+       return false;
+ 
+-   if (display->Init(_dev, ConfigDirectory(), port) != success)
++   if (display->Init(_dev, DATA_DIR, port) != success)
+    {
+       tell(0, "Error: Initializing graphTFT device faild, aborting!");
+ 
+@@ -308,7 +303,7 @@
+    // look for the themes in the config directory
+ 
+    asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", 
+-            ConfigDirectory());
++            DATA_DIR);
+ 
+    p = popen(buffer, "r");
+ 
+diff -Naur graphtft-0.2.2.orig/imlibrenderer/imlibrenderer.c graphtft-0.2.2/imlibrenderer/imlibrenderer.c
+--- graphtft-0.2.2.orig/imlibrenderer/imlibrenderer.c	2009-03-24 18:15:02.000000000 +0100
++++ graphtft-0.2.2/imlibrenderer/imlibrenderer.c	2009-03-24 18:21:03.000000000 +0100
+@@ -107,7 +107,7 @@
+       {
+          // make path relative to the themes directory
+ 
+-         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
++         asprintf(&path, "%s/themes/%s/%s", 
+                   confPath.c_str(), themePath.c_str(), p.c_str());
+       }
+       else
+@@ -130,7 +130,7 @@
+    
+    // at least add the default path
+ 
+-   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
++   asprintf(&path, "%s/fonts/", confPath.c_str());
+    tell(0, "Info: Adding font path '%s'", path);
+    imlib_add_path_to_font_path(path);
+    free(path);
+@@ -201,7 +201,7 @@
+    if (fname[0] == '/')
+       path << fname;
+    else
+-      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
++      path << confPath << "/themes/" << themePath << "/" << fname; 
+ 
+    if (!fileExists(path.str().c_str()))
+    { 
+@@ -273,7 +273,7 @@
+    if (fname[0] == '/')
+       path << fname;
+    else
+-      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
++      path << confPath << "/themes/" << themePath << "/" << fname; 
+ 
+    if (!fileExists(path.str().c_str()))
+    {