[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-graphtft/files: rc-addon.sh vdr-graphtft-0.1.16_alpha-gentoo.diff graphtft-fe digest-vdr-graphtft-0.1.16_alpha confd

[Joerg Bornkessel (hd_brummy)]

hd_brummy    07/12/23 22:05:11

  Added:                rc-addon.sh vdr-graphtft-0.1.16_alpha-gentoo.diff
                        graphtft-fe digest-vdr-graphtft-0.1.16_alpha confd
  Log:
  initial ebuild, find older versions on overlay vdr-testing; Thanks to T.Kost, T.Dressler, S.Grebe for testing on graphtft-fe part
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  media-plugins/vdr-graphtft/files/rc-addon.sh

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

Index: rc-addon.sh
===================================================================
# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/files/rc-addon.sh,v 1.1 2007/12/23 22:05:10 hd_brummy Exp $
#
# rc-addon-script for plugin graphtft & graphtft-fe
#
# Joerg Bornkessel <hd_brummy@g.o>

plugin_pre_vdr_start() {

		: ${GRAPHTFT_DEVICE:=/dev/fb0}

		add_plugin_param "-d ${GRAPHTFT_DEVICE}"
}



1.1                  media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.16_alpha-gentoo.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.16_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.16_alpha-gentoo.diff?rev=1.1&content-type=text/plain

Index: vdr-graphtft-0.1.16_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());
 



1.1                  media-plugins/vdr-graphtft/files/graphtft-fe

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

Index: graphtft-fe
===================================================================
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

. /etc/conf.d/vdr.graphtft

export DISPLAY=${GRAPHTFT_DISPLAY}

:   ${GRAPHTFT_USER:=root}

OPTIONS="-h ${GRAPHTFT_HOST:=127.0.0.1}"
OPTIONS="${OPTIONS} -p ${GRAPHTFT_PORT:=2039}"
OPTIONS="${OPTIONS} -e ${GRAPHTFT_LOG_LEVEL:=0}"
OPTIONS="${OPTIONS} -W ${GRAPHTFT_SCREEN_WIDTH:=800}"
OPTIONS="${OPTIONS} -H ${GRAPHTFT_SCREEN_HEIGHT:=480}"
[ "${GRAPHTFT_NO_FRAME}" = "yes" ] && OPTIONS="${OPTIONS} -n"
[ "${GRAPHTFT_RESIZE_IMAGE}" = "yes" ] && OPTIONS="${OPTIONS} -r"

# -d <file>       dump each image to file (default off)

start() {
		ebegin "starting graphtft-fe ..."
		start-stop-daemon --make-pidfile --background --pidfile /var/run/graphtft-fe.pid \
        --chuid ${GRAPHTFT_USER} --start --exec /usr/bin/graphtft-fe  -- ${OPTIONS}
		eend $?
}

stop() {
		ebegin "stopping graphtft ..."
		start-stop-daemon --stop --pidfile /var/run/graphtft-fe.pid
		eend $?
}




1.1                  media-plugins/vdr-graphtft/files/digest-vdr-graphtft-0.1.16_alpha

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

Index: digest-vdr-graphtft-0.1.16_alpha
===================================================================
MD5 3ae5def775b37f24b196a6e5bcabc43c DeepBlue-horchi-0.0.6.tar.bz2 1660439
RMD160 8ac510b9a65f8f4becef94519cf77f083709e96e DeepBlue-horchi-0.0.6.tar.bz2 1660439
SHA256 75ca7ea853ae9fc3a30b656ab0f6599bc09c10d371b76990156ad9491ad2c8ee DeepBlue-horchi-0.0.6.tar.bz2 1660439
MD5 677103f302335248e57b0c5dc8678531 vdr-graphtft-0.1.16.alpha.tar.bz2 234797
RMD160 e5a491b480b37480a9c7574cb74bdc2b14113bbe vdr-graphtft-0.1.16.alpha.tar.bz2 234797
SHA256 3ede1f5faeb37add03395a7296fe30ef505eb717c70c2000bfeca383f5b71457 vdr-graphtft-0.1.16.alpha.tar.bz2 234797



1.1                  media-plugins/vdr-graphtft/files/confd

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

Index: confd
===================================================================
# /etc/conf.d/vdr.graphtft
# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/files/confd,v 1.1 2007/12/23 22:05:10 hd_brummy Exp $

####### Global config for Graphtft ####################

#
# set the DIR of the Framebuffer Device
#   allowed values: device_names directFB none
#   default: /dev/fb0
#GRAPHTFT_DEVICE=/dev/fb0 


###### Configuration for graphtft-fe ##################
#
# set GRAPHTFT_DEVICE="" to none 

# set your tft display 
#	no default values
#	default: not set, exemple
#GRAPHTFT_DISPLAY=":0.1" 

# switch to user 
#	default user root ; depand on your x configuration
#
#GRAPHTFT_USER="root"

# set the width of your display
#	allowed values: 
#	default: 800
#GRAPHTFT_SCREEN_WIDTH="800"

# set the height of your display
#	allowed values:
#	default: 480
#GRAPHTFT_SCREEN_HEIGHT="480"

# run output without windowsframe
#	allowed values: yes no
#	default: yes
#GRAPHTFT_NO_FRAME="yes"

# set the IP to your X Display
#	allowed values: ip address
#	default: localhost IP
#GRAPHTFT_HOST="127.0.0.1"

# set the port to your X Display
#	allowed values: portnumber
#	default: 2039
#GRAPHTFT_PORT="2039"

# set the logevel for graphtft-fe
#	allowed values: 0 1 2 3
# 	default: 0
#GRAPHTFT_LOG_LEVEL="0"



-- 
gentoo-commits@g.o mailing list