Update to 1.6.3.

Changes in 1.6.3 since 1.6.2.901:

Adam Jackson (1):
      selinux: Only activate if policy says to be an object manager

Alan Coopersmith (2):
      Don't printf NULL pointers on HAL connection error
      Remove hardcoded gcc -Wall option from configure.ac

Ben Skeggs (1):
      quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359)

Keith Packard (1):
      Bump release number to 1.6.3

Rémi Cardona (1):
      config: add HAL error checks


Changes in 1.6.2.901 since 1.6.2:

Adam Jackson (1):
      xdmcp: Don't crash on X -query with more than 255 IP addresses. (#20675)

Alan Coopersmith (1):
      Fix build of drivers with 1.6.2 when not using --install-libxf86config

Benjamin Defnet (2):
      hw/xf86/modes: Set crtc mode/rotation/transform before calling set_mode_major
      randr: fix operation order so that rotation+transform works

Dave Airlie (1):
      xfree86: move didLock assignment down to where the function pointer is valid.

Julien Cristau (1):
      randr: fix server crash in RRGetScreenInfo

Keith Packard (2):
      Replace dixLookupResource by dixLookupResourceBy{Type,Class}
      Bump to version 1.6.2.901 (1.6.3 RC1)

Kim Woelders (1):
      Fix key repeat problem.

Matthias Hopf (1):
      randr: Nuke broken set_origin shortcut

Michel Dänzer (1):
      EXA: Only pass CT_YXBANDED to RECTS_TO_REGION() if that is really true.

Robert Noland (1):
      One = is more than adequate here.  Make is sh safe.

Rémi Cardona (1):
      configure: libXinerama isn't needed anymore

5 files changed, 7 insertions, 64 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 08e8d420859..32a9ca37eae 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2009/07/21 11:15:53 drochner Exp $
+# $NetBSD: Makefile,v 1.50 2009/08/01 11:06:23 hasso Exp $
 #
 
-DISTNAME=	xorg-server-1.6.2
+DISTNAME=	xorg-server-1.6.3
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=	.tar.bz2
@@ -64,7 +63,6 @@ CONFIGURE_ARGS+=	--disable-xsdl
 CONFIGURE_ARGS+=	--disable-xfbdev
 CONFIGURE_ARGS+=	--disable-kbd_mode	# deprecated
 CONFIGURE_ARGS+=	--disable-xorgcfg	# deprecated
-CONFIGURE_ARGS+=	--enable-install-libxf86config # needed by some drivers
 
 CONFIGURE_ARGS+=	--with-int10=x86emu
 
diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST
index 8915f74977d..b54e04d69f5 100644
--- a/x11/modular-xorg-server/PLIST
+++ b/x11/modular-xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/07/09 13:14:24 tnn Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/08/01 11:06:23 hasso Exp $
 bin/X
 bin/Xnest
 bin/Xorg
@@ -160,7 +160,6 @@ include/xorg/xserver-properties.h
 include/xorg/xvdix.h
 include/xorg/xvmcext.h
 lib/X11/Options
-lib/libxf86config.a
 lib/pkgconfig/xorg-server.pc
 lib/xorg/modules/extensions/libdbe.la
 ${PLIST.dri}lib/xorg/modules/extensions/libdri.la
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 694c68f0b86..6be4c3a4972 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2009/07/21 11:15:53 drochner Exp $
+$NetBSD: distinfo,v 1.37 2009/08/01 11:06:23 hasso Exp $
 
-SHA1 (xorg-server-1.6.2.tar.bz2) = 7eb0ae82762eecf5be031d63a77f0c1281569414
-RMD160 (xorg-server-1.6.2.tar.bz2) = 37af2d733cdc7155de13cfdb21cc6367135bb440
-Size (xorg-server-1.6.2.tar.bz2) = 4647067 bytes
+SHA1 (xorg-server-1.6.3.tar.bz2) = 1f28e8723e110e5c1a1adf3bc89325a81a526184
+RMD160 (xorg-server-1.6.3.tar.bz2) = 5b9ddfeb9fb7082ef600e368ada8abbb006fe418
+Size (xorg-server-1.6.3.tar.bz2) = 4651487 bytes
 SHA1 (patch-ab) = c65457bf58b7504375b31512c743c9f1a5dcdde0
 SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908
 SHA1 (patch-ah) = 2820d1a394de6bf19b980cc52a41cbb09c582b8f
@@ -10,8 +10,6 @@ SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007
 SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d
 SHA1 (patch-al) = cb1fb44037f23fb2838ed36aaf2591946264fe53
 SHA1 (patch-am) = be278e6044dfa37b108d2544c82b84f36b6ca9d7
-SHA1 (patch-an) = e429179bad703addd7a23b60ff3ecd2420457a17
-SHA1 (patch-ba) = 803f8df4e2ad2ebdfde9f7e17c3dd26fa11262ab
 SHA1 (patch-sa) = a22001b4146dcbcbd5405c9a1ff7b1632ec946b8
 SHA1 (patch-sb) = 0a064016b16e088d08cd9e290a57cb4efb4f5d26
 SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0
diff --git a/x11/modular-xorg-server/patches/patch-an b/x11/modular-xorg-server/patches/patch-an
deleted file mode 100644
index 248fce6bf85..00000000000
--- a/x11/modular-xorg-server/patches/patch-an
+++ /dev/null
@@ -1,30 +0,0 @@
-$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,
diff --git a/x11/modular-xorg-server/patches/patch-ba b/x11/modular-xorg-server/patches/patch-ba
deleted file mode 100644
index abc2dd36b3c..00000000000
--- a/x11/modular-xorg-server/patches/patch-ba
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2009/06/07 11:23:47 wiz Exp $
-
---- configure.orig	2009-05-17 00:33:36 +0300
-+++ configure	2009-05-17 00:33:56 +0300
-@@ -22427,7 +22427,7 @@ _ACEOF
- 		DRI2=yes
- 		;;
- esac
-- if test "x$DRI2" == xyes; then
-+ if test "x$DRI2" = xyes; then
-   DRI2_TRUE=
-   DRI2_FALSE='#'
- else
-@@ -22610,7 +22610,7 @@ $as_echo "$as_me: DRI2 AIGLX disabled, _
- 		DRI2_AIGLX=no
- 	fi
- fi
-- if test "x$DRI2_AIGLX" == xyes; then
-+ if test "x$DRI2_AIGLX" = xyes; then
-   DRI2_AIGLX_TRUE=
-   DRI2_AIGLX_FALSE='#'
- else