File x11vnc-examples.diff of Package x11vnc

Overview Repositories Revisions Requests Users Attributes Meta

File x11vnc-examples.diff of Package x11vnc (Revision 5285d634db4529a39f098a71b74e8b67)

Currently displaying revision 5285d634db4529a39f098a71b74e8b67 , Show latest

--- x11vnc/help.c.orig	2011-10-18 22:11:23.033000420 +0200
+++ x11vnc/help.c	2011-10-18 22:11:33.301000421 +0200
@@ -1803,7 +1803,7 @@
 "                       Xdummy:\n"
 "\n"
 "                       The Xdummy wrapper is part of the x11vnc source code\n"
-"                       (x11vnc/misc/Xdummy)  It should be available in PATH\n"
+"                       (x11vnc/examples/Xdummy)  It should be available in PATH\n"
 "                       and have run \"Xdummy -install\" once to create the\n"
 "                       shared library.  Xdummy only works on Linux.  As of\n"
 "                       12/2009 it no longer needs to be run as root, and the\n"
--- x11vnc/Makefile.in.orig	2011-10-18 22:10:18.218000421 +0200
+++ x11vnc/Makefile.in	2011-10-18 22:10:21.622000420 +0200
@@ -250,8 +250,8 @@
 @HAVE_X11_TRUE@@OSX_OPENGL_TRUE@@OSX_TRUE@GL = /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 @OSX_TRUE@x11vnc_LDFLAGS = $(FRAMEWORKS)
 @OSX_TRUE@x11vnc_CFLAGS = -ObjC
-SUBDIRS = misc
-DIST_SUBDIRS = misc
+SUBDIRS = examples
+DIST_SUBDIRS = examples
 desktopdir = $(datadir)/applications
 desktop_DATA = x11vnc.desktop
 man_MANS = x11vnc.1
--- x11vnc/misc/turbovnc/README.orig	2011-10-18 22:11:41.278000421 +0200
+++ x11vnc/misc/turbovnc/README	2011-10-18 22:11:47.087000419 +0200
@@ -45,7 +45,7 @@
 
 For those in a hurry:
 
-  cd x11vnc-x.y.z/x11vnc/misc/turbovnc
+  cd x11vnc-x.y.z/x11vnc/examples/turbovnc
   ./apply_turbovnc
   cd ../../..
   env LDFLAGS='-L/DIR -Xlinker --rpath=/DIR' ./configure
@@ -58,7 +58,7 @@
 ----------------------
 
 After unpacking your x11vnc-x.y.z.tar.gz tarball cd to the
-x11vnc-x.y.z/x11vnc/misc/turbovnc (where this README file is) and from
+x11vnc-x.y.z/x11vnc/examples/turbovnc (where this README file is) and from
 that directory run:
 
 	./apply_turbovnc
--- x11vnc/Makefile.am.orig	2011-10-18 22:10:08.444000421 +0200
+++ x11vnc/Makefile.am	2011-10-18 22:10:14.067000419 +0200
@@ -17,8 +17,8 @@
 x11vnc_CFLAGS = -ObjC
 endif
 
-SUBDIRS = misc
-DIST_SUBDIRS = misc
+SUBDIRS = examples
+DIST_SUBDIRS = examples
 
 desktopdir = $(datadir)/applications
 desktop_DATA = x11vnc.desktop
--- x11vnc/README.orig	2011-10-18 22:10:31.923000420 +0200
+++ x11vnc/README	2011-10-18 22:11:14.365000420 +0200
@@ -912,14 +912,14 @@
      * Improved support for non-X11 touchscreen devices (e.g. handheld or
        cell phone) via Linux uinput input injection. Additional tuning
        parameters are added. TSLIB touchscreen calibration is supported.
-       Tested on Qtmoko Neo Freerunner. A tool, misc/uinput.pl, is
+       Tested on Qtmoko Neo Freerunner. A tool, examples/uinput.pl, is
        provided to diagnose uinput behavior on new devices. The env.
        vars. X11VNC_UINPUT_BUS and X11VNC_UINPUT_VERSION are available if
        leaving them unset does not work.
      * The Linux uinput non-X11 input injection can now be bypassed:
        events can be directly written to the /dev/input/event devices
        specified by the user (direct_abs=..., etc.) A -pipeinput input
-       injection helper script, misc/qt_tslib_inject.pl is provided as a
+       injection helper script, examples/qt_tslib_inject.pl is provided as a
        tweakable non-builtin direct input injection method.
      * The list of new uinput parameters for the above two features is:
        pressure, tslib_cal, touch_always, dragskip, btn_touch;
@@ -1036,7 +1036,7 @@
        x11vnc to use the -xrandr screen size change trapping code.
      * New remote control query options: pointer_x, pointer_y,
        pointer_same, pointer_root, and pointer_mask. A demo script using
-       them misc/panner.pl is provided.
+       them examples/panner.pl is provided.
      * The -sslScripts option prints out the SSL certificate management
        scripts.
 
@@ -5525,7 +5525,7 @@
    Q-67: Can x11vnc provide a multi-user desktop web login service as an
    Apache CGI or PHP script?
    Yes. See the example script desktop.cgi for ideas. It is in the source
-   tree in the directory x11vnc/misc. It serves x11vnc's SSL enabled Java
+   tree in the directory x11vnc/examples. It serves x11vnc's SSL enabled Java
    Applet to the web browser with the correct connection information for
    the user's virtual desktop (an Xvfb session via -create; be sure to
    add the Xvfb package.) HTTPS/SSL enabled Apache should be used to
@@ -6479,12 +6479,12 @@
    down the delays, e.g. "-wait 5" and "-defer 5" (or even a smaller
    setting) to poll and pump things out more quickly.
 
-   See the instructions in "x11vnc/misc/turbovnc/README" for how to build
+   See the instructions in "x11vnc/examples/turbovnc/README" for how to build
    x11vnc with TurboVNC support. You will also need to download the
    TurboJPEG software.
 
    In brief, the steps look like this:
-  cd x11vnc-x.y.z/x11vnc/misc/turbovnc
+  cd x11vnc-x.y.z/x11vnc/examples/turbovnc
   ./apply_turbovnc
   cd ../../..
   env LDFLAGS='-L/DIR -Xlinker --rpath=/DIR' ./configure
@@ -6498,7 +6498,7 @@
    it went.
 
    There also may be some Linux.i686 and Darwin.i386 x11vnc binaries with
-   TurboVNC support in the misc. bins directory. For other platforms you
+   TurboVNC support in the examples bins directory. For other platforms you
    will need to compile yourself.
 
    On relatively cheap and old hardware (Althon64 X2 5000+ / GeForce
@@ -7740,7 +7740,7 @@
 
    Note the -pipeinput helper program could actually control the raw
    framebuffer. In the libvncserver CVS a simple example program
-   x11vnc/misc/slide.pl is provided that demonstrates a simple jpeg
+   x11vnc/examples/slide.pl is provided that demonstrates a simple jpeg
    "slideshow" application. Also the builtin "-pipeinput VID" mode does
    this for webcams and TV capture devices (/dev/video0.)
 
@@ -7750,7 +7750,7 @@
 
    Another example provided in libvncserver CVS is a script to inject
    keystrokes into the Linux console (e.g. the virtual consoles:
-   /dev/tty1, /dev/tty2, etc) in x11vnc/misc/vcinject.pl. It is based on
+   /dev/tty1, /dev/tty2, etc) in x11vnc/examples/vcinject.pl. It is based on
    the vncterm/LinuxVNC.c program also in the libvncserver CVS. So to
    view and interact with VT #2 (assuming it is the active VT) one can
    run something like:
@@ -8087,7 +8087,7 @@
    writing the touchscreen events directly to /dev/input/event1 then
    input can be injected into the system. There is no x11vnc builtin mode
    for this yet (until we understand it better), but there is a working
-   script provided in x11vnc/misc/qt_tslib_inject.pl. So one could use it
+   script provided in x11vnc/examples/qt_tslib_inject.pl. So one could use it
    this way for example:
   x11vnc ... -rawfb console -pipeinput path/to/qt_tslib_inject.pl -env INJECT_O
 PTIONS=clickonly,cal=/etc/pointercal
@@ -8096,7 +8096,7 @@
    options mean (e.g. /etc/pointercal contains TSLIB's calibration
    parameters and are necessary to achieve accurate pointing.)
 
-   The x11vnc/misc/qt_tslib_inject.pl script can potentially be modified
+   The x11vnc/examples/qt_tslib_inject.pl script can potentially be modified
    to handle other devices where the uinput method fails. It could also
    be modified to create 'hot keys', etc.
 
@@ -9144,7 +9144,7 @@
    For inetd.conf, an example is:
   5900 stream tcp6 nowait root /usr/sbin/tcpd /usr/local/bin/x11vnc_wrapper.sh
 
-   We also provide a transitional tool in "x11vnc/misc/inet6to4" that
+   We also provide a transitional tool in "x11vnc/examples/inet6to4" that
    acts as a relay for any IPv4 application to allow connections over
    IPv6. For example:
   inet6to4 5900 localhost:5900
@@ -14238,7 +14238,7 @@
                        Xdummy:
 
                        The Xdummy wrapper is part of the x11vnc source code
-                       (x11vnc/misc/Xdummy)  It should be available in PATH
+                       (x11vnc/examples/Xdummy)  It should be available in PATH
                        and have run "Xdummy -install" once to create the
                        shared library.  Xdummy only works on Linux.  As of
                        12/2009 it no longer needs to be run as root, and the
--- x11vnc/x11vnc.1.orig	2011-10-18 22:12:02.480000421 +0200
+++ x11vnc/x11vnc.1	2011-10-18 22:12:10.382000419 +0200
@@ -2003,7 +2003,7 @@
 Xdummy:
 .IP
 The Xdummy wrapper is part of the x11vnc source code
-(x11vnc/misc/Xdummy)  It should be available in PATH
+(x11vnc/examples/Xdummy)  It should be available in PATH
 and have run "Xdummy \fB-install"\fR once to create the
 shared library.  Xdummy only works on Linux.  As of
 12/2009 it no longer needs to be run as root, and the
--- README.orig	2011-10-18 22:08:05.333000420 +0200
+++ README	2011-10-18 22:09:35.980000420 +0200
@@ -912,14 +912,14 @@
      * Improved support for non-X11 touchscreen devices (e.g. handheld or
        cell phone) via Linux uinput input injection. Additional tuning
        parameters are added. TSLIB touchscreen calibration is supported.
-       Tested on Qtmoko Neo Freerunner. A tool, misc/uinput.pl, is
+       Tested on Qtmoko Neo Freerunner. A tool, examples/uinput.pl, is
        provided to diagnose uinput behavior on new devices. The env.
        vars. X11VNC_UINPUT_BUS and X11VNC_UINPUT_VERSION are available if
        leaving them unset does not work.
      * The Linux uinput non-X11 input injection can now be bypassed:
        events can be directly written to the /dev/input/event devices
        specified by the user (direct_abs=..., etc.) A -pipeinput input
-       injection helper script, misc/qt_tslib_inject.pl is provided as a
+       injection helper script, examples/qt_tslib_inject.pl is provided as a
        tweakable non-builtin direct input injection method.
      * The list of new uinput parameters for the above two features is:
        pressure, tslib_cal, touch_always, dragskip, btn_touch;
@@ -1036,7 +1036,7 @@
        x11vnc to use the -xrandr screen size change trapping code.
      * New remote control query options: pointer_x, pointer_y,
        pointer_same, pointer_root, and pointer_mask. A demo script using
-       them misc/panner.pl is provided.
+       them examples/panner.pl is provided.
      * The -sslScripts option prints out the SSL certificate management
        scripts.
 
@@ -6479,7 +6479,7 @@
    down the delays, e.g. "-wait 5" and "-defer 5" (or even a smaller
    setting) to poll and pump things out more quickly.
 
-   See the instructions in "x11vnc/misc/turbovnc/README" for how to build
+   See the instructions in "x11vnc/examples/turbovnc/README" for how to build
    x11vnc with TurboVNC support. You will also need to download the
    TurboJPEG software.
 
@@ -7740,7 +7740,7 @@
 
    Note the -pipeinput helper program could actually control the raw
    framebuffer. In the libvncserver CVS a simple example program
-   x11vnc/misc/slide.pl is provided that demonstrates a simple jpeg
+   x11vnc/examples/slide.pl is provided that demonstrates a simple jpeg
    "slideshow" application. Also the builtin "-pipeinput VID" mode does
    this for webcams and TV capture devices (/dev/video0.)
 
@@ -7750,7 +7750,7 @@
 
    Another example provided in libvncserver CVS is a script to inject
    keystrokes into the Linux console (e.g. the virtual consoles:
-   /dev/tty1, /dev/tty2, etc) in x11vnc/misc/vcinject.pl. It is based on
+   /dev/tty1, /dev/tty2, etc) in x11vnc/examples/vcinject.pl. It is based on
    the vncterm/LinuxVNC.c program also in the libvncserver CVS. So to
    view and interact with VT #2 (assuming it is the active VT) one can
    run something like:
@@ -8087,7 +8087,7 @@
    writing the touchscreen events directly to /dev/input/event1 then
    input can be injected into the system. There is no x11vnc builtin mode
    for this yet (until we understand it better), but there is a working
-   script provided in x11vnc/misc/qt_tslib_inject.pl. So one could use it
+   script provided in x11vnc/examples/qt_tslib_inject.pl. So one could use it
    this way for example:
   x11vnc ... -rawfb console -pipeinput path/to/qt_tslib_inject.pl -env INJECT_O
 PTIONS=clickonly,cal=/etc/pointercal
@@ -8096,7 +8096,7 @@
    options mean (e.g. /etc/pointercal contains TSLIB's calibration
    parameters and are necessary to achieve accurate pointing.)
 
-   The x11vnc/misc/qt_tslib_inject.pl script can potentially be modified
+   The x11vnc/examples/qt_tslib_inject.pl script can potentially be modified
    to handle other devices where the uinput method fails. It could also
    be modified to create 'hot keys', etc.
 
@@ -9144,7 +9144,7 @@
    For inetd.conf, an example is:
   5900 stream tcp6 nowait root /usr/sbin/tcpd /usr/local/bin/x11vnc_wrapper.sh
 
-   We also provide a transitional tool in "x11vnc/misc/inet6to4" that
+   We also provide a transitional tool in "x11vnc/examples/inet6to4" that
    acts as a relay for any IPv4 application to allow connections over
    IPv6. For example:
   inet6to4 5900 localhost:5900
--- configure.ac.orig	2011-10-18 22:09:38.625000420 +0200
+++ configure.ac	2011-10-18 22:09:47.621000421 +0200
@@ -837,7 +837,7 @@
 	#
 	# configure.ac:690: required file `x11vnc/Makefile.in' not found
 	#
-	AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile x11vnc/misc/turbovnc/Makefile])
+	AC_CONFIG_FILES([x11vnc/Makefile x11vnc/examples/Makefile x11vnc/examples/turbovnc/Makefile])
 
 	if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno"; then
 		# need to move local tarball rfb headers aside:

Places

File x11vnc-examples.diff of Package x11vnc (Revision 5285d634db4529a39f098a71b74e8b67)

Places