fbvncserver + x11vnc: consolidate all VNC related stuff in packages/vnc/

10 files changed, 290 insertions, 0 deletions

diff --git a/packages/vnc/fbvncserver-kmodule_0.9.4.bb b/packages/vnc/fbvncserver-kmodule_0.9.4.bb
new file mode 100644
index 0000000000..4abdb6c7b0
--- /dev/null
+++ b/packages/vnc/fbvncserver-kmodule_0.9.4.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Framebuffer VNC server keyboard events module"
+SECTION = "kernel/modules"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
+           file://libvncs0.6.patch;patch=1 \
+	   file://paths.patch;patch=1 \
+	   file://kernelinclude.patch;patch=1 \
+           file://ipaq.patch;patch=1"
+
+S = "${WORKDIR}/fbvncserver-${PV}"
+
+inherit module
+
+FBVNCSERVER_SYSTEM = "zaurus"
+FBVNCSERVER_SYSTEM_h3600 = "ipaq"
+FBVNCSERVER_SYSTEM_h3900 = "ipaq"
+
+EXTRA_OEMAKE = "KERNEL_INCLUDES=-I${STAGING_KERNEL_DIR}/include ${FBVNCSERVER_SYSTEM}_kbdsim.o"
+
+do_install () {
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc
+	install -m 0644 ${FBVNCSERVER_SYSTEM}_kbdsim.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc/kbdsim.o
+}
diff --git a/packages/vnc/fbvncserver_0.9.4.bb b/packages/vnc/fbvncserver_0.9.4.bb
new file mode 100644
index 0000000000..e7c8151e18
--- /dev/null
+++ b/packages/vnc/fbvncserver_0.9.4.bb
@@ -0,0 +1,55 @@
+DESCRIPTION = "Framebuffer VNC server"
+LICENSE = "GPL"
+SECTION = "console/utils"
+#DEPENDS = "libvncserver jpeg zlib"
+# using older version due of error with libvncserver-0.7.1
+# fbvncserver.c:577: error: structure has no member named `rfbAlwaysShared'
+# fbvncserver.c:602: error: structure has no member named `rfbClientHead'
+DEPENDS = "libvncserver-0.6 jpeg zlib"
+RDEPENDS = "fbvncserver-kmodule libvncserver-storepasswd libvncserver-javaapplet"
+PR = "r2"
+
+SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
+           file://libvncs0.6.patch;patch=1 \
+           file://paths.patch;patch=1 \
+           file://kernelinclude.patch;patch=1 \
+	   file://buildfix.patch;patch=1 \
+	   file://ipaq.patch;patch=1 \
+           file://init"
+
+S = "${WORKDIR}/fbvncserver-${PV}"
+
+export INCLUDES = "-I${STAGING_INCDIR}"
+
+export LIBS = "-L${STAGING_LIBDIR} -lpthread"
+export VNCSERVER_DIR = "${STAGING_LIBDIR}"
+export ZAURUS_ZLIB_LIBS = "${STAGING_LIBDIR}"
+export ZAURUS_JPEG_LIBS = "${STAGING_LIBDIR}"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "fbvncinput"
+INITSCRIPT_PARAMS = "defaults 97"
+
+FBVNCSERVER_SYSTEM = "zaurus"
+FBVNCSERVER_SYSTEM_h3600 = "ipaq"
+FBVNCSERVER_SYSTEM_h3900 = "ipaq"
+
+do_compile () {
+	oe_runmake ${FBVNCSERVER_SYSTEM}_fbvncserver ${FBVNCSERVER_SYSTEM}_tssimd
+}
+
+do_install () {
+	install -d ${D}${bindir}
+	install -m 0755 ${FBVNCSERVER_SYSTEM}_fbvncserver ${D}${bindir}/fbvncserver
+	install -m 0755 ${FBVNCSERVER_SYSTEM}_tssimd ${D}${bindir}/tssimd
+
+	install -d ${D}${datadir}/fbvncserver
+	install -m 0644 ${FBVNCSERVER_SYSTEM}_panel.jpg ${D}${datadir}/fbvncserver/
+
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/fbvncinput
+}
+
+FILES_${PN} += " /usr/share/fbvncserver/*.jpg"
+
diff --git a/packages/vnc/files/.mtn2git_empty b/packages/vnc/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/vnc/files/.mtn2git_empty
diff --git a/packages/vnc/files/buildfix.patch b/packages/vnc/files/buildfix.patch
new file mode 100644
index 0000000000..302dbd9e8e
--- /dev/null
+++ b/packages/vnc/files/buildfix.patch
@@ -0,0 +1,31 @@
+--- fbvncserver-0.9.4/fbvncserver.c.orig	2005-07-31 15:01:32.552177176 +0200
++++ fbvncserver-0.9.4/fbvncserver.c	2005-07-31 15:02:47.287366483 +0200
+@@ -574,7 +574,6 @@
+   rfbScreen                  = rfbGetScreen(&argc,argv,rfb_width,rfb_height,5,2,2);
+   rfbScreen->desktopName     = DESKTOP_NAME;
+   rfbScreen->frameBuffer     = (char *)rfbbuf;
+-  rfbScreen->rfbAlwaysShared = TRUE;
+   rfbScreen->ptrAddEvent     = ptrevent;
+   rfbScreen->kbdAddEvent     = keyevent;
+   rfbScreen->newClientHook   = newclient;
+@@ -595,18 +594,12 @@
+   varblock.b_offset = vscrinfo.blue.offset+vscrinfo.blue.length-5;
+   varblock.rfb_xres = vscrinfo.yres;
+   varblock.rfb_maxy = vscrinfo.xres-1;
+-  while(1)
++  while(1) 
+   {
+-      /* If no clients are connected, just wait for events and don't bother
+-         updating the rfb, to save CPU */
+-      while(rfbScreen->rfbClientHead==NULL) {
+-          rfbProcessEvents(rfbScreen,100000);       /* We still run a tight loop
+-                                                       so http clients don't wait */
+-      }
+       /* Process events for a while */
+       do
+       {
+-          got_event=0;
++          got_event=0; 
+           rfbProcessEvents(rfbScreen,30000);
+       }
+       while(got_event);
diff --git a/packages/vnc/files/init b/packages/vnc/files/init
new file mode 100644
index 0000000000..b01a1ebd79
--- /dev/null
+++ b/packages/vnc/files/init
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+rm -f /dev/ts
+mkfifo /dev/ts
+mkfifo /dev/tssim
+mknod /dev/kbdsim c 61 0
+insmod -f kbdsim
+/usr/bin/tssimd
diff --git a/packages/vnc/files/ipaq.patch b/packages/vnc/files/ipaq.patch
new file mode 100644
index 0000000000..e8070c0f25
--- /dev/null
+++ b/packages/vnc/files/ipaq.patch
@@ -0,0 +1,35 @@
+diff -Nurd fbvncserver-0.9.4.old/fbvncserver.c fbvncserver-0.9.4/fbvncserver.c
+--- fbvncserver-0.9.4.old/fbvncserver.c	2005-07-27 22:25:25.069921936 +0200
++++ fbvncserver-0.9.4/fbvncserver.c	2005-07-27 22:27:21.087284616 +0200
+@@ -28,7 +28,7 @@
+ 
+ 
+ #ifdef IPAQ
+-#define FANCY_PANEL_JPG "/usr/local/vnc/ipaq_panel.jpg"
++#define FANCY_PANEL_JPG "/usr/share/fbvncserver/ipaq_panel.jpg"
+ #define DESKTOP_NAME "iPAQ"
+ #else   /* #ifdef ZAURUS */
+ #define FANCY_PANEL_JPG "/usr/share/fbvncserver/zaurus_panel.jpg"
+diff -Nurd fbvncserver-0.9.4.old/Makefile fbvncserver-0.9.4/Makefile
+--- fbvncserver-0.9.4.old/Makefile	2005-07-27 22:25:25.068922088 +0200
++++ fbvncserver-0.9.4/Makefile	2005-07-27 22:26:49.983013184 +0200
+@@ -89,7 +89,7 @@
+ 		${CC} ${KERNEL_INCLUDES} -Wall -D__KERNEL__ -c -o $@ $<
+ 
+ ipaq_kbdsim.o:			kbdsim.c
+-		${CC} -DIPAQ -Wall -D__KERNEL__ -c -o $@ $<
++		${CC} ${KERNEL_INCLUDES} -DIPAQ -Wall -D__KERNEL__ -c -o $@ $<
+ 
+ loadjpeg.o:	loadjpeg.c						\
+ 		loadjpeg.h
+diff -Nurd fbvncserver-0.9.4.old/tssimd.c fbvncserver-0.9.4/tssimd.c
+--- fbvncserver-0.9.4.old/tssimd.c	2005-07-27 22:25:25.070921784 +0200
++++ fbvncserver-0.9.4/tssimd.c	2005-07-27 22:25:53.595585376 +0200
+@@ -26,6 +26,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <signal.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
diff --git a/packages/vnc/files/kernelinclude.patch b/packages/vnc/files/kernelinclude.patch
new file mode 100644
index 0000000000..b17d4e09c2
--- /dev/null
+++ b/packages/vnc/files/kernelinclude.patch
@@ -0,0 +1,12 @@
+diff -urN fbvncserver-0.9.4.old/Makefile fbvncserver-0.9.4/Makefile
+--- fbvncserver-0.9.4.old/Makefile	2003-05-19 22:52:24.000000000 -0400
++++ fbvncserver-0.9.4/Makefile	2004-02-27 10:49:27.000000000 -0500
+@@ -86,7 +86,7 @@
+ 		${STRIP} $@
+ 
+ zaurus_kbdsim.o:		kbdsim.c
+-		${CC}  -Wall -D__KERNEL__ -c -o $@ $<
++		${CC} ${KERNEL_INCLUDES} -Wall -D__KERNEL__ -c -o $@ $<
+ 
+ ipaq_kbdsim.o:			kbdsim.c
+ 		${CC} -DIPAQ -Wall -D__KERNEL__ -c -o $@ $<
diff --git a/packages/vnc/files/libvncs0.6.patch b/packages/vnc/files/libvncs0.6.patch
new file mode 100644
index 0000000000..0975c376bd
--- /dev/null
+++ b/packages/vnc/files/libvncs0.6.patch
@@ -0,0 +1,61 @@
+diff -urN fbvncserver-0.9.4.old/fbvncserver.c fbvncserver-0.9.4/fbvncserver.c
+--- fbvncserver-0.9.4.old/fbvncserver.c	2003-03-03 01:00:09.000000000 -0500
++++ fbvncserver-0.9.4/fbvncserver.c	2004-02-12 20:49:40.000000000 -0500
+@@ -18,8 +18,8 @@
+ #include <fcntl.h>
+ #include <linux/fb.h>
+ #include <signal.h>
+-#include "rfb.h"
+-#include "keysym.h"
++#include "rfb/rfb.h"
++#include "rfb/keysym.h"
+ #include "keysym2scancode.h"
+ #include "loadjpeg.h"
+ #include "panelzones.h"
+@@ -42,7 +42,7 @@
+ /* Types */
+ struct ClientData
+ {
+-  Bool oldButton;
++  rfbBool oldButton;
+   int oldx,oldy;
+ };
+ 
+@@ -304,7 +304,7 @@
+ 
+ 
+ /* Keyboard events handler */
+-void keyevent(Bool down,KeySym key,rfbClientPtr cl)
++void keyevent(rfbBool down,rfbKeySym key,rfbClientPtr cl)
+ {
+   unsigned char *scancodes;
+ 
+diff -urN fbvncserver-0.9.4.old/keysym2scancode.c fbvncserver-0.9.4/keysym2scancode.c
+--- fbvncserver-0.9.4.old/keysym2scancode.c	2002-11-16 15:32:04.000000000 -0500
++++ fbvncserver-0.9.4/keysym2scancode.c	2004-02-12 20:50:33.000000000 -0500
+@@ -7,8 +7,8 @@
+ 
+    (c) Pierre-Philippe Coupard, 27/01/2002
+ */
+-#include "keysym.h"
+-#include "rfb.h"
++#include "rfb/keysym.h"
++#include "rfb/rfb.h"
+ #include "keysym2scancode.h"
+ 
+ 
+@@ -290,7 +290,7 @@
+ 
+ /* Turn a received keysym into a Zaurus keyboard scancode sequence. Each
+    sequence is terminated by 0xff. Return NULL if no scancode could be found */
+-unsigned char *keysym2scancodes(Bool down, KeySym key)
++unsigned char *keysym2scancodes(rfbBool down, rfbKeySym key)
+ {
+ #ifndef IPAQ
+   static int control_down = 0;
+diff -urN fbvncserver-0.9.4.old/keysym2scancode.h fbvncserver-0.9.4/keysym2scancode.h
+--- fbvncserver-0.9.4.old/keysym2scancode.h	2002-09-05 22:20:10.000000000 -0400
++++ fbvncserver-0.9.4/keysym2scancode.h	2004-02-12 20:48:19.000000000 -0500
+@@ -1 +1 @@
+-unsigned char *keysym2scancodes(Bool down, KeySym key);
++unsigned char *keysym2scancodes(rfbBool down, rfbKeySym key);
diff --git a/packages/vnc/files/paths.patch b/packages/vnc/files/paths.patch
new file mode 100644
index 0000000000..7c122efc67
--- /dev/null
+++ b/packages/vnc/files/paths.patch
@@ -0,0 +1,52 @@
+diff -urN fbvncserver-0.9.4.old/fbvncserver.c fbvncserver-0.9.4/fbvncserver.c
+--- fbvncserver-0.9.4.old/fbvncserver.c	2003-03-03 01:00:09.000000000 -0500
++++ fbvncserver-0.9.4/fbvncserver.c	2004-02-27 11:35:36.000000000 -0500
+@@ -31,7 +31,7 @@
+ #define FANCY_PANEL_JPG "/usr/local/vnc/ipaq_panel.jpg"
+ #define DESKTOP_NAME "iPAQ"
+ #else   /* #ifdef ZAURUS */
+-#define FANCY_PANEL_JPG "/home/root/Applications/fbvncserver/zaurus_panel.jpg"
++#define FANCY_PANEL_JPG "/usr/share/fbvncserver/zaurus_panel.jpg"
+ #define DESKTOP_NAME "Zaurus"
+ #endif
+ 
+@@ -578,7 +578,7 @@
+   rfbScreen->ptrAddEvent     = ptrevent;
+   rfbScreen->kbdAddEvent     = keyevent;
+   rfbScreen->newClientHook   = newclient;
+-  rfbScreen->httpDir         = "/home/root/Applications/fbvncserver/classes";
++  rfbScreen->httpDir         = "/usr/share/fbvncserver/classes";
+   rfbInitServer(rfbScreen);
+ 
+   /* Make sure we catch EPIPE so we don't get killed by closed sockets when
+diff -urN fbvncserver-0.9.4.old/launch/subclass.cpp fbvncserver-0.9.4/launch/subclass.cpp
+--- fbvncserver-0.9.4.old/launch/subclass.cpp	2003-05-10 19:20:02.000000000 -0400
++++ fbvncserver-0.9.4/launch/subclass.cpp	2004-02-27 11:35:55.000000000 -0500
+@@ -17,13 +17,13 @@
+ #include <qpe/process.h>
+ #include <qpe/global.h>
+ 
+-#define SCRIPT_LOCATION "/usr/local/bin"
++#define SCRIPT_LOCATION "/usr/bin"
+ 
+ 
+ mainDialog::mainDialog(QWidget *parent, const char *name, WFlags fl)
+     : mainDialogSuper(parent, name, fl)
+ {
+-    QPixmap qi("/home/root/Applications/fbvncserver/sdglogo.png", "PNG");
++    QPixmap qi("/usr/share/fbvncserver/sdglogo.png", "PNG");
+     QSizePolicy qsp(QSizePolicy::Fixed, QSizePolicy::Fixed);
+     SDG_Pixmap->setSizePolicy(qsp);
+     SDG_Pixmap->setPixmap(qi);
+diff -urN fbvncserver-0.9.4.old/splash/subclass.cpp fbvncserver-0.9.4/splash/subclass.cpp
+--- fbvncserver-0.9.4.old/splash/subclass.cpp	2003-04-29 23:23:41.000000000 -0400
++++ fbvncserver-0.9.4/splash/subclass.cpp	2004-02-27 11:35:36.000000000 -0500
+@@ -17,7 +17,7 @@
+ fbvncserverSplash::fbvncserverSplash(QWidget *parent, const char *name, bool modal, WFlags fl)
+     : fbvncserverSplashSuper(parent, name, modal, fl)
+ {
+-    QPixmap qi("/home/root/Applications/fbvncserver/sdglogo.png", "PNG");
++    QPixmap qi("/usr/share/fbvncserver/sdglogo.png", "PNG");
+     QSizePolicy qsp(QSizePolicy::Fixed, QSizePolicy::Fixed);
+     SDG_Pixmap->setSizePolicy(qsp);
+     SDG_Pixmap->setPixmap(qi);
diff --git a/packages/vnc/x11vnc_0.9.3.bb b/packages/vnc/x11vnc_0.9.3.bb
new file mode 100644
index 0000000000..04ac87b444
--- /dev/null
+++ b/packages/vnc/x11vnc_0.9.3.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Export your X session on-the-fly via VNC"
+SECTION = "x11/utils"
+HOMEPAGE = "http://www.karlrunge.com/x11vnc/"
+AUTHOR = "Karl Runge"
+LICENSE = "GPL"
+DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
+
+SRC_URI = "http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz"
+
+inherit autotools
+