Hi!
Here are the patches we already added to Gentoo's plugin-ebuilds.
Matthias
--
Matthias Schwarzott
Gentoo Developer
http://www.gentoo.org
diff -ru control-0.0.2a-orig/gateway.c control-0.0.2a/gateway.c
--- control-0.0.2a-orig/gateway.c 2006-12-03 16:44:46.170845357 +0100
+++ control-0.0.2a/gateway.c 2006-12-03 16:44:58.149701387 +0100
@@ -100,7 +100,7 @@
if (_stack.poll(100)) {
- uint64 Command = 0;
+ uint64_t Command = 0;
uint i = 0;
cTimeMs t0;
t0.Set();
diff -ru control-0.0.2a-orig/keyboard.c control-0.0.2a/keyboard.c
--- control-0.0.2a-orig/keyboard.c 2006-12-03 16:44:46.170845357 +0100
+++ control-0.0.2a/keyboard.c 2006-12-03 16:45:29.825253136 +0100
@@ -18,7 +18,7 @@
struct tKbdMap {
eKbdFunc func;
- uint64 code;
+ uint64_t code;
};
@@ -117,7 +117,7 @@
-bool cCtrlKeyboard::intPut(uint64 Command, bool Repeat, bool Release) {
+bool cCtrlKeyboard::intPut(uint64_t Command, bool Repeat, bool Release) {
bool ret = cRemote::Put(Command, Repeat, Release);
conLOG_KEYB("%s cKbdRemoteForControl::intPut(0x%016LX)", ret ? "true" : "false", Command);
@@ -126,7 +126,7 @@
-bool cCtrlKeyboard::Put(uint64 Command, bool Repeat, bool Release) {
+bool cCtrlKeyboard::Put(uint64_t Command, bool Repeat, bool Release) {
if (! _pRemote)
_pRemote = new cCtrlKeyboard();
@@ -136,7 +136,7 @@
-int cCtrlKeyboard::MapCodeToFunc(uint64 Code) {
+int cCtrlKeyboard::MapCodeToFunc(uint64_t Code) {
for (const tKbdMap *p = keyboardKbdMap; p->func != kfNone; p++) {
if (p->code == Code)
diff -ru control-0.0.2a-orig/keyboard.h control-0.0.2a/keyboard.h
--- control-0.0.2a-orig/keyboard.h 2006-12-03 16:44:46.170845357 +0100
+++ control-0.0.2a/keyboard.h 2006-12-03 16:45:14.261542675 +0100
@@ -30,11 +30,11 @@
cCtrlKeyboard();
virtual ~cCtrlKeyboard();
- bool intPut(uint64 Command, bool Repeat, bool Release);
+ bool intPut(uint64_t Command, bool Repeat, bool Release);
public:
- static bool Put(uint64 Command, bool Repeat = false, bool Release = false);
- static int MapCodeToFunc(uint64 Code);
+ static bool Put(uint64_t Command, bool Repeat = false, bool Release = false);
+ static int MapCodeToFunc(uint64_t Code);
};
diff -ru console-0.6.0-orig/menu.c console-0.6.0/menu.c
--- console-0.6.0-orig/menu.c 2006-12-03 15:28:31.522732562 +0100
+++ console-0.6.0/menu.c 2006-12-03 15:29:04.026492765 +0100
@@ -1193,7 +1193,7 @@
switch (BASICKEY(Key)) {
- case kKbd:{ uint64 buf = cKbdRemote::MapFuncToCode(KEYKBD(Key));
+ case kKbd:{ uint64_t buf = cKbdRemote::MapFuncToCode(KEYKBD(Key));
WriteToConsole(buf);
// On every key press, we show the cursor immediately
@@ -1425,7 +1425,7 @@
-void cMenuConsole::WriteToConsole(const uint64& code) {
+void cMenuConsole::WriteToConsole(const uint64_t& code) {
unsigned char* data = (unsigned char*)(void*)&code;
diff -ru console-0.6.0-orig/menu.h console-0.6.0/menu.h
--- console-0.6.0-orig/menu.h 2006-12-03 15:28:31.526733517 +0100
+++ console-0.6.0/menu.h 2006-12-03 15:28:44.925932704 +0100
@@ -102,7 +102,7 @@
private:
void CaptureKeyboard();
void ReleaseKeyboard();
- void WriteToConsole(const uint64& code);
+ void WriteToConsole(const uint64_t& code);
bool TerminateConsole();
void AddSubMenu(cOsdObject* pSubMenu);
diff -ru remote-0.3.8-orig/remote.c remote-0.3.8/remote.c
--- remote-0.3.8-orig/remote.c 2006-12-03 16:24:36.438027599 +0100
+++ remote-0.3.8/remote.c 2006-12-03 16:26:19.222559030 +0100
@@ -56,7 +56,7 @@
// ---------------------------------------------------------------------------
-bool cRemoteGeneric::Put(uint64 Code, bool Repeat, bool Release)
+bool cRemoteGeneric::Put(uint64_t Code, bool Repeat, bool Release)
// ---------------------------------------------------------------------------
{
return cRemote::Put(Code, Repeat, Release);
@@ -72,7 +72,7 @@
#else
cTimeMs first, rate, timeout;
#endif
- uint64 code, lastcode = INVALID_KEY;
+ uint64_t code, lastcode = INVALID_KEY;
bool repeat = false;
for (;;)
@@ -412,12 +412,12 @@
// ---------------------------------------------------------------------------
-uint64 cRemoteDevInput::getKey(void)
+uint64_t cRemoteDevInput::getKey(void)
// ---------------------------------------------------------------------------
{
struct input_event ev;
int n;
- uint64 code;
+ uint64_t code;
do
n = read(fh, &ev, sizeof ev);
@@ -427,7 +427,7 @@
{
if (ev.value)
ev.value = 1;
- code = ((uint64)ev.value << 32) | ((uint64)ev.type << 16) | (uint64)ev.code;
+ code = ((uint64_t)ev.value << 32) | ((uint64_t)ev.type << 16) | (uint64_t)ev.code;
}
else
code = INVALID_KEY;
@@ -443,7 +443,7 @@
// ---------------------------------------------------------------------------
-bool cRemoteDevInput::keyPressed(uint64 code)
+bool cRemoteDevInput::keyPressed(uint64_t code)
// ---------------------------------------------------------------------------
{
return (code & 0xFFFF00000000ULL);
@@ -455,7 +455,7 @@
#ifdef REMOTE_FEATURE_LIRCOLD
// ---------------------------------------------------------------------------
-uint64 cRemoteDevLirc::getKey(void)
+uint64_t cRemoteDevLirc::getKey(void)
// ---------------------------------------------------------------------------
{
unsigned long code;
@@ -465,12 +465,12 @@
if (n != sizeof code)
return INVALID_KEY;
else
- return (uint64)code;
+ return (uint64_t)code;
}
// ---------------------------------------------------------------------------
-bool cRemoteDevLirc::keyPressed(uint64 code)
+bool cRemoteDevLirc::keyPressed(uint64_t code)
// ---------------------------------------------------------------------------
{
return (code & 0x80);
@@ -510,11 +510,11 @@
// ---------------------------------------------------------------------------
-uint64 cRemoteDevTty::getKey(void)
+uint64_t cRemoteDevTty::getKey(void)
// ---------------------------------------------------------------------------
{
int n;
- uint64 code = 0;
+ uint64_t code = 0;
n = read(fh, &code, sizeof code);
return (n > 0) ? code : INVALID_KEY;
@@ -522,7 +522,7 @@
// ---------------------------------------------------------------------------
-bool cRemoteDevTty::keyPressed(uint64 code)
+bool cRemoteDevTty::keyPressed(uint64_t code)
// ---------------------------------------------------------------------------
{
return true;
@@ -530,7 +530,7 @@
// ---------------------------------------------------------------------------
-bool cRemoteDevTty::Put(uint64 Code, bool Repeat, bool Release)
+bool cRemoteDevTty::Put(uint64_t Code, bool Repeat, bool Release)
// ---------------------------------------------------------------------------
{
bool rc = cRemote::Put(Code, Repeat, Release);
diff -ru remote-0.3.8-orig/remote.h remote-0.3.8/remote.h
--- remote-0.3.8-orig/remote.h 2006-12-03 16:24:36.438027599 +0100
+++ remote-0.3.8/remote.h 2006-12-03 16:27:08.510333521 +0100
@@ -43,7 +43,7 @@
/*****************************************************************************/
{
protected:
- static const uint64 INVALID_KEY = (uint64) -1;
+ static const uint64_t INVALID_KEY = (uint64_t) -1;
int fh;
char *device;
int polldelay;
@@ -52,9 +52,9 @@
int repeattimeout;
cRemoteGeneric(const char *name, int f, char *d);
virtual ~cRemoteGeneric();
- virtual uint64 getKey(void) = 0;
- virtual bool keyPressed(uint64 code) = 0;
- virtual bool Put(uint64 Code, bool Repeat = false, bool Release = false);
+ virtual uint64_t getKey(void) = 0;
+ virtual bool keyPressed(uint64_t code) = 0;
+ virtual bool Put(uint64_t Code, bool Repeat = false, bool Release = false);
virtual void Action(void);
};
@@ -66,11 +66,11 @@
{
private:
bool testMode;
- uint64 testKey;
+ uint64_t testKey;
bool loadKeymap(const char *devname, uint32_t options);
protected:
- virtual uint64 getKey(void);
- virtual bool keyPressed(uint64 code);
+ virtual uint64_t getKey(void);
+ virtual bool keyPressed(uint64_t code);
public:
cRemoteDevInput(const char *name, int f, char *d);
virtual bool Initialize(void);
@@ -84,8 +84,8 @@
/*****************************************************************************/
{
protected:
- virtual uint64 getKey(void);
- virtual bool keyPressed(uint64 code);
+ virtual uint64_t getKey(void);
+ virtual bool keyPressed(uint64_t code);
public:
cRemoteDevLirc(const char *name, int f, char *d)
:cRemoteGeneric(name, f, d) { Start(); }
@@ -101,9 +101,9 @@
private:
struct termios tm;
protected:
- virtual uint64 getKey(void);
- virtual bool keyPressed(uint64 code);
- virtual bool Put(uint64 Code, bool Repeat = false, bool Release = false);
+ virtual uint64_t getKey(void);
+ virtual bool keyPressed(uint64_t code);
+ virtual bool Put(uint64_t Code, bool Repeat = false, bool Release = false);
public:
cRemoteDevTty(const char *name, int f, char *d);
virtual ~cRemoteDevTty();
diff -ru remote-0.3.8-orig/remotetcp.c remote-0.3.8/remotetcp.c
--- remote-0.3.8-orig/remotetcp.c 2006-12-03 16:24:36.438027599 +0100
+++ remote-0.3.8/remotetcp.c 2006-12-03 16:25:09.357882797 +0100
@@ -36,7 +36,7 @@
}
-uint64 cTcpRemote::getKey(void)
+uint64_t cTcpRemote::getKey(void)
{
if (csock == NULL)
{
@@ -80,7 +80,7 @@
}
- uint64 key = cRemoteDevTty::getKey();
+ uint64_t key = cRemoteDevTty::getKey();
if (key == INVALID_KEY)
{
diff -ru remote-0.3.8-orig/remotetcp.h remote-0.3.8/remotetcp.h
--- remote-0.3.8-orig/remotetcp.h 2006-12-03 16:24:36.438027599 +0100
+++ remote-0.3.8/remotetcp.h 2006-12-03 16:24:52.237797789 +0100
@@ -25,7 +25,7 @@
cSocket *csock;
protected:
- virtual uint64 getKey(void);
+ virtual uint64_t getKey(void);
public:
cTcpRemote(const char *name, int f, char *d);
diff -ru powermate-0.0.3-orig/powermate.c powermate-0.0.3/powermate.c
--- powermate-0.0.3-orig/powermate.c 2006-12-03 15:58:54.854003243 +0100
+++ powermate-0.0.3/powermate.c 2006-12-03 15:59:51.239469576 +0100
@@ -134,8 +134,8 @@
}
if (click && !pushed)
{
- uint64 current = TimeMs();
- if (current - lastPush > (uint64) PowerMateSetup.doubleClickTime)
+ uint64_t current = TimeMs();
+ if (current - lastPush > (uint64_t) PowerMateSetup.doubleClickTime)
{
//printf("CLICK\n");
ProcessEvent(kEventClick);
diff -ru powermate-0.0.3-orig/powermate.h powermate-0.0.3/powermate.h
--- powermate-0.0.3-orig/powermate.h 2006-12-03 15:58:54.854003243 +0100
+++ powermate-0.0.3/powermate.h 2006-12-03 15:59:41.325102033 +0100
@@ -26,7 +26,7 @@
bool menu;
bool pushed;
- uint64 lastPush;
+ uint64_t lastPush;
int offset;
bool click;
bool turn;
diff -ru softdevice-cvs-20061124-orig/setup-softdevice.c softdevice-cvs-20061124/setup-softdevice.c
--- softdevice-cvs-20061124-orig/setup-softdevice.c 2006-12-03 15:09:47.474358718 +0100
+++ softdevice-cvs-20061124/setup-softdevice.c 2006-12-03 15:10:34.685649821 +0100
@@ -417,13 +417,13 @@
/* ---------------------------------------------------------------------------
*/
-bool cSetupStore::CatchRemoteKey(const char *remoteName, uint64 key)
+bool cSetupStore::CatchRemoteKey(const char *remoteName, uint64_t key)
{
#ifndef STAND_ALONE
char buffer[32];
eKeys keySym;
- snprintf(buffer, sizeof(buffer), "%016LX", (uint64) key);
+ snprintf(buffer, sizeof(buffer), "%016LX", (uint64_t) key);
keySym = Keys.Get(remoteName, buffer);
if (keySym >= kUser1 && keySym <= kUser9)
{
diff -ru softdevice-cvs-20061124-orig/setup-softdevice.h softdevice-cvs-20061124/setup-softdevice.h
--- softdevice-cvs-20061124-orig/setup-softdevice.h 2006-12-03 15:09:47.478359677 +0100
+++ softdevice-cvs-20061124/setup-softdevice.h 2006-12-03 15:10:09.871715782 +0100
@@ -121,7 +121,7 @@
char *getPPValue(void);
void CropModeNext(void);
- virtual bool CatchRemoteKey(const char *remoteName, uint64 key);
+ virtual bool CatchRemoteKey(const char *remoteName, uint64_t key);
int xvAspect;
int xvMaxArea;
diff -ru softdevice-cvs-20061124-orig/VdrReplacements.h softdevice-cvs-20061124/VdrReplacements.h
--- softdevice-cvs-20061124-orig/VdrReplacements.h 2006-12-03 15:09:47.478359677 +0100
+++ softdevice-cvs-20061124/VdrReplacements.h 2006-12-03 15:10:43.715809044 +0100
@@ -30,7 +30,6 @@
#define tr(out) out
-typedef unsigned long long int uint64;
typedef int eKeys;
class cSoftRemote {
diff -ru softdevice-cvs-20061124-orig/video.h softdevice-cvs-20061124/video.h
--- softdevice-cvs-20061124-orig/video.h 2006-12-03 15:09:47.474358718 +0100
+++ softdevice-cvs-20061124/video.h 2006-12-03 15:09:58.953104351 +0100
@@ -39,7 +39,7 @@
public:
cSoftRemote(const char *Name) : cRemote(Name) {};
virtual ~cSoftRemote() {};
- virtual bool PutKey(uint64 Code, bool Repeat = false,
+ virtual bool PutKey(uint64_t Code, bool Repeat = false,
bool Release = false)
{ return Put(Code,Repeat,Release); };
};
diff -ru streamdev-20051219-orig/client/socket.c streamdev-20051219/client/socket.c
--- streamdev-20051219-orig/client/socket.c 2006-12-03 16:38:44.044459126 +0100
+++ streamdev-20051219/client/socket.c 2006-12-03 16:38:58.315865440 +0100
@@ -54,7 +54,7 @@
return false;
}
- uint64 elapsed = starttime.Elapsed();
+ uint64_t elapsed = starttime.Elapsed();
if (Expected != 0) { // XXX+ What if elapsed > TimeoutMs?
TimeoutMs -= elapsed;
return Expect(Expected, NULL, TimeoutMs);
diff -ru videosystem-0.0.1-orig/videosystem.c videosystem-0.0.1/videosystem.c
--- videosystem-0.0.1-orig/videosystem.c 2006-12-03 16:03:23.386105568 +0100
+++ videosystem-0.0.1/videosystem.c 2006-12-03 16:03:31.716095700 +0100
@@ -45,7 +45,7 @@
eVideoSystem GetVideoSystem(void);
bool doexit;
- uint64 time;
+ uint64_t time;
eVideoSystem curVidSys;
bool initialized;
tOsdSettings pal;
diff -ru taste-0.0.2d-orig/control.h taste-0.0.2d/control.h
--- taste-0.0.2d-orig/control.h 2006-12-03 15:48:00.521763680 +0100
+++ taste-0.0.2d/control.h 2006-12-03 15:48:15.469333968 +0100
@@ -15,7 +15,7 @@
const cChannel *mChannel;
const cEvent *mPresent;
const cEvent *mFollowing;
- uint64 mStart;
+ uint64_t mStart;
bool mSwitch;
cSkinDisplayChannel *mOsd;
diff -ru xineliboutput-1.0.0pre6-orig/tools/udp_pes_scheduler.c xineliboutput-1.0.0pre6/tools/udp_pes_scheduler.c
--- xineliboutput-1.0.0pre6-orig/tools/udp_pes_scheduler.c 2006-12-03 15:37:01.308416481 +0100
+++ xineliboutput-1.0.0pre6/tools/udp_pes_scheduler.c 2006-12-03 15:37:38.101192802 +0100
@@ -59,8 +59,8 @@
}
t.tv_usec -= tbegin.tv_usec;
- return (uint64(t.tv_sec)) * 90000LL +
- (uint64(t.tv_usec)) * 90LL / 1000LL +
+ return (uint64_t(t.tv_sec)) * 90000LL +
+ (uint64_t(t.tv_usec)) * 90LL / 1000LL +
begin;
}
http://www.mail-archive.com/vdr@linuxtv.org/msg01088.html
Joerg Bornkessel <[EMAIL PROTECTED]> 03.Dec.2006
diff -Naur extrecmenu-0.12a.orig/patchfont.c extrecmenu-0.12a/patchfont.c
--- extrecmenu-0.12a.orig/patchfont.c 2006-12-03 16:57:01.863253339 +0100
+++ extrecmenu-0.12a/patchfont.c 2006-12-03 16:57:46.305785975 +0100
@@ -2,6 +2,7 @@
* See the README file for copyright information and how to reach the author.
*/
+#include <stdint.h>
#include <vdr/font.h>
#include "patchfont.h"
#include "mymenusetup.h"
diff -ru graphlcd-0.1.3-orig/display.c graphlcd-0.1.3/display.c
--- graphlcd-0.1.3-orig/display.c 2006-12-03 16:18:11.526195337 +0100
+++ graphlcd-0.1.3/display.c 2006-12-03 16:18:47.994898923 +0100
@@ -2025,7 +2025,7 @@
else
{
if (GraphLCDSetup.BrightnessDelay < 1
- || ((TimeMs() - LastTimeBrightness) > (uint64) (GraphLCDSetup.BrightnessDelay*1000)))
+ || ((TimeMs() - LastTimeBrightness) > (uint64_t) (GraphLCDSetup.BrightnessDelay*1000)))
{
LCD->SetBrightness(GraphLCDSetup.BrightnessIdle);
nCurrentBrightness = GraphLCDSetup.BrightnessIdle;
diff -ru graphlcd-0.1.3-orig/display.h graphlcd-0.1.3/display.h
--- graphlcd-0.1.3-orig/display.h 2006-12-03 16:18:11.526195337 +0100
+++ graphlcd-0.1.3/display.h 2006-12-03 16:18:40.497109608 +0100
@@ -200,7 +200,7 @@
/** Set Brightness depends user activity */
void SetBrightness();
- uint64 LastTimeBrightness;
+ uint64_t LastTimeBrightness;
int nCurrentBrightness;
bool bBrightnessActive;
};
diff -ru graphlcd-0.1.3-orig/tags graphlcd-0.1.3/tags
--- graphlcd-0.1.3-orig/tags 2006-12-03 16:18:11.526195337 +0100
+++ graphlcd-0.1.3/tags 2006-12-03 16:19:05.319033056 +0100
@@ -71,7 +71,7 @@
LIBDIR Makefile /^LIBDIR = ..\/..\/lib$/;" m
LastState display.h /^ ThreadState LastState;$/;" m class:cGraphLCDDisplay
LastTime display.h /^ time_t LastTime;$/;" m class:cGraphLCDDisplay
-LastTimeBrightness display.h /^ uint64 LastTimeBrightness;$/;" m class:cGraphLCDDisplay
+LastTimeBrightness display.h /^ uint64_t LastTimeBrightness;$/;" m class:cGraphLCDDisplay
LastTimeCheckSym display.h /^ time_t LastTimeCheckSym;$/;" m class:cGraphLCDDisplay
LastTimeModSym display.h /^ time_t LastTimeModSym;$/;" m class:cGraphLCDDisplay
Load layout.c /^bool cFontElement::Load(const std::string & url)$/;" f class:cFontElement
_______________________________________________
vdr mailing list
vdr@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
