Accepting request 21255 from X11:XOrg

Copy from X11:XOrg/xorg-x11-server based on submit request 21255 from user sndirsch

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

bug532341.diff

@@ -0,0 +1,54 @@
+diff --git a/Xext/shm.c b/Xext/shm.c
+index dd097e6..99bbd37 100644
+--- a/Xext/shm.c
++++ b/Xext/shm.c
+@@ -496,15 +496,40 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
+ 	      char *data)
+ {
+     PixmapPtr pPixmap;
+-  
+-    pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
+-				     BitsPerPixel(depth),
+-				     PixmapBytePad(w, depth),
+-				     data);
+-    if (!pPixmap)
+-	return;
+-    pGC->ops->CopyArea((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy);
+-    FreeScratchPixmapHeader(pPixmap);
++
++    if (format == ZPixmap || depth == 1) {
++	pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
++					 BitsPerPixel(depth),
++					 PixmapBytePad(w, depth),
++					 data);
++	if (!pPixmap)
++	    return;
++	pGC->ops->CopyArea((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy);
++	FreeScratchPixmapHeader(pPixmap);
++    } else {
++	GCPtr putGC = GetScratchGC(depth, dst->pScreen);
++
++	if (!putGC)
++	    return;
++
++	pPixmap = (*dst->pScreen->CreatePixmap)(dst->pScreen, sw, sh, depth,
++						CREATE_PIXMAP_USAGE_SCRATCH);
++	if (!pPixmap) {
++	    FreeScratchGC(putGC);
++	    return;
++	}
++	ValidateGC(&pPixmap->drawable, putGC);
++	(*putGC->ops->PutImage)(&pPixmap->drawable, putGC, depth, -sx, -sy, w, h, 0,
++				(format == XYPixmap) ? XYPixmap : ZPixmap, data);
++	FreeScratchGC(putGC);
++	if (format == XYBitmap)
++	    (void)(*pGC->ops->CopyPlane)(&pPixmap->drawable, dst, pGC, 0, 0, sw, sh,
++					 dx, dy, 1L);
++	else
++	    (void)(*pGC->ops->CopyArea)(&pPixmap->drawable, dst, pGC, 0, 0, sw, sh,
++					dx, dy);
++	(*pPixmap->drawable.pScreen->DestroyPixmap)(pPixmap);
++    }
+ }
+ 
+ #ifdef PANORAMIX

xorg-server-1.6.3.901.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b8b9c40fc3da9268b03143cb4fc518baa9fcf88da73c7645c2d572bf23dbd50
-size 4678171

xorg-server-1.6.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c736d4c0246a6f2214a2f2c1a6fa9e2bf860f7785bf469de575529851fc1145
+size 4679094

xorg-x11-server.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Sep 28 20:50:34 CEST 2009 - sndirsch@suse.de
+
+- xorg-server 1.6.4
+  * fbdevhw: Test for graphics:fb%d as well as graphics/fb%d
+  * render: return the supported version rather than just passing
+    the proto's version
+  * xfree86/modes: Remove all framebuffer support from DGA
+  * dri2: Don't crash if pPriv is NULL.
+  * Don't send events through the master if the device has
+    SendCoreEvents off.
+  * Don't reset the lastDeviceEventTime when doing DPMS actions
+  * dix: append "built-ins" to the font path in SetDefaultFontPath
+
+-------------------------------------------------------------------
+Mon Sep 28 20:32:13 CEST 2009 - sndirsch@suse.de
+
+- bug532341.diff
+  * fixes Xserver crash when running x11perf -shmputxy10 test case
+    (bnc #532341, bfo #23298)
+
 -------------------------------------------------------------------
 Mon Sep 21 16:46:38 CEST 2009 - mhopf@novell.com
 

xorg-x11-server.spec

@@ -20,7 +20,7 @@
 %define moblin 0
 
 Name:           xorg-x11-server
-%define dirsuffix 1.6.3.901
+%define dirsuffix 1.6.4
 %define fglrx_driver_hack 0
 ### FIXME
 %define vnc 1
@@ -33,7 +33,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        54
+Release:        55
 License:        GPL v2 or later ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -138,6 +138,7 @@ Patch171:       moblin-use_preferred_mode_for_all_outputs.diff
 Patch190:       0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
 Patch191:       0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch
 Patch200:       bug534768-prefer_local_symbols.patch
+Patch532341:    bug532341.diff
 
 %description
 This package contains the X.Org Server.
@@ -280,6 +281,7 @@ popd
 %patch190 -p1
 %patch191 -p1
 %patch200 -p1
+%patch532341 -p1
 
 %build
 pushd xorg-docs-*