- Add patch from xsrc to make the server deal w/ PCI domains the way

    the new libpciaccess expects
- bump libpciaccess version requirement to current
- bump PKGREVISON
- Addresses PR pkg/43493

3 files changed, 25 insertions, 9 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 74c82a2ecda..772c775290a 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2010/04/25 19:17:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.61 2010/06/27 10:43:01 tnn Exp $
 #
 
 DISTNAME=	xorg-server-1.6.5
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=	.tar.bz2
@@ -105,6 +105,7 @@ CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
 .include "../../fonts/libfontenc/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libpciaccess+=	libpciaccess>=0.11.0
 .include "../../sysutils/libpciaccess/buildlink3.mk"
 .include "../../x11/bigreqsproto/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index aa88f827a70..f2ba43606f5 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2010/04/09 09:08:13 tnn Exp $
+$NetBSD: distinfo,v 1.42 2010/06/27 10:43:01 tnn Exp $
 
 SHA1 (xorg-server-1.6.5.tar.bz2) = c57c80dd15d3ca492e58ae993b9015d085ec6ea6
 RMD160 (xorg-server-1.6.5.tar.bz2) = 702970358a5643dbc9205f42e39c5b8ed2ff845a
@@ -25,7 +25,7 @@ SHA1 (patch-bm) = 9c7192eb98816165d8fb16af465e0056045280b2
 SHA1 (patch-bn) = 27dffea8ce05ac79fd438818fba463f57776f2af
 SHA1 (patch-bo) = ee05a01c6b1d4d0b759d8372f16c5f752273f73e
 SHA1 (patch-sa) = bdd9209e873f676ee4d0436a94e468b824e80f87
-SHA1 (patch-sb) = 0a064016b16e088d08cd9e290a57cb4efb4f5d26
+SHA1 (patch-sb) = 48c22a62b30c6bc4d5786624bc264fee30a9bb81
 SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0
 SHA1 (patch-sd) = 36d3946217b57416e8d0d3099e48d4e9f957c881
 SHA1 (patch-se) = 22b20c734b7fcf59d75227aeb1fa703465582568
diff --git a/x11/modular-xorg-server/patches/patch-sb b/x11/modular-xorg-server/patches/patch-sb
index 16b729757f0..5ce0970b642 100644
--- a/x11/modular-xorg-server/patches/patch-sb
+++ b/x11/modular-xorg-server/patches/patch-sb
@@ -1,9 +1,7 @@
-$NetBSD: patch-sb,v 1.2 2009/06/07 11:23:47 wiz Exp $
+$NetBSD: patch-sb,v 1.3 2010/06/27 10:43:02 tnn Exp $
 
-Temporary disable Sbus suport.
-
---- hw/xfree86/common/xf86Configure.c.orig	2009-03-21 01:57:50 +0200
-+++ hw/xfree86/common/xf86Configure.c	2009-05-19 14:36:57 +0300
+--- hw/xfree86/common/xf86Configure.c.orig	2009-10-12 02:52:40.000000000 +0000
++++ hw/xfree86/common/xf86Configure.c
 @@ -115,7 +115,7 @@ xf86AddBusDeviceToConfigure(const char *
  		return NULL;
  	isPrimary = xf86IsPrimaryPci(pVideo);
@@ -13,3 +11,20 @@ Temporary disable Sbus suport.
      case BUS_SBUS:
  	for (i = 0;  i < nDevToConfig;  i++)
  	    if (DevToConfig[i].sVideo &&
+@@ -180,8 +180,14 @@ xf86AddBusDeviceToConfigure(const char *
+ 
+ 	NewDevice.GDev.busID = xnfalloc(16);
+ 	xf86FormatPciBusNumber(pVideo->bus, busnum);
+-	sprintf(NewDevice.GDev.busID, "PCI:%s:%d:%d",
+-	    busnum, pVideo->dev, pVideo->func);
++
++	if (pVideo->domain == 0) {
++		snprintf(NewDevice.GDev.busID, 16, "PCI:%s:%d:%d",
++		  busnum, pVideo->dev, pVideo->func);
++	} else {
++		snprintf(NewDevice.GDev.busID, 16, "PCI:%s@%d:%d:%d",
++		  busnum, pVideo->domain, pVideo->dev, pVideo->func);
++	}
+ 
+ 	NewDevice.GDev.chipID = pVideo->device_id;
+ 	NewDevice.GDev.chipRev = pVideo->revision;