Included an upstream patch for better g15daemon-1.9 compatibility, dropping 0.5.1-r1 because it does not support LCD_DEVICES

(Portage version: 2.1.2.2)

3 files changed, 74 insertions, 13 deletions

diff --git a/app-misc/lcdproc/files/0.5.1-LCDd-conf-driver-path.patch b/app-misc/lcdproc/files/0.5.1-LCDd-conf-driver-path.patch
deleted file mode 100644
index 5da934ba8d84..000000000000
--- a/app-misc/lcdproc/files/0.5.1-LCDd-conf-driver-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This patch is only used in 0.5.1-r1
-
---- LCDd.conf.orig	2006-09-22 07:26:02.069860250 +0200
-+++ LCDd.conf	2006-09-22 07:26:12.458509500 +0200
-@@ -76,7 +76,7 @@
- #            the driver modules and will thus not be able to
- #            function properly.
- # NOTE: Always place a slash as last character !
--DriverPath=server/drivers/
-+DriverPath=/usr/share/lcdproc/drivers/
- 
- # The "...Key=" lines define what the server does with keypresses that
- # don't go to any client.
diff --git a/app-misc/lcdproc/files/0.5.1-g15daemon-1.9.patch b/app-misc/lcdproc/files/0.5.1-g15daemon-1.9.patch
new file mode 100644
index 000000000000..1be3d75b0fea
--- /dev/null
+++ b/app-misc/lcdproc/files/0.5.1-g15daemon-1.9.patch
@@ -0,0 +1,74 @@
+Upstream patch by Anthony J. Mirabella for >=app-misc/g15daemon-1.9
+
+Included in >=0.5.1-r4
+
+--- ./server/drivers/g15.c	2006/09/30 18:18:23	1.2
++++ ./server/drivers/g15.c	2006/11/12 09:44:16	1.3
+@@ -30,6 +30,7 @@
+ #include <errno.h>
+ #include <syslog.h>
+ #include <sys/socket.h>
++#include <sys/types.h>
+ #include <libg15.h>
+ #include <g15daemon_client.h>
+ #include <libg15render.h>
+@@ -70,6 +71,7 @@
+    p->cellheight = G15_CELL_HEIGHT;
+    p->backlight_state = BACKLIGHT_ON;
+    p->g15screen_fd = 0;
++   p->g15d_ver = g15daemon_version();
+ 
+    if((p->g15screen_fd = new_g15_screen(G15_G15RBUF)) < 0)
+    {
+@@ -372,14 +374,35 @@
+ MODULE_EXPORT const char * g15_get_key (Driver *drvthis)
+ {
+ 	PrivateData *p = drvthis->private_data;
+-	
++	int toread = 0;
+ 	unsigned int key_state = 0;
+-	
+-	if(send(p->g15screen_fd, "k", 1, MSG_OOB)<1) /* request key status */
+-        report(RPT_INFO, "%s: Error in send to g15daemon", drvthis->name);    
+ 
+-    	recv(p->g15screen_fd, &key_state , sizeof(key_state),0);
++	if ((strncmp("1.2", p->g15d_ver, 3)))
++	  {	/* other than g15daemon-1.2 (should be >=1.9) */
++		fd_set fds;
++		struct timeval tv;
++		memset (&tv, 0, sizeof(struct timeval));
++
++		FD_ZERO(&fds);
++		FD_SET(p->g15screen_fd, &fds);
+ 	
++		toread = select(FD_SETSIZE, &fds, NULL, NULL, &tv);
++	  }
++	else
++	  {	/* g15daemon-1.2 */
++		if(send(p->g15screen_fd, "k", 1, MSG_OOB)<1) /* request key status */
++		  {
++	 	  	report(RPT_INFO, "%s: Error in send to g15daemon", drvthis->name);
++			return NULL;
++		  }
++		toread = 1;
++	  }
++	
++	if (toread >= 1)
++	  read(p->g15screen_fd, &key_state, sizeof(key_state));
++	else
++	  return NULL;
++
+ 	if (key_state & G15_KEY_G1)
+ 		return "Escape";
+ 	else if (key_state & G15_KEY_L1)
+--- ./server/drivers/g15.h	2006/09/30 18:18:23	1.2
++++ ./server/drivers/g15.h	2006/11/12 09:44:17	1.3
+@@ -32,6 +32,8 @@
+ 	int cellwidth, cellheight;
+ 	/* file descriptor for g15daemon socket */
+ 	int g15screen_fd;
++	/* g15daemon version for compatibility checks */
++	const char *g15d_ver;
+ 	/* canvas for LCD contents */
+ 	g15canvas *canvas;
+ 	g15canvas *backingstore;
diff --git a/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r1 b/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r4
index 247c7eae1867..247c7eae1867 100644
--- a/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r1
+++ b/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r4