From 543a7adb7bdac4fc97e9bf324d1e6769e84b5fb1ab43775a077c13cc5a1fafe3 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 16 May 2008 13:08:38 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=77 --- xorg-server-1.4-vnc-render_sig11.diff | 12 ++++++++++++ xorg-x11-server.changes | 12 ++++++++++++ xorg-x11-server.spec | 13 +++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 xorg-server-1.4-vnc-render_sig11.diff diff --git a/xorg-server-1.4-vnc-render_sig11.diff b/xorg-server-1.4-vnc-render_sig11.diff new file mode 100644 index 0000000..ae5651a --- /dev/null +++ b/xorg-server-1.4-vnc-render_sig11.diff @@ -0,0 +1,12 @@ +diff -u -r ../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-16 08:53:40.000000000 +0000 ++++ ./hw/vnc/sprite.c 2008-05-16 10:10:38.000000000 +0000 +@@ -2017,7 +2017,7 @@ + { + VNCSCREENPTR(pPict->pDrawable->pScreen); + +- if (pPict->pDrawable->type == DRAWABLE_WINDOW) ++ if (pPict->pDrawable && pPict->pDrawable->type == DRAWABLE_WINDOW) + { + WindowPtr pWin = (WindowPtr) (pPict->pDrawable); + rfbSpriteScreenPtr pScreenPriv = (rfbSpriteScreenPtr) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index f4dba58..907d362 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri May 16 12:15:57 CEST 2008 - sndirsch@suse.de + +- xorg-server-1.4-vnc-render_sig11.diff + * fixed sig11 in RENDER code (bnc #385677) + +------------------------------------------------------------------- +Wed May 14 18:19:15 CEST 2008 - sndirsch@suse.de + +- disabled patch to disable RENDER support in Xvnc, since it broke + 24bit color depth support (bnc #390011) + ------------------------------------------------------------------- Mon May 5 14:56:01 CEST 2008 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index bb5a986..51ad4f9 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -22,7 +22,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 98 +Release: 103 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -115,6 +115,7 @@ Patch107: XAANoOffscreenPixmaps.diff Patch108: xkb_action.diff Patch109: events.diff Patch110: xorg-server-1.4-vnc-disable_render.diff +Patch111: xorg-server-1.4-vnc-render_sig11.diff %description This package contains the X.Org Server. @@ -218,7 +219,9 @@ popd %patch40 -p1 %patch43 -p0 %patch102 -p1 -%patch110 -p0 +### disabled since it broke 24bit color depth support (Bug #390011) +#%patch110 -p0 +%patch111 -p0 chmod 755 hw/vnc/symlink-vnc.sh %endif %patch41 -p1 @@ -565,6 +568,12 @@ exit 0 %endif %changelog +* Fri May 16 2008 sndirsch@suse.de +- xorg-server-1.4-vnc-render_sig11.diff + * fixed sig11 in RENDER code (bnc #385677) +* Wed May 14 2008 sndirsch@suse.de +- disabled patch to disable RENDER support in Xvnc, since it broke + 24bit color depth support (bnc #390011) * Mon May 05 2008 sndirsch@suse.de - xorg-server-1.4-vnc-disable_render.diff * disabled RENDER support in Xvnc (bnc #385677)