diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/vnc | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/vnc')
| -rw-r--r-- | packages/vnc/fbvncserver-kmodule_0.9.4.bb | 25 | ||||
| -rw-r--r-- | packages/vnc/fbvncserver2_cvs.bb | 21 | ||||
| -rw-r--r-- | packages/vnc/fbvncserver_0.9.4.bb | 51 | ||||
| -rw-r--r-- | packages/vnc/files/buildfix.patch | 31 | ||||
| -rw-r--r-- | packages/vnc/files/init | 8 | ||||
| -rw-r--r-- | packages/vnc/files/ipaq.patch | 35 | ||||
| -rw-r--r-- | packages/vnc/files/kernelinclude.patch | 12 | ||||
| -rw-r--r-- | packages/vnc/files/libvncs0.6.patch | 61 | ||||
| -rw-r--r-- | packages/vnc/files/paths.patch | 52 | ||||
| -rw-r--r-- | packages/vnc/libvncserver/autoreconf.patch | 113983 | ||||
| -rw-r--r-- | packages/vnc/libvncserver/clientlogger.patch | 398 | ||||
| -rw-r--r-- | packages/vnc/libvncserver/configure_ac.patch | 15 | ||||
| -rw-r--r-- | packages/vnc/libvncserver_0.9.1.bb | 24 | ||||
| -rw-r--r-- | packages/vnc/libvncserver_0.9.bb | 32 | ||||
| -rw-r--r-- | packages/vnc/tightvnc/Makefile | 22 | ||||
| -rw-r--r-- | packages/vnc/tightvnc/Vncviewer | 66 | ||||
| -rw-r--r-- | packages/vnc/tightvnc_1.3.9.bb | 37 | ||||
| -rw-r--r-- | packages/vnc/vnc_3.3.7.bb | 21 | ||||
| -rw-r--r-- | packages/vnc/x11vnc_0.9.4.bb | 12 |
19 files changed, 0 insertions, 114906 deletions
diff --git a/packages/vnc/fbvncserver-kmodule_0.9.4.bb b/packages/vnc/fbvncserver-kmodule_0.9.4.bb deleted file mode 100644 index 4abdb6c7b0..0000000000 --- a/packages/vnc/fbvncserver-kmodule_0.9.4.bb +++ /dev/null @@ -1,25 +0,0 @@ -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/fbvncserver2_cvs.bb b/packages/vnc/fbvncserver2_cvs.bb deleted file mode 100644 index 29ce53274b..0000000000 --- a/packages/vnc/fbvncserver2_cvs.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "A Framebuffer VNC Server for PDA" -AUTHOR = "Patrik Gfeller <gfellerpatrik@gmx.net>" -HOMEPAGE = "http://fbvncserver.sourceforge.net/" -SECTION = "console/utils" -PRIORITY = "optional" -LICENSE = "GPLv2" -DEPENDS = "libvncserver jpeg zlib gmp tslib" -RRECOMMENDS = "kernel-modules-uinput kernel-module-keybdev" -RCONFLICTS = "fbvncserver, fbvncserver-kmodule" -PV = "0.0.0+cvs${SRCDATE}" -PR = "r0" - -SRC_URI = "cvs://anonymous@fbvncserver.cvs.sourceforge.net/cvsroot/fbvncserver;method=pserver;module=ipkg" -S = "${WORKDIR}/ipkg/src/" - -inherit autotools - -EXTRA_OECONF = "--enable-debug" - -FILES_${PN} += "${datadir}" - diff --git a/packages/vnc/fbvncserver_0.9.4.bb b/packages/vnc/fbvncserver_0.9.4.bb deleted file mode 100644 index 4e6ee15a86..0000000000 --- a/packages/vnc/fbvncserver_0.9.4.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "Framebuffer VNC server" -SECTION = "console/utils" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "libvncserver jpeg zlib" -RDEPENDS = "fbvncserver-kmodule libvncserver-storepasswd libvncserver-javaapplet" -PR = "r3" - -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/buildfix.patch b/packages/vnc/files/buildfix.patch deleted file mode 100644 index 302dbd9e8e..0000000000 --- a/packages/vnc/files/buildfix.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 deleted file mode 100644 index b01a1ebd79..0000000000 --- a/packages/vnc/files/init +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 deleted file mode 100644 index e8070c0f25..0000000000 --- a/packages/vnc/files/ipaq.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index b17d4e09c2..0000000000 --- a/packages/vnc/files/kernelinclude.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 0975c376bd..0000000000 --- a/packages/vnc/files/libvncs0.6.patch +++ /dev/null @@ -1,61 +0,0 @@ -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 deleted file mode 100644 index 7c122efc67..0000000000 --- a/packages/vnc/files/paths.patch +++ /dev/null @@ -1,52 +0,0 @@ -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/libvncserver/autoreconf.patch b/packages/vnc/libvncserver/autoreconf.patch deleted file mode 100644 index f13b4d0d50..0000000000 --- a/packages/vnc/libvncserver/autoreconf.patch +++ /dev/null @@ -1,113983 +0,0 @@ -diff -Nur LibVNCServer-0.9.1.orig/Makefile.in LibVNCServer-0.9.1/Makefile.in ---- LibVNCServer-0.9.1.orig/Makefile.in 2008-10-31 18:44:00.000000000 -0200 -+++ LibVNCServer-0.9.1/Makefile.in 2008-10-31 18:46:27.000000000 -0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.5 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,15 +15,11 @@ - @SET_MAKE@ - - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = . - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,20 +33,20 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ -+subdir = . - DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \ - $(srcdir)/LibVNCServer.spec.in $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/libvncserver-config.in \ - $(srcdir)/rfbconfig.h.in $(top_srcdir)/configure AUTHORS \ - COPYING ChangeLog INSTALL NEWS TODO compile config.guess \ - config.sub depcomp install-sh ltmain.sh missing --subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -- configure.lineno configure.status.lineno -+ configure.lineno config.status.lineno - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = rfbconfig.h - CONFIG_CLEAN_FILES = libvncserver-config LibVNCServer.spec -@@ -61,10 +57,11 @@ - DIST_SOURCES = - RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ -- install-exec-recursive install-info-recursive \ -- install-recursive installcheck-recursive installdirs-recursive \ -- pdf-recursive ps-recursive uninstall-info-recursive \ -- uninstall-recursive -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -73,6 +70,8 @@ - am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; - includeHEADERS_INSTALL = $(INSTALL_HEADER) - HEADERS = $(include_HEADERS) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -87,8 +86,6 @@ - distuninstallcheck_listfiles = find . -type f -print - distcleancheck_listfiles = find . -type f -print - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ -@@ -103,57 +100,38 @@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CRYPT_LIBS = @CRYPT_LIBS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGIPC_FALSE = @CYGIPC_FALSE@ --CYGIPC_TRUE = @CYGIPC_TRUE@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --ECHO = @ECHO@ -+DSYMUTIL = @DSYMUTIL@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --HAVE_LIBJPEG_FALSE = @HAVE_LIBJPEG_FALSE@ --HAVE_LIBJPEG_TRUE = @HAVE_LIBJPEG_TRUE@ --HAVE_LIBPTHREAD_FALSE = @HAVE_LIBPTHREAD_FALSE@ --HAVE_LIBPTHREAD_TRUE = @HAVE_LIBPTHREAD_TRUE@ --HAVE_LIBSDL_FALSE = @HAVE_LIBSDL_FALSE@ --HAVE_LIBSDL_TRUE = @HAVE_LIBSDL_TRUE@ --HAVE_LIBZ_FALSE = @HAVE_LIBZ_FALSE@ --HAVE_LIBZ_TRUE = @HAVE_LIBZ_TRUE@ --HAVE_MP3LAME_FALSE = @HAVE_MP3LAME_FALSE@ --HAVE_MP3LAME_TRUE = @HAVE_MP3LAME_TRUE@ --HAVE_RPM_FALSE = @HAVE_RPM_FALSE@ --HAVE_RPM_TRUE = @HAVE_RPM_TRUE@ --HAVE_SYSTEM_LIBVNCSERVER_FALSE = @HAVE_SYSTEM_LIBVNCSERVER_FALSE@ --HAVE_SYSTEM_LIBVNCSERVER_TRUE = @HAVE_SYSTEM_LIBVNCSERVER_TRUE@ --HAVE_X_FALSE = @HAVE_X_FALSE@ --HAVE_X_TRUE = @HAVE_X_TRUE@ -+FGREP = @FGREP@ -+GREP = @GREP@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ --LINUX_FALSE = @LINUX_FALSE@ --LINUX_TRUE = @LINUX_TRUE@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MINGW_FALSE = @MINGW_FALSE@ --MINGW_TRUE = @MINGW_TRUE@ -+MKDIR_P = @MKDIR_P@ -+NM = @NM@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ --OSX_FALSE = @OSX_FALSE@ --OSX_TRUE = @OSX_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -165,6 +143,7 @@ - RPMSOURCEDIR = @RPMSOURCEDIR@ - SDL_CFLAGS = @SDL_CFLAGS@ - SDL_LIBS = @SDL_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - SSL_LIBS = @SSL_LIBS@ -@@ -172,25 +151,17 @@ - SYSTEM_LIBVNCSERVER_CFLAGS = @SYSTEM_LIBVNCSERVER_CFLAGS@ - SYSTEM_LIBVNCSERVER_LIBS = @SYSTEM_LIBVNCSERVER_LIBS@ - VERSION = @VERSION@ --WITH_FFMPEG_FALSE = @WITH_FFMPEG_FALSE@ --WITH_FFMPEG_TRUE = @WITH_FFMPEG_TRUE@ --WITH_TIGHTVNC_FILETRANSFER_FALSE = @WITH_TIGHTVNC_FILETRANSFER_FALSE@ --WITH_TIGHTVNC_FILETRANSFER_TRUE = @WITH_TIGHTVNC_FILETRANSFER_TRUE@ - WSOCKLIB = @WSOCKLIB@ - X_CFLAGS = @X_CFLAGS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --ac_ct_AR = @ac_ct_AR@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -202,28 +173,40 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - includedir = $(prefix)/include/rfb - infodir = @infodir@ - install_sh = @install_sh@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - with_ffmpeg = @with_ffmpeg@ - SUBDIRS = libvncserver examples contrib libvncclient vncterm classes client_examples test - DIST_SUBDIRS = libvncserver examples contrib libvncclient vncterm classes client_examples test -@@ -242,15 +225,15 @@ - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ -- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ -- cd $(srcdir) && $(AUTOMAKE) --gnu \ -+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ -+ cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu Makefile -+ $(AUTOMAKE) --foreign Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -273,7 +256,7 @@ - rfbconfig.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ -- $(MAKE) stamp-h1; \ -+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi - - stamp-h1: $(srcdir)/rfbconfig.h.in $(top_builddir)/config.status -@@ -292,7 +275,7 @@ - cd $(top_builddir) && $(SHELL) ./config.status $@ - install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) -- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" -+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ -@@ -318,10 +301,9 @@ - - distclean-libtool: - -rm -f libtool --uninstall-info-am: - install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" -+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -@@ -368,8 +350,7 @@ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -+$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ -@@ -471,24 +452,22 @@ - - distdir: $(DISTFILES) - $(am__remove_distdir) -- mkdir $(distdir) -- $(mkdir_p) $(distdir)/. $(distdir)/rfb -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ test -d $(distdir) || mkdir $(distdir) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -502,7 +481,7 @@ - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ -- || $(mkdir_p) "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ -@@ -510,6 +489,8 @@ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -517,7 +498,7 @@ - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) - dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -@@ -592,7 +573,7 @@ - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ -- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' - distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -@@ -617,7 +598,7 @@ - installdirs: installdirs-recursive - installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-recursive - install-exec: install-exec-recursive -@@ -665,12 +646,20 @@ - - install-data-am: install-includeHEADERS - -+install-dvi: install-dvi-recursive -+ - install-exec-am: install-binSCRIPTS - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -691,28 +680,28 @@ - - ps-am: - --uninstall-am: uninstall-binSCRIPTS uninstall-includeHEADERS \ -- uninstall-info-am -+uninstall-am: uninstall-binSCRIPTS uninstall-includeHEADERS - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ -- check-am clean clean-generic clean-libtool clean-recursive \ -- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ -- dist-shar dist-tarZ dist-zip distcheck distclean \ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am am--refresh check check-am clean clean-generic \ -+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ -+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ -- distclean-recursive distclean-tags distcleancheck distdir \ -- distuninstallcheck dvi dvi-am html html-am info info-am \ -- install install-am install-binSCRIPTS install-data \ -- install-data-am install-exec install-exec-am \ -- install-includeHEADERS install-info install-info-am \ -- install-man install-strip installcheck installcheck-am \ -- installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive \ -- mostlyclean mostlyclean-generic mostlyclean-libtool \ -- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ -+ distclean-tags distcleancheck distdir distuninstallcheck dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-binSCRIPTS install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-includeHEADERS install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-binSCRIPTS \ -- uninstall-includeHEADERS uninstall-info-am -+ uninstall-includeHEADERS - - - $(PACKAGE)-$(VERSION).tar.gz: dist -diff -Nur LibVNCServer-0.9.1.orig/acinclude.m4 LibVNCServer-0.9.1/acinclude.m4 ---- LibVNCServer-0.9.1.orig/acinclude.m4 2008-10-31 18:44:00.000000000 -0200 -+++ LibVNCServer-0.9.1/acinclude.m4 2008-10-31 18:46:13.000000000 -0200 -@@ -601,6401 +601,3 @@ - AS_VAR_POPDEF([_DEF])dnl - AS_VAR_POPDEF([_OUT])dnl - ],[PACKAGE="$PACKAGE"])]) -- --# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- --## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 --## Free Software Foundation, Inc. --## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 --## --## This file is free software; the Free Software Foundation gives --## unlimited permission to copy and/or distribute it, with or without --## modifications, as long as this notice is preserved. -- --# serial 48 AC_PROG_LIBTOOL -- -- --# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) --# ----------------------------------------------------------- --# If this macro is not defined by Autoconf, define it here. --m4_ifdef([AC_PROVIDE_IFELSE], -- [], -- [m4_define([AC_PROVIDE_IFELSE], -- [m4_ifdef([AC_PROVIDE_$1], -- [$2], [$3])])]) -- -- --# AC_PROG_LIBTOOL --# --------------- --AC_DEFUN([AC_PROG_LIBTOOL], --[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl --dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX --dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. -- AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [AC_LIBTOOL_CXX], -- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -- ])]) --dnl And a similar setup for Fortran 77 support -- AC_PROVIDE_IFELSE([AC_PROG_F77], -- [AC_LIBTOOL_F77], -- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 --])]) -- |
