Tue Jul 21 11:15:54 2009 UTC ()
add a patch from upstream to fix an assertion error with pixman-0.15.16
(see fdo bug #22642)
bump PKGREVISION


(drochner)
diff -r1.48 -r1.49 pkgsrc/x11/modular-xorg-server/Makefile
diff -r1.35 -r1.36 pkgsrc/x11/modular-xorg-server/distinfo
diff -r0 -r1.4 pkgsrc/x11/modular-xorg-server/patches/patch-an
cvs diff -r1.48 -r1.49 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2009/07/09 13:14:24 1.48
+++ pkgsrc/x11/modular-xorg-server/Makefile 2009/07/21 11:15:53 1.49
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.48 2009/07/09 13:14:24 tnn Exp $ 1# $NetBSD: Makefile,v 1.49 2009/07/21 11:15:53 drochner Exp $
2# 2#
3 3
4DISTNAME= xorg-server-1.6.2 4DISTNAME= xorg-server-1.6.2
5PKGNAME= modular-${DISTNAME} 5PKGNAME= modular-${DISTNAME}
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= bjs@NetBSD.org 11MAINTAINER= bjs@NetBSD.org
12HOMEPAGE= http://xorg.freedesktop.org/ 12HOMEPAGE= http://xorg.freedesktop.org/
13COMMENT= Modular X11 server from modular X.org 13COMMENT= Modular X11 server from modular X.org
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 16SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
cvs diff -r1.35 -r1.36 pkgsrc/x11/modular-xorg-server/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/distinfo 2009/07/08 17:55:59 1.35
+++ pkgsrc/x11/modular-xorg-server/distinfo 2009/07/21 11:15:53 1.36
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.35 2009/07/08 17:55:59 hasso Exp $ 1$NetBSD: distinfo,v 1.36 2009/07/21 11:15:53 drochner Exp $
2 2
3SHA1 (xorg-server-1.6.2.tar.bz2) = 7eb0ae82762eecf5be031d63a77f0c1281569414 3SHA1 (xorg-server-1.6.2.tar.bz2) = 7eb0ae82762eecf5be031d63a77f0c1281569414
4RMD160 (xorg-server-1.6.2.tar.bz2) = 37af2d733cdc7155de13cfdb21cc6367135bb440 4RMD160 (xorg-server-1.6.2.tar.bz2) = 37af2d733cdc7155de13cfdb21cc6367135bb440
5Size (xorg-server-1.6.2.tar.bz2) = 4647067 bytes 5Size (xorg-server-1.6.2.tar.bz2) = 4647067 bytes
6SHA1 (patch-ab) = c65457bf58b7504375b31512c743c9f1a5dcdde0 6SHA1 (patch-ab) = c65457bf58b7504375b31512c743c9f1a5dcdde0
7SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908 7SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908
8SHA1 (patch-ah) = 2820d1a394de6bf19b980cc52a41cbb09c582b8f 8SHA1 (patch-ah) = 2820d1a394de6bf19b980cc52a41cbb09c582b8f
9SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007 9SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007
10SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d 10SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d
11SHA1 (patch-al) = cb1fb44037f23fb2838ed36aaf2591946264fe53 11SHA1 (patch-al) = cb1fb44037f23fb2838ed36aaf2591946264fe53
12SHA1 (patch-am) = be278e6044dfa37b108d2544c82b84f36b6ca9d7 12SHA1 (patch-am) = be278e6044dfa37b108d2544c82b84f36b6ca9d7
 13SHA1 (patch-an) = e429179bad703addd7a23b60ff3ecd2420457a17
13SHA1 (patch-ba) = 803f8df4e2ad2ebdfde9f7e17c3dd26fa11262ab 14SHA1 (patch-ba) = 803f8df4e2ad2ebdfde9f7e17c3dd26fa11262ab
14SHA1 (patch-sa) = a22001b4146dcbcbd5405c9a1ff7b1632ec946b8 15SHA1 (patch-sa) = a22001b4146dcbcbd5405c9a1ff7b1632ec946b8
15SHA1 (patch-sb) = 0a064016b16e088d08cd9e290a57cb4efb4f5d26 16SHA1 (patch-sb) = 0a064016b16e088d08cd9e290a57cb4efb4f5d26
16SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0 17SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0
17SHA1 (patch-sd) = 36d3946217b57416e8d0d3099e48d4e9f957c881 18SHA1 (patch-sd) = 36d3946217b57416e8d0d3099e48d4e9f957c881
18SHA1 (patch-se) = 22b20c734b7fcf59d75227aeb1fa703465582568 19SHA1 (patch-se) = 22b20c734b7fcf59d75227aeb1fa703465582568
File Added: pkgsrc/x11/modular-xorg-server/patches/Attic/patch-an
$NetBSD: patch-an,v 1.4 2009/07/21 11:15:54 drochner Exp $

--- exa/exa_accel.c.orig	2009-07-07 19:48:58.000000000 +0200
+++ exa/exa_accel.c
@@ -415,6 +415,7 @@ exaCopyNtoN (DrawablePtr    pSrcDrawable
 
     if (rects) {
 	int i;
+	int ordering;
 
 	for (i = 0; i < nbox; i++) {
 	    rects[i].x = pbox[i].x1 + dx + src_off_x;
@@ -423,7 +424,16 @@ exaCopyNtoN (DrawablePtr    pSrcDrawable
 	    rects[i].height = pbox[i].y2 - pbox[i].y1;
 	}
 
-	srcregion  = RECTS_TO_REGION(pScreen, nbox, rects, CT_YXBANDED);
+	/* This must match the miRegionCopy() logic for reversing rect order */
+	if (nbox == 1 || (dx > 0 && dy > 0) ||
+	    (pDstDrawable != pSrcDrawable &&
+	     (pDstDrawable->type != DRAWABLE_WINDOW ||
+	      pSrcDrawable->type != DRAWABLE_WINDOW)))
+	    ordering = CT_YXBANDED;
+	else
+	    ordering = CT_UNSORTED;
+
+	srcregion  = RECTS_TO_REGION(pScreen, nbox, rects, ordering);
 	xfree(rects);
 
 	if (!pGC || !exaGCReadsDestination(pDstDrawable, pGC->planemask,