Update to 1.5.3:

Adam Jackson (1):
      configure: Drop AM_MAINTAINER_MODE

Alan Coopersmith (1):
      Skip building xaa files when XAA is not supported

Colin Walters (1):
      autogen.sh: Implement GNOME Build API

Dave Airlie (1):
      cirrus: don't use pciTag

Julien Cristau (1):
      cirrus 1.5.3

5 files changed, 6 insertions, 84 deletions

diff --git a/x11/xf86-video-cirrus/Makefile b/x11/xf86-video-cirrus/Makefile
index 58c2b8de70e..434f93862ba 100644
--- a/x11/xf86-video-cirrus/Makefile
+++ b/x11/xf86-video-cirrus/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2015/04/25 14:25:22 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.17 2015/05/06 21:28:41 wiz Exp $
 
-DISTNAME=	xf86-video-cirrus-1.5.2
-PKGREVISION=	3
+DISTNAME=	xf86-video-cirrus-1.5.3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-cirrus/distinfo b/x11/xf86-video-cirrus/distinfo
index 03332492f9c..ae2e8a8d3fe 100644
--- a/x11/xf86-video-cirrus/distinfo
+++ b/x11/xf86-video-cirrus/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.6 2015/04/02 22:16:46 tnn Exp $
+$NetBSD: distinfo,v 1.7 2015/05/06 21:28:41 wiz Exp $
 
-SHA1 (xf86-video-cirrus-1.5.2.tar.bz2) = 722800029e816f453031a851bf4a816c796d7bde
-RMD160 (xf86-video-cirrus-1.5.2.tar.bz2) = 6597f6fbec0d30254d04070debd8aa3bc2075201
-Size (xf86-video-cirrus-1.5.2.tar.bz2) = 327547 bytes
-SHA1 (patch-src_alp__driver.c) = 1dc9dc624f653dd219e259a26b9f18d79f8718c3
-SHA1 (patch-src_cir.h) = de21ad50143fd1bbbf2727149b32d7a35909aa4d
-SHA1 (patch-src_lg__driver.c) = 1e25605cf8435fa6a2b43f71f8e72be402c6bd70
+SHA1 (xf86-video-cirrus-1.5.3.tar.bz2) = 545cbedb42e5a5ce6bdf0b9bc30a826908f284e5
+RMD160 (xf86-video-cirrus-1.5.3.tar.bz2) = 18402fcf23c67d0719e637a835a922e2c8fa1cd7
+Size (xf86-video-cirrus-1.5.3.tar.bz2) = 338930 bytes
diff --git a/x11/xf86-video-cirrus/patches/patch-src_alp__driver.c b/x11/xf86-video-cirrus/patches/patch-src_alp__driver.c
deleted file mode 100644
index 5d7064b15f4..00000000000
--- a/x11/xf86-video-cirrus/patches/patch-src_alp__driver.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_alp__driver.c,v 1.1 2015/04/02 22:16:46 tnn Exp $
-
-From df389885adf71ed3b045c2fde9fd3ba4329e1a58 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Sat, 20 Sep 2014 18:51:17 +1000
-Subject: cirrus: don't use pciTag
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-
-diff --git a/src/alp_driver.c b/src/alp_driver.c
-index 36f2039..bd5e52f 100644
---- src/alp_driver.c
-+++ src/alp_driver.c
-@@ -519,9 +519,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 	pCir->Chipset = pCir->pEnt->chipset;
- 	/* Find the PCI info for this screen */
- 	pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
-+#ifndef XSERVER_LIBPCIACCESS
- 	pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
- 			      PCI_DEV_DEV(pCir->PciInfo),
- 			      PCI_DEV_FUNC(pCir->PciInfo));
-+#endif
- 
- #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (!xf86IsPc98())
diff --git a/x11/xf86-video-cirrus/patches/patch-src_cir.h b/x11/xf86-video-cirrus/patches/patch-src_cir.h
deleted file mode 100644
index 04627039ee6..00000000000
--- a/x11/xf86-video-cirrus/patches/patch-src_cir.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_cir.h,v 1.1 2015/04/02 22:16:46 tnn Exp $
-
-From df389885adf71ed3b045c2fde9fd3ba4329e1a58 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Sat, 20 Sep 2014 18:51:17 +1000
-Subject: cirrus: don't use pciTag
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-
-diff --git a/src/cir.h b/src/cir.h
-index 0a5d403..84f64b5 100644
---- src/cir.h
-+++ src/cir.h
-@@ -23,7 +23,9 @@ typedef struct {
- 	ScrnInfoPtr		pScrn;
- 	CARD32			properties;
- 	pciVideoPtr		PciInfo;
-+#ifndef XSERVER_LIBPCIACCESS
- 	PCITAG			PciTag;
-+#endif
- 	unsigned long		PIOReg;
-     union {
- 	struct lgRec		*lg;
diff --git a/x11/xf86-video-cirrus/patches/patch-src_lg__driver.c b/x11/xf86-video-cirrus/patches/patch-src_lg__driver.c
deleted file mode 100644
index a24348c2865..00000000000
--- a/x11/xf86-video-cirrus/patches/patch-src_lg__driver.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_lg__driver.c,v 1.1 2015/04/02 22:16:46 tnn Exp $
-
-From df389885adf71ed3b045c2fde9fd3ba4329e1a58 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Sat, 20 Sep 2014 18:51:17 +1000
-Subject: cirrus: don't use pciTag
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-
-diff --git a/src/lg_driver.c b/src/lg_driver.c
-index c20bbd0..589d14e 100644
---- src/lg_driver.c
-+++ src/lg_driver.c
-@@ -382,9 +382,11 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 	/* Find the PCI info for this screen */
- 	pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
-+#ifndef XSERVER_LIBPCIACCESS
- 	pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
- 			      PCI_DEV_DEV(pCir->PciInfo),
- 			      PCI_DEV_FUNC(pCir->PciInfo));
-+#endif
- 
- 	if (xf86LoadSubModule(pScrn, "int10")) {
- 	    xf86Int10InfoPtr int10InfoPtr;