[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-graphtft/files: vdr-graphtft-0.1.18_alpha-gentoo.diff

[Joerg Bornkessel (hd_brummy)]

hd_brummy    08/04/13 19:01:40

  Added:                vdr-graphtft-0.1.18_alpha-gentoo.diff
  Log:
  version bump; bug 217176 fixed; bug 217518 fixed
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-gentoo.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-gentoo.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-gentoo.diff?rev=1.1&content-type=text/plain

Index: vdr-graphtft-0.1.18_alpha-gentoo.diff
===================================================================
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;
       }



-- 
gentoo-commits@l.g.o mailing list