cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update x11vnc to 0.9.12, rolling in many of the patches

Browse Source
This commit is contained in:
sthen 2010-09-15 08:21:09 +00:00
parent cd5889a8a1
commit 041bf9f688
12 changed files with 20 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/x11vnc/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.19 2010/09/03 15:58:12 sthen Exp $
# $OpenBSD: Makefile,v 1.20 2010/09/15 08:21:09 sthen Exp $
COMMENT = VNC server for real X displays
DISTNAME = x11vnc-0.9.11
REVISION= 0
DISTNAME = x11vnc-0.9.12
CATEGORIES = x11
HOMEPAGE = http://www.karlrunge.com/x11vnc/

10
x11/x11vnc/distinfo
View File

@ -1,5 +1,5 @@
MD5 (x11vnc-0.9.11.tar.gz) = 24m2kwZff/TsfW9B4KC47Q==
RMD160 (x11vnc-0.9.11.tar.gz) = kqAKoKSlKaQroz8024S6BUVOPTk=
SHA1 (x11vnc-0.9.11.tar.gz) = 8k10fz+//JdAz+26sLOeptoMgX0=
SHA256 (x11vnc-0.9.11.tar.gz) = +8ep5tOK/Pu4MtSOpAhII/prucDjepJYmCKcpzY55/U=
SIZE (x11vnc-0.9.11.tar.gz) = 2754816
MD5 (x11vnc-0.9.12.tar.gz) = FJimjQKqe2yXv3RsBzyNAA==
RMD160 (x11vnc-0.9.12.tar.gz) = Tfg15TprPczUfUkQmnEsBAWnmNc=
SHA1 (x11vnc-0.9.12.tar.gz) = z04kvuWWK1LY8qVEKnxElDqcwLs=
SHA256 (x11vnc-0.9.12.tar.gz) = YKfM7uLJpfHIVDQLK64T+XWsVZBiNwQvgfeVsooVSnk=
SIZE (x11vnc-0.9.12.tar.gz) = 2757806

12
x11/x11vnc/patches/patch-x11vnc_connections_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-x11vnc_connections_c,v 1.1 2010/09/03 15:58:12 sthen Exp $
--- x11vnc/connections.c.orig Fri Jul 23 04:34:45 2010
+++ x11vnc/connections.c Fri Sep 3 16:45:37 2010
@@ -3145,7 +3145,7 @@ static void pmove(int x, int y) {
return;
}
rfbLog("pmove: x y: %d %d\n", x, y);
- pointer(0, x, y, NULL);
+ pointer_event(0, x, y, NULL);
X_LOCK;
XFlush_wr(dpy);
X_UNLOCK;

8
x11/x11vnc/patches/patch-x11vnc_help_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-x11vnc_help_c,v 1.3 2010/08/22 16:56:34 sthen Exp $
--- x11vnc/help.c.orig Fri Jul 23 04:34:45 2010
+++ x11vnc/help.c Tue Aug 10 14:27:23 2010
@@ -5784,7 +5784,7 @@ void xopen_display_fail_message(char *disp) {
$OpenBSD: patch-x11vnc_help_c,v 1.4 2010/09/15 08:21:10 sthen Exp $
--- x11vnc/help.c.orig Fri Sep 10 04:46:48 2010
+++ x11vnc/help.c Sun Sep 12 18:57:40 2010
@@ -5799,7 +5799,7 @@ void xopen_display_fail_message(char *disp) {
fprintf(stderr, " -auth /var/lib/gdm/:0.Xauth\n");
fprintf(stderr, " kdm: -auth /var/lib/kdm/A:0-crWk72\n");
fprintf(stderr, " -auth /var/run/xauth/A:0-crWk72\n");

15
x11/x11vnc/patches/patch-x11vnc_keyboard_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-x11vnc_keyboard_c,v 1.1 2010/09/03 15:58:12 sthen Exp $
--- x11vnc/keyboard.c.orig Fri Jul 23 04:34:45 2010
+++ x11vnc/keyboard.c Fri Sep 3 16:45:37 2010
@@ -2898,9 +2898,9 @@ static void pipe_keyboard(rfbBool down, rfbKeySym keys
t[1] = '\0';
if (sscanf(t, "%d", &butt) == 1) {
mask = 1<<(butt-1);
- pointer(mask, x, y, client);
+ pointer_event(mask, x, y, client);
mask = 0;
- pointer(mask, x, y, client);
+ pointer_event(mask, x, y, client);
}
b++;
}

21
x11/x11vnc/patches/patch-x11vnc_pointer_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-x11vnc_pointer_c,v 1.1 2010/09/03 15:58:12 sthen Exp $
--- x11vnc/pointer.c.orig Fri Jul 23 04:34:45 2010
+++ x11vnc/pointer.c Fri Sep 3 16:45:37 2010
@@ -54,7 +54,7 @@ int pointer_queued_sent = 0;
void initialize_pointer_map(char *pointer_remap);
void do_button_mask_change(int mask, int button);
-void pointer(int mask, int x, int y, rfbClientPtr client);
+void pointer_event(int mask, int x, int y, rfbClientPtr client);
void initialize_pipeinput(void);
int check_pipeinput(void);
void update_x11_pointer_position(int x, int y);
@@ -659,7 +659,7 @@ static void pipe_pointer(int mask, int x, int y, rfbCl
* This may queue pointer events rather than sending them immediately
* to the X server. (see update_x11_pointer*())
*/
-void pointer(int mask, int x, int y, rfbClientPtr client) {
+void pointer_event(int mask, int x, int y, rfbClientPtr client) {
allowed_input_t input;
int sent = 0, buffer_it = 0;
double now;

12
x11/x11vnc/patches/patch-x11vnc_pointer_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-x11vnc_pointer_h,v 1.1 2010/09/03 15:58:12 sthen Exp $
--- x11vnc/pointer.h.orig Fri Jul 23 04:34:45 2010
+++ x11vnc/pointer.h Fri Sep 3 16:45:37 2010
@@ -39,7 +39,7 @@ extern int pointer_queued_sent;
extern void initialize_pointer_map(char *pointer_remap);
extern void do_button_mask_change(int mask, int button);
-extern void pointer(int mask, int x, int y, rfbClientPtr client);
+extern void pointer_event(int mask, int x, int y, rfbClientPtr client);
extern int check_pipeinput(void);
extern void initialize_pipeinput(void);
extern void update_x11_pointer_position(int x, int y);

24
x11/x11vnc/patches/patch-x11vnc_remote_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-x11vnc_remote_c,v 1.1 2010/09/03 15:58:12 sthen Exp $
--- x11vnc/remote.c.orig Fri Jul 23 04:34:45 2010
+++ x11vnc/remote.c Fri Sep 3 16:45:37 2010
@@ -4444,9 +4444,9 @@ char *process_remote_cmd(char *cmd, int stringonly) {
p += strlen("ptr:");
rfbLog("remote_cmd: insert pointer event: %s\n", p);
if (sscanf(p, "%d,%d,%d", &x, &y, &m) == 3) {
- pointer(m, x, y, NULL);
+ pointer_event(m, x, y, NULL);
} else if (sscanf(p, "%d,%d", &x, &y) == 2) {
- pointer(m, x, y, NULL);
+ pointer_event(m, x, y, NULL);
} else {
rfbLog("remote_cmd: bad ptr:x,y,mask\n");
}
@@ -4611,7 +4611,7 @@ char *process_remote_cmd(char *cmd, int stringonly) {
} else if (strstr(res, "GRAB_FAIL") && try < max_tries) {
rfbLog("bcx_xattach: failed grab check for '%s': %s. Retrying[%d]...\n", p, res, try);
free(res);
- pointer(0, dpy_x/2 + try, dpy_y/2 + try, NULL);
+ pointer_event(0, dpy_x/2 + try, dpy_y/2 + try, NULL);
#if !NO_X11
X_LOCK;
XFlush_wr(dpy);

21
x11/x11vnc/patches/patch-x11vnc_scan_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-x11vnc_scan_c,v 1.1 2010/09/03 15:58:12 sthen Exp $
--- x11vnc/scan.c.orig Fri Jul 23 04:34:45 2010
+++ x11vnc/scan.c Fri Sep 3 16:45:37 2010
@@ -3550,7 +3550,7 @@ int scan_for_updates(int count_only) {
fb_copy_in_progress = 0;
SCAN_FATAL(cs);
if (use_threads && pointer_mode != 1) {
- pointer(-1, 0, 0, NULL);
+ pointer_event(-1, 0, 0, NULL);
}
nap_check(tile_count);
return tile_count;
@@ -3637,7 +3637,7 @@ if (tile_count) fprintf(stderr, "XX copytile: %.4f ti
* tell the pointer handler it can process any queued
* pointer events:
*/
- pointer(-1, 0, 0, NULL);
+ pointer_event(-1, 0, 0, NULL);
}
if (blackouts) {

20
x11/x11vnc/patches/patch-x11vnc_screen_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-x11vnc_screen_c,v 1.1 2010/09/03 15:58:12 sthen Exp $
--- x11vnc/screen.c.orig Fri Jul 23 04:34:45 2010
+++ x11vnc/screen.c Fri Sep 3 16:45:37 2010
@@ -1381,6 +1381,7 @@ static rfbCredential* vnc_reflect_get_credential(rfbCl
char *clic = getenv("X11VNC_REFLECT_CLIENTCERT");
char *clik = getenv("X11VNC_REFLECT_CLIENTKEY");
int db = 0;
+ if (client) {}
if (db) fprintf(stderr, "type: %d\n", type);
#ifdef rfbCredentialTypeUser
if (type == rfbCredentialTypeUser) {
@@ -3616,7 +3617,7 @@ void initialize_screen(int *argc, char **argv, XImage
/* event callbacks: */
screen->newClientHook = new_client;
screen->kbdAddEvent = keyboard;
- screen->ptrAddEvent = pointer;
+ screen->ptrAddEvent = pointer_event;
screen->setXCutText = xcut_receive;
screen->setTranslateFunction = set_xlate_wrapper;

21
x11/x11vnc/patches/patch-x11vnc_userinput_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-x11vnc_userinput_c,v 1.1 2010/09/03 15:58:12 sthen Exp $
--- x11vnc/userinput.c.orig Fri Jul 23 04:34:45 2010
+++ x11vnc/userinput.c Fri Sep 3 16:45:37 2010
@@ -3008,7 +3008,7 @@ if (db) fprintf(stderr, "check_xrecord: BUTTON-UP-KEEP
pointer_queued_sent = 0;
last_x = cursor_x;
last_y = cursor_y;
- pointer(-1, 0, 0, NULL);
+ pointer_event(-1, 0, 0, NULL);
pointer_flush_delay = 0.0;
if (xrecording && pointer_queued_sent && button_mask_save &&
@@ -4565,7 +4565,7 @@ if (db) fprintf(stderr, "INTERIOR\n");
/* -threads support for check_wireframe() is rough... crash? */
if (use_threads) {
/* purge any stored up pointer events: */
- pointer(-1, 0, 0, NULL);
+ pointer_event(-1, 0, 0, NULL);
}
if (cursor_noshape_updates_clients(screen)) {

10
x11/x11vnc/pkg/PLIST
View File

@ -1,5 +1,13 @@
@comment $OpenBSD: PLIST,v 1.5 2009/12/21 20:46:03 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.6 2010/09/15 08:21:10 sthen Exp $
@bin bin/x11vnc
include/rfb/
include/rfb/keysym.h
include/rfb/rfb.h
include/rfb/rfbclient.h
include/rfb/rfbconfig.h
include/rfb/rfbint.h
include/rfb/rfbproto.h
include/rfb/rfbregion.h
@man man/man1/x11vnc.1
share/applications/x11vnc.desktop
share/doc/x11vnc/