Added patch to compile also with vdr-1.4.4_p1

Package-Manager: portage-2.1.2_rc2-r4

diff --git a/media-plugins/vdr-remote/ChangeLog b/media-plugins/vdr-remote/ChangeLog
index 7da55149289457d920157c7a536c527e2ffd3024..4d1d44d6159373bc5793bad6a5c6225a98d9fcec 100644 (file)
--- a/media-plugins/vdr-remote/ChangeLog
+++ b/media-plugins/vdr-remote/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-remote
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remote/ChangeLog,v 1.11 2006/11/18 09:15:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remote/ChangeLog,v 1.12 2006/12/03 15:29:41 zzam Exp $
+
+  03 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-remote-0.3.8-uint64.diff, vdr-remote-0.3.8.ebuild:
+  Added patch to compile also with vdr-1.4.4_p1
 
   18 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
   -vdr-remote-0.3.7.ebuild, vdr-remote-0.3.8.ebuild:

diff --git a/media-plugins/vdr-remote/Manifest b/media-plugins/vdr-remote/Manifest
index eea79cb2db9674647bfe37666346c74a570cce70..4186156a85bea3734b98205cee9306d6513bf143 100644 (file)
--- a/media-plugins/vdr-remote/Manifest
+++ b/media-plugins/vdr-remote/Manifest
@@ -9,15 +9,19 @@ AUX rc-addon.sh 2336 RMD160 060553d867effdede0b013408c863cd2ca984ffe SHA1 025227
 MD5 63f43e4f41badf70d420f3f650106b04 files/rc-addon.sh 2336
 RMD160 060553d867effdede0b013408c863cd2ca984ffe files/rc-addon.sh 2336
 SHA256 964044b7306a62dfa761653bac33137dcc5f8ecd7bbd98a9621bdc1acf06f77a files/rc-addon.sh 2336
+AUX vdr-remote-0.3.8-uint64.diff 6633 RMD160 9681dc92b32aff3b102f23d56b47a61c7b0f95f0 SHA1 8b32b851ab9dd9580ef232660cc7979c5e9816e7 SHA256 19e66f9a085b9790c5270f637235e666ff9624d260a9e4ba7370c61792888f2d
+MD5 fc227472841904dd630d80468b20cabe files/vdr-remote-0.3.8-uint64.diff 6633
+RMD160 9681dc92b32aff3b102f23d56b47a61c7b0f95f0 files/vdr-remote-0.3.8-uint64.diff 6633
+SHA256 19e66f9a085b9790c5270f637235e666ff9624d260a9e4ba7370c61792888f2d files/vdr-remote-0.3.8-uint64.diff 6633
 DIST vdr-remote-0.3.8.tgz 24446 RMD160 54ef970ef8be961e78d5e974c4adc132f6a49815 SHA1 c7af93c27bd3d054a0ec30b9c7245ba5bdcda7c5 SHA256 48dd7860bed96f713925260e03bb22ab024740c6997802d0ddf00f289f5d268b
-EBUILD vdr-remote-0.3.8.ebuild 567 RMD160 a3446421955e1429abcdf35194e47407947f103b SHA1 4c0f2605baec96da8a7bc114ab3ecc90c03bf7b5 SHA256 0890f97126a79c64d58716f514dd5be1b831c54e65b571478f962152a3ff5c0f
-MD5 0e60b3ef372b059f0e744ce6713cd8ee vdr-remote-0.3.8.ebuild 567
-RMD160 a3446421955e1429abcdf35194e47407947f103b vdr-remote-0.3.8.ebuild 567
-SHA256 0890f97126a79c64d58716f514dd5be1b831c54e65b571478f962152a3ff5c0f vdr-remote-0.3.8.ebuild 567
-MISC ChangeLog 1674 RMD160 d2a82c56722b10bc7a2a8e07257f3cc56664ae11 SHA1 aac205a6f88b2d3f84f622a1b81762289fb3b561 SHA256 d5fd3da0a6b99d320b47f144bc28de992619f9a489289b4591dc780b249f64f2
-MD5 a61703f7caaf1c4cc3fbf8db73df1b3d ChangeLog 1674
-RMD160 d2a82c56722b10bc7a2a8e07257f3cc56664ae11 ChangeLog 1674
-SHA256 d5fd3da0a6b99d320b47f144bc28de992619f9a489289b4591dc780b249f64f2 ChangeLog 1674
+EBUILD vdr-remote-0.3.8.ebuild 607 RMD160 73ca941d789c8f085eb859e72f0c544eb94ad0ae SHA1 913b15e59c01e64dcf64b172500ccc3aed543bbc SHA256 82ff899abfe5bd4d57c810279d8126198170b155920f9e7ea2d8871c52b2cb94
+MD5 68a26b9fdcc13621e0c7f304319c0fdd vdr-remote-0.3.8.ebuild 607
+RMD160 73ca941d789c8f085eb859e72f0c544eb94ad0ae vdr-remote-0.3.8.ebuild 607
+SHA256 82ff899abfe5bd4d57c810279d8126198170b155920f9e7ea2d8871c52b2cb94 vdr-remote-0.3.8.ebuild 607
+MISC ChangeLog 1840 RMD160 2114c3376e43e019aebce8aca6f6f38adad90703 SHA1 0f3b6e07e05bf8854b00444aee6c783c648ff17d SHA256 cced8437ba7e3a92cbced96613ce405338e64e9f5b1b9e35ba3fae2ed57cc286
+MD5 df3f76a01c7ba95e7d1d05b64da9e83e ChangeLog 1840
+RMD160 2114c3376e43e019aebce8aca6f6f38adad90703 ChangeLog 1840
+SHA256 cced8437ba7e3a92cbced96613ce405338e64e9f5b1b9e35ba3fae2ed57cc286 ChangeLog 1840
 MISC metadata.xml 304 RMD160 29f1d6e123307420871a60507c3b9b00d2956ad4 SHA1 46c5e8429735bf32ee785823a7574589ee89438c SHA256 a4d710cae7233239f4cce6f067e160acbd2247d4f4ae8183ca5c2f40d8a4ae28
 MD5 160c3a6f923cd781a82f7ecbec2e61ba metadata.xml 304
 RMD160 29f1d6e123307420871a60507c3b9b00d2956ad4 metadata.xml 304
@@ -28,7 +32,7 @@ SHA256 2c8f57e9ce2939f213d0a734946e89349789ba439f36be77b43c765ed477f74e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFXs8qt2vP6XvVdOcRAtR3AJ49HWWi/NII/LRO6ArNZZzuJ86YOwCg0zJz
-OO+Wc6ZQwwpamLmRPo+9lVo=
-=N2oe
+iD8DBQFFcu1tt2vP6XvVdOcRAvVTAJ9Fjgt5X9YtmsQPdqs0wWGBc0uAVwCg4xBq
+z9DV6skyWYIZpKmVIqur8vc=
+=6Ihp
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/vdr-remote/files/vdr-remote-0.3.8-uint64.diff b/media-plugins/vdr-remote/files/vdr-remote-0.3.8-uint64.diff
new file mode 100644 (file)
index 0000000..2ccbc06
--- /dev/null
+++ b/media-plugins/vdr-remote/files/vdr-remote-0.3.8-uint64.diff
@@ -0,0 +1,207 @@
+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 --git a/media-plugins/vdr-remote/vdr-remote-0.3.8.ebuild b/media-plugins/vdr-remote/vdr-remote-0.3.8.ebuild
index 662a22bdf813d1333b57d8d845fc5b18594a905f..e0524845e00c5c1dc3471e762d08af465901da01 100644 (file)
--- a/media-plugins/vdr-remote/vdr-remote-0.3.8.ebuild
+++ b/media-plugins/vdr-remote/vdr-remote-0.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remote/vdr-remote-0.3.8.ebuild,v 1.3 2006/11/18 09:15:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remote/vdr-remote-0.3.8.ebuild,v 1.4 2006/12/03 15:29:41 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -15,3 +15,5 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.6"
 
+PATCHES="${FILESDIR}/${P}-uint64.diff"
+