* [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-graphtft/files: vdr-graphtft-0.3.4_gcc-4.4.x.diff vdr-graphtft-0.3.4_gentoo.diff vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch
@ 2012-03-12 17:22 Joerg Bornkessel (hd_brummy)
0 siblings, 0 replies; only message in thread
From: Joerg Bornkessel (hd_brummy) @ 2012-03-12 17:22 UTC (permalink / raw
To: gentoo-commits
hd_brummy 12/03/12 17:22:31
Added: vdr-graphtft-0.3.4_gcc-4.4.x.diff
vdr-graphtft-0.3.4_gentoo.diff
vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch
Log:
bump; rev 30 is not offiziell released, but is tagged as 0.3.4 in svn
(Portage version: 2.1.10.11/cvs/Linux i686)
Revision Changes Path
1.1 media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gcc-4.4.x.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gcc-4.4.x.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gcc-4.4.x.diff?rev=1.1&content-type=text/plain
Index: vdr-graphtft-0.3.4_gcc-4.4.x.diff
===================================================================
diff -Naur graphtft-30.orig/graphtft-fe/common.cc graphtft-30/graphtft-fe/common.cc
--- graphtft-30.orig/graphtft-fe/common.cc 2012-03-12 02:10:38.000000000 +0100
+++ graphtft-30/graphtft-fe/common.cc 2012-03-12 02:30:16.000000000 +0100
@@ -11,6 +11,7 @@
#include <time.h>
#include <stdio.h>
#include <string.h>
+#include <stdint.h>
#include <graphtft.hpp>
diff -Naur graphtft-30.orig/graphtft-fe/graphtft.hpp graphtft-30/graphtft-fe/graphtft.hpp
--- graphtft-30.orig/graphtft-fe/graphtft.hpp 2012-03-12 02:10:38.000000000 +0100
+++ graphtft-30/graphtft-fe/graphtft.hpp 2012-03-12 02:30:57.000000000 +0100
@@ -16,6 +16,7 @@
#include <X11/Xlib.h>
#include <Imlib2.h>
#include <string.h>
+#include <stdint.h>
#define __FRONTEND
#include <../common.h>
1.1 media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gentoo.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gentoo.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_gentoo.diff?rev=1.1&content-type=text/plain
Index: vdr-graphtft-0.3.4_gentoo.diff
===================================================================
diff -Naur graphtft-30.orig/dfbrenderer/dfbrenderer.c graphtft-30/dfbrenderer/dfbrenderer.c
--- graphtft-30.orig/dfbrenderer/dfbrenderer.c 2012-03-12 03:27:38.000000000 +0100
+++ graphtft-30/dfbrenderer/dfbrenderer.c 2012-03-12 03:29:35.000000000 +0100
@@ -257,7 +257,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
@@ -281,7 +281,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);
@@ -483,7 +483,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", fpath);
@@ -561,7 +561,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", fpath);
diff -Naur graphtft-30.orig/dspitems.c graphtft-30/dspitems.c
--- graphtft-30.orig/dspitems.c 2012-03-12 03:27:38.000000000 +0100
+++ graphtft-30/dspitems.c 2012-03-12 03:30:16.000000000 +0100
@@ -107,7 +107,7 @@
if (p[0] != '/')
{
p = string(GraphTFTSetup.PluginConfPath)
- + "/graphTFT/themes/"
+ + "/themes/"
+ string(Thms::theTheme->getDir())
+ "/" + p;
}
diff -Naur graphtft-30.orig/graphtft.c graphtft-30/graphtft.c
--- graphtft-30.orig/graphtft.c 2012-03-12 03:27:38.000000000 +0100
+++ graphtft-30/graphtft.c 2012-03-12 03:32:48.000000000 +0100
@@ -22,6 +22,8 @@
#include <graphtft.h>
#include <span.h>
+#define DATA_DIR "/usr/share/vdr/graphTFT"
+
//***************************************************************************
// cGraphTFTMenu
//***************************************************************************
@@ -300,13 +302,13 @@
// try to get the config dir
- if (!ConfigDirectory())
- return false;
+// if (!ConfigDirectory())
+// return false;
// init
GraphTFTSetup.setClient(this);
- GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
+ GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
#if APIVERSNUM < 10507
RegisterI18n(Phrases);
@@ -322,7 +324,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!");
@@ -355,8 +357,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-30.orig/imlibrenderer/imlibrenderer.c graphtft-30/imlibrenderer/imlibrenderer.c
--- graphtft-30.orig/imlibrenderer/imlibrenderer.c 2012-03-12 03:27:38.000000000 +0100
+++ graphtft-30/imlibrenderer/imlibrenderer.c 2012-03-12 03:33:54.000000000 +0100
@@ -123,7 +123,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
@@ -146,7 +146,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);
@@ -217,7 +217,7 @@
if (fname[0] == '/')
path << fname;
else
- path << confPath << "/graphTFT/themes/" << themePath << "/" << fname;
+ path << confPath << "/themes/" << themePath << "/" << fname;
if (!fileExists(path.str().c_str()))
{
@@ -291,7 +291,7 @@
if (fname[0] == '/')
path << fname;
else
- path << confPath << "/graphTFT/themes/" << themePath << "/" << fname;
+ path << confPath << "/themes/" << themePath << "/" << fname;
if (!fileExists(path.str().c_str()))
{
1.1 media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch?rev=1.1&content-type=text/plain
Index: vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch
===================================================================
--- graphtft-0.3.4/display.c.orig 2011-10-18 10:55:14.000000000 +0200
+++ graphtft-0.3.4/display.c 2012-03-11 11:52:32.545415663 +0100
@@ -931,12 +931,15 @@
// Osd Channel Switch
//***************************************************************************
-void cGraphTFTDisplay::ChannelSwitch(const cDevice* Device, int ChannelNumber)
-{
+#if VDRVERSNUM >= 10726
+void cGraphTFTDisplay::ChannelSwitch(const cDevice* Device, int ChannelNumber, bool LiveView) {
+#else
+void cGraphTFTDisplay::ChannelSwitch(const cDevice* Device, int ChannelNumber) {
+ bool LiveView = Device && Device->IsPrimaryDevice() && !EITScanner.UsesDevice(Device);
+#endif
tell(5, "ChannelSwitch on %p: %d", Device, ChannelNumber);
- if (Device->IsPrimaryDevice()
- && !EITScanner.UsesDevice(Device)
+ if (LiveView
&& _channel != ChannelNumber
&& cDevice::CurrentChannel() != _channel)
{
--- graphtft-0.3.4/display.h.orig 2011-10-18 10:55:14.000000000 +0200
+++ graphtft-0.3.4/display.h 2012-03-11 11:57:28.705392921 +0100
@@ -348,7 +348,11 @@
// status interface
+#if VDRVERSNUM >= 10726
+ virtual void ChannelSwitch(const cDevice* Device, int ChannelNumber, bool LiveView);
+#else
virtual void ChannelSwitch(const cDevice* Device, int ChannelNumber);
+#endif
virtual void OsdSetEvent(const cEvent* event);
virtual void OsdSetRecording(const cRecording* recording);
virtual void OsdChannel(const char* Text);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-12 17:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-12 17:22 [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-graphtft/files: vdr-graphtft-0.3.4_gcc-4.4.x.diff vdr-graphtft-0.3.4_gentoo.diff vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch Joerg Bornkessel (hd_brummy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox