OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=76

xorg-server-1.4-vnc-disable_render.diff

@@ -0,0 +1,127 @@
+diff -u -r -p ../xorg-server-1.4.0.90.orig//hw/dmx/vnc/vncInit.c ./hw/dmx/vnc/vncInit.c
+--- ../xorg-server-1.4.0.90.orig//hw/dmx/vnc/vncInit.c	2008-05-05 12:35:43.000000000 +0000
++++ ./hw/dmx/vnc/vncInit.c	2008-05-05 12:47:11.000000000 +0000
+@@ -45,6 +45,10 @@
+ 
+ #include <netinet/in.h>
+ 
++#ifdef RENDER
++#undef RENDER
++#endif
++
+ int vncScreenPrivateIndex = -1;
+ int rfbGCIndex = -1;
+ int inetdSock = -1;
+diff -u -r -p ../xorg-server-1.4.0.90.orig//hw/dmx/vnc/vncint.h ./hw/dmx/vnc/vncint.h
+--- ../xorg-server-1.4.0.90.orig//hw/dmx/vnc/vncint.h	2008-05-05 12:35:43.000000000 +0000
++++ ./hw/dmx/vnc/vncint.h	2008-05-05 12:47:22.000000000 +0000
+@@ -24,6 +24,10 @@
+ 
+ #include <netinet/in.h>
+ 
++#ifdef RENDER
++#undef RENDER
++#endif
++
+ extern int vncScreenPrivateIndex;
+ 
+ #define VNCPTR(pScreen)\
+diff -u -r -p ../xorg-server-1.4.0.90.orig//hw/vnc/draw.c ./hw/vnc/draw.c
+--- ../xorg-server-1.4.0.90.orig//hw/vnc/draw.c	2008-05-05 12:35:43.000000000 +0000
++++ ./hw/vnc/draw.c	2008-05-05 12:47:41.000000000 +0000
+@@ -59,6 +59,10 @@ in this Software without prior written a
+ 
+ #include "rfb.h"
+ 
++#ifdef RENDER
++#undef RENDER
++#endif
++
+ int rfbDeferUpdateTime = 40; /* ms */
+ 
+ 
+diff -u -r -p ../xorg-server-1.4.0.90.orig//hw/vnc/init.c ./hw/vnc/init.c
+--- ../xorg-server-1.4.0.90.orig//hw/vnc/init.c	2008-05-05 12:35:43.000000000 +0000
++++ ./hw/vnc/init.c	2008-05-05 12:47:49.000000000 +0000
+@@ -95,6 +95,10 @@ from the X Consortium.
+ #include <vncserverctrl.h>
+ #endif
+ 
++#ifdef RENDER
++#undef RENDER
++#endif
++
+ #define RFB_DEFAULT_WIDTH  640
+ #define RFB_DEFAULT_HEIGHT 480
+ #define RFB_DEFAULT_DEPTH  8
+diff -u -r -p ../xorg-server-1.4.0.90.orig//hw/vnc/rfb.h ./hw/vnc/rfb.h
+--- ../xorg-server-1.4.0.90.orig//hw/vnc/rfb.h	2008-05-05 12:35:43.000000000 +0000
++++ ./hw/vnc/rfb.h	2008-05-05 12:48:23.000000000 +0000
+@@ -92,6 +92,10 @@
+ 	rfbScreenInfoPtr pVNC = &rfbScreen
+ #endif
+ 
++#ifdef RENDER
++#undef RENDER
++#endif
++
+ /*
+  * Per-screen (framebuffer) structure.  There is only one of these, since we
+  * don't allow the X server to have multiple screens.
+diff -u -r -p ../xorg-server-1.4.0.90.orig//hw/vnc/sprite.c ./hw/vnc/sprite.c
+--- ../xorg-server-1.4.0.90.orig//hw/vnc/sprite.c	2008-05-05 12:35:43.000000000 +0000
++++ ./hw/vnc/sprite.c	2008-05-05 12:49:12.000000000 +0000
+@@ -74,6 +74,11 @@ in this Software without prior written a
+ # include   "mipointer.h"
+ # include   "spritest.h"
+ # include   "dixfontstr.h"
++
++#ifdef RENDER
++#undef RENDER
++#endif
++
+ #ifdef RENDER
+ # include   "mipict.h"
+ #endif
+diff -u -r -p ../xorg-server-1.4.0.90.orig//hw/vnc/spritest.h ./hw/vnc/spritest.h
+--- ../xorg-server-1.4.0.90.orig//hw/vnc/spritest.h	2008-05-05 12:35:43.000000000 +0000
++++ ./hw/vnc/spritest.h	2008-05-05 12:49:24.000000000 +0000
+@@ -54,6 +54,10 @@ in this Software without prior written a
+ # include   "sprite.h"
+ 
+ #ifdef RENDER
++#undef RENDER
++#endif
++
++#ifdef RENDER
+ # include   "picturestr.h"
+ #endif
+ 
+diff -u -r -p ../xorg-server-1.4.0.90.orig//hw/xfree86/vnc/vncInit.c ./hw/xfree86/vnc/vncInit.c
+--- ../xorg-server-1.4.0.90.orig//hw/xfree86/vnc/vncInit.c	2008-05-05 12:35:43.000000000 +0000
++++ ./hw/xfree86/vnc/vncInit.c	2008-05-05 12:49:53.000000000 +0000
+@@ -37,6 +37,10 @@
+ #include "xf86Resources.h"
+ #include "xf86Version.h"
+ 
++#ifdef RENDER
++#undef RENDER
++#endif
++
+ int vncScreenPrivateIndex = -1;
+ int rfbGCIndex = -1;
+ int inetdSock = -1;
+diff -u -r -p ../xorg-server-1.4.0.90.orig//hw/xfree86/vnc/vncint.h ./hw/xfree86/vnc/vncint.h
+--- ../xorg-server-1.4.0.90.orig//hw/xfree86/vnc/vncint.h	2008-05-05 12:35:43.000000000 +0000
++++ ./hw/xfree86/vnc/vncint.h	2008-05-05 12:50:09.000000000 +0000
+@@ -25,6 +25,10 @@
+ #include <../ramdac/xf86Cursor.h>
+ /*#include <xf86CursorPriv.h>*/
+ 
++#ifdef RENDER
++#undef RENDER
++#endif
++
+ extern int vncScreenPrivateIndex;
+ 
+ #define VNCPTR(pScreen)\

xorg-x11-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May  5 14:56:01 CEST 2008 - sndirsch@suse.de
+
+- xorg-server-1.4-vnc-disable_render.diff
+  * disabled RENDER support in Xvnc (bnc #385677) 
+
 -------------------------------------------------------------------
 Mon Apr 21 21:20:37 CEST 2008 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -22,7 +22,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        92
+Release:        98
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -114,6 +114,7 @@ Patch106:       randr1_1-sig11.diff
 Patch107:       XAANoOffscreenPixmaps.diff
 Patch108:       xkb_action.diff
 Patch109:       events.diff
+Patch110:       xorg-server-1.4-vnc-disable_render.diff
 
 %description
 This package contains the X.Org Server.
@@ -217,6 +218,7 @@ popd
 %patch40 -p1
 %patch43 -p0
 %patch102 -p1
+%patch110 -p0
 chmod 755 hw/vnc/symlink-vnc.sh
 %endif
 %patch41 -p1
@@ -563,6 +565,9 @@ exit 0
 %endif
 
 %changelog
+* Mon May 05 2008 sndirsch@suse.de
+- xorg-server-1.4-vnc-disable_render.diff
+  * disabled RENDER support in Xvnc (bnc #385677)
 * Mon Apr 21 2008 sndirsch@suse.de
 - events.diff
   * eating up key events before going into the idle loop upon vt