merge of 7d7323376ea7f6cae9fe0cdfb367a78cab4dd545

     and b54bb5e5747d757772498c2e3c720f407fdcf023

4 files changed, 33 insertions, 92 deletions

diff --git a/packages/libvncserver/libvncserver_0.6.bb b/packages/libvncserver/libvncserver_0.6.bb
deleted file mode 100644
index 386f266d2d..0000000000
--- a/packages/libvncserver/libvncserver_0.6.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "library for easy implementation of a RDP/VNC server"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "zlib jpeg"
-LICENSE = "GPL"
-PACKAGES = "libvncserver-storepasswd libvncserver-javaapplet"
-FILES_libvncserver-storepasswd = "${bindir}/storepasswd"
-FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \
-			         ${datadir}/fbvncserver/classes/VncViewer.jar"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz"
-
-CFLAGS_append = " -D_REENTRANT"
-S = "${WORKDIR}/LibVNCServer-${PV}"
-
-inherit autotools
-
-do_stage () {
-	install -d ${STAGING_INCDIR}/rfb
-	install -m 0644 rfb/rfb.h rfb/rfbproto.h rfb/rfbint.h rfb/rfbconfig.h \
-		    rfb/rfbclient.h rfb/rfbregion.h rfb/keysym.h \
-		    rfb/default8x16.h ${STAGING_INCDIR}/rfb
-
-	oe_libinstall -a -C libvncclient libvncclient ${STAGING_LIBDIR}/
-	oe_libinstall -a libvncserver ${STAGING_LIBDIR}/
-}
-
-do_install () {
-	install -d ${D}${bindir}
-	install -m 0755 examples/storepasswd ${D}${bindir}
-	install -d ${D}${datadir}/fbvncserver/classes
-	install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/
-	install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/
-}
diff --git a/packages/libvncserver/libvncserver_0.7.1.bb b/packages/libvncserver/libvncserver_0.7.1.bb
deleted file mode 100644
index 80a70e5f57..0000000000
--- a/packages/libvncserver/libvncserver_0.7.1.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "library for easy implementation of a RDP/VNC server"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "zlib jpeg"
-LICENSE = "GPL"
-PACKAGES = "libvncserver-storepasswd libvncserver-javaapplet"
-FILES_libvncserver-storepasswd = "${bindir}/storepasswd"
-FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \
-			         ${datadir}/fbvncserver/classes/VncViewer.jar"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz"
-
-CFLAGS_append = " -D_REENTRANT"
-S = "${WORKDIR}/LibVNCServer-${PV}"
-# Original SUBDIRS is='libvncserver examples contrib x11vnc vncterm classes libvncclient client_examples test'
-EXTRA_OEMAKE_append=" SUBDIRS='libvncserver examples classes'"
-
-inherit autotools
-
-do_stage () {
-	install -d ${STAGING_INCDIR}/rfb
-	install -m 0644 rfb/rfb.h rfb/rfbproto.h rfb/rfbint.h rfb/rfbconfig.h \
-		    rfb/rfbclient.h rfb/rfbregion.h rfb/keysym.h \
-		    rfb/default8x16.h ${STAGING_INCDIR}/rfb
-
-	oe_libinstall -a -C libvncserver libvncserver ${STAGING_LIBDIR}/
-}
-
-do_install () {
-	install -d ${D}${bindir}
-	install -m 0755 examples/storepasswd ${D}${bindir}
-	install -d ${D}${datadir}/fbvncserver/classes
-	install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/
-	install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/
-}
diff --git a/packages/libvncserver/libvncserver_0.8.2.bb b/packages/libvncserver/libvncserver_0.8.2.bb
new file mode 100644
index 0000000000..480a888745
--- /dev/null
+++ b/packages/libvncserver/libvncserver_0.8.2.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "A library to support implementations of RDP/VNC servers"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://sourceforge.net/projects/libvncserver"
+AUTHOR = "Johannes Schindelin <dscho@users.sourceforge.net>"
+MAINTAINER = "Patrik Gfeller <gfellerpatrik@gmx.net>"
+SECTION = "libs"
+PRIORITY = "optional"
+PROVIDES = "x11vnc"
+DEPENDS = "virtual/libsdl virtual/libx11 zlib jpeg"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz;md5sum=17a18e398af6c1730f72068022a152aa"
+S = "${WORKDIR}/LibVNCServer-${PV}"
+
+inherit autotools
+
+do_stage() {
+    autotools_stage_all
+}
+
+do_install_append() {
+        install -d ${D}${bindir}
+        install -m 0755 examples/storepasswd ${D}${bindir}
+        install -d ${D}${datadir}/fbvncserver/classes
+        install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/
+        install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/
+}
+
+PACKAGES =+ "x11vnc libvncserver-storepasswd libvncserver-javaapplet"
+FILES_x11vnc = "${bindir}/x11vnc ${bindir}/LinuxVNC"
+FILES_libvncserver-storepasswd = "${bindir}/storepasswd"
+FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \
+                                 ${datadir}/fbvncserver/classes/VncViewer.jar"
diff --git a/packages/libvncserver/x11vnc_0.7.1.bb b/packages/libvncserver/x11vnc_0.7.1.bb
deleted file mode 100644
index 944710497f..0000000000
--- a/packages/libvncserver/x11vnc_0.7.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "X11 VNC server"
-SECTION = "x11"
-PRIORITY = "optional"
-DEPENDS = "zlib jpeg virtual/libx11"
-LICENSE = "GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz"
-
-CFLAGS_append = " -D_REENTRANT"
-S = "${WORKDIR}/LibVNCServer-${PV}"
-# Original SUBDIRS is='libvncserver examples contrib vncterm classes libvncclient client_examples test'
-EXTRA_OEMAKE_append=" SUBDIRS='libvncserver x11vnc'"
-
-inherit autotools
-
-do_install () {
-	install -d ${D}${bindir}
-	install -m 0755 x11vnc/x11vnc ${D}${bindir}
-}