- Please welcome Xorg 7.5.2

       The Xorg Team is pleased to announce the next round of Xorg updates.
       The team created a new flag called WITH_NEW_XORG that users can include
       in /etc/make.conf. This was created for the intel KMS work being done
       althouthough It probably works for other chips. Unfortunately, the intel
       KMS driver will only work on FreeBSD 9(RELENG|STABLE) or 10/HEAD users.
       Older version of FreeBSD will not be supported. Intel users will need
       to patch their source manually with Konstantin?s KMS kernel patch to get
       the newer chips to work. Please carefully read UPDATING entry.

Changes:

        - libdrm 2.4.31 (including KMS support)
        - mesa 7.11.2
        - xorg-server 1.10.6
        - a lot of new Graphic Drivers.

    I would like to thank:

         Koop Mast
         Eitan Adler
         Niclas Zeising
         and all helpers and testers from x11@.

4 files changed, 123 insertions, 44 deletions

diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index 823d49d21513..4a0b85f9f601 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdrm
 PORTVERSION=	${LIBDRM_VERSION}
-PORTREVISION=	1
+PORTREVISION=	${LIBDRM_REVISION}
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 
@@ -15,29 +15,44 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Userspace interface to kernel Direct Rendering Module services
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
+LIB_DEPENDS=	pciaccess.0:${PORTSDIR}/devel/libpciaccess \
+		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+CONFIGURE_ARGS=	--enable-nouveau-experimental-api
+
 MAKE_JOBS_SAFE=	yes
 
-.include <bsd.port.pre.mk>
+.if defined(WITH_NEW_XORG)
 
-.if defined(WITHOUT_NOUVEAU)
-LIBDRM_VERSION=	2.4.17
-CONFIGURE_ARGS=	--disable-nouveau-experimental-api \
-		--disable-radeon-experimental-api
-PLIST_SUB+=	NEW= OLD="@comment "
+OPTIONS=	KMS "Enable KMS support (very experimental)" off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_KMS)
+CONFIGURE_ARGS+=--enable-libkms
+EXTRA_PATCHES+=	${FILESDIR}/extra-xf86drmMode.c
+PLIST_SUB+=	KMS=""
 .else
-LIBDRM_VERSION=	2.4.12
-CONFIGURE_ARGS=	--enable-nouveau-experimental-api
-PLIST_SUB+=	OLD= NEW="@comment "
+PLIST_SUB+=	KMS="@comment "
+.endif
+
+LIBDRM_VERSION=	2.4.31
+LIBDRM_REVISION=1
+PLIST_SUB+=	OLD="@comment " NEW=""
+.else
+LIBDRM_VERSION=	2.4.17
+LIBDRM_REVISION=0
+PLIST_SUB+=	OLD="" NEW="@comment "
 .endif
 
 pre-patch:
-	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
-	    ${WRKSRC}/configure
+	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \
+			   12661s/x86_/amd/g' \
+		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
index 27276eacad60..df36a538eeed 100644
--- a/graphics/libdrm/distinfo
+++ b/graphics/libdrm/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libdrm-2.4.12.tar.bz2) = 89e3b16aff13c5219d13b08f9143793f74777b752d87c760ec6e52fb8676bd31
-SIZE (libdrm-2.4.12.tar.bz2) = 414175
 SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
 SIZE (libdrm-2.4.17.tar.bz2) = 408882
+SHA256 (libdrm-2.4.31.tar.bz2) = 8fc7e0e5b2f9bf493447a4ef7adc49174a700824457774cb53c1b8f2da866af4
+SIZE (libdrm-2.4.31.tar.bz2) = 475677
diff --git a/graphics/libdrm/files/extra-xf86drmMode.c b/graphics/libdrm/files/extra-xf86drmMode.c
new file mode 100644
index 000000000000..d91a92300735
--- /dev/null
+++ b/graphics/libdrm/files/extra-xf86drmMode.c
@@ -0,0 +1,29 @@
+--- xf86drmMode.c.orig	2010-09-08 14:23:39.000000000 +0200
++++ xf86drmMode.c	2011-07-18 18:59:11.000000000 +0200
+@@ -54,7 +54,7 @@
+ 
+ static inline DRM_IOCTL(int fd, int cmd, void *arg)
+ {
+-	int ret = drmIoctl(fd, cmd, arg);
++	int ret = drmIoctl(fd, (unsigned)cmd, arg);
+ 	return ret < 0 ? -errno : ret;
+ }
+ 
+@@ -659,7 +659,7 @@
+ */
+ int drmCheckModesettingSupported(const char *busid)
+ {
+-#ifdef __linux__
++#if defined (__linux__)
+ 	char pci_dev_dir[1024];
+ 	int domain, bus, dev, func;
+ 	DIR *sysdir;
+@@ -709,6 +709,8 @@
+ 	closedir(sysdir);
+ 	if (found)
+ 		return 0;
++#elif defined(__FreeBSD__)
++	return 0;
+ #endif
+ 	return -ENOSYS;
+ 
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index fbbc18607eca..5cef834e71f0 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -1,28 +1,53 @@
-include/drm/drm.h
-include/drm/drm_mode.h
-include/drm/drm_sarea.h
-include/drm/i915_drm.h
-include/drm/mach64_drm.h
-include/drm/mga_drm.h
-include/drm/nouveau_drm.h
+%%OLD%%include/drm/drm.h
+%%OLD%%include/drm/drm_mode.h
+%%OLD%%include/drm/drm_sarea.h
+%%OLD%%include/drm/i915_drm.h
+%%OLD%%include/drm/mach64_drm.h
+%%OLD%%include/drm/mga_drm.h
+%%OLD%%include/drm/nouveau_drm.h
 %%OLD%%include/drm/nouveau_drmif.h
-include/drm/r128_drm.h
-%%OLD%%include/drm/r300_reg.h
-include/drm/radeon_drm.h
-include/drm/savage_drm.h
-include/drm/sis_drm.h
-%%OLD%%include/drm/via_3d_reg.h
-include/drm/via_drm.h
-%%OLD%%include/drm/xgi_drm.h
-include/intel_bufmgr.h
-%%OLD%%include/nouveau/nouveau_bo.h
-%%OLD%%include/nouveau/nouveau_channel.h
+%%OLD%%include/drm/r128_drm.h
+%%OLD%%include/drm/radeon_drm.h
+%%OLD%%include/drm/savage_drm.h
+%%OLD%%include/drm/sis_drm.h
+%%OLD%%include/drm/via_drm.h
+%%OLD%%include/intel_bufmgr.h
+%%NEW%%include/libdrm/drm.h
+%%NEW%%include/libdrm/drm_fourcc.h
+%%NEW%%include/libdrm/drm_mode.h
+%%NEW%%include/libdrm/drm_sarea.h
+%%NEW%%include/libdrm/i915_drm.h
+%%NEW%%include/libdrm/intel_bufmgr.h
+%%NEW%%include/libdrm/intel_debug.h
+%%NEW%%include/libdrm/mach64_drm.h
+%%NEW%%include/libdrm/mga_drm.h
+%%NEW%%include/libdrm/nouveau_drm.h
+%%NEW%%include/libdrm/nouveau_drmif.h
+%%NEW%%include/libdrm/r128_drm.h
+%%NEW%%include/libdrm/r600_pci_ids.h
+%%NEW%%include/libdrm/radeon_bo.h
+%%NEW%%include/libdrm/radeon_bo_gem.h
+%%NEW%%include/libdrm/radeon_bo_int.h
+%%NEW%%include/libdrm/radeon_cs.h
+%%NEW%%include/libdrm/radeon_cs_gem.h
+%%NEW%%include/libdrm/radeon_cs_int.h
+%%NEW%%include/libdrm/radeon_drm.h
+%%NEW%%include/libdrm/radeon_surface.h
+%%NEW%%include/libdrm/savage_drm.h
+%%NEW%%include/libdrm/sis_drm.h
+%%NEW%%include/libdrm/via_drm.h
+%%NEW%%%%KMS%%include/libkms/libkms.h
+include/nouveau/nouveau_bo.h
+include/nouveau/nouveau_channel.h
 %%OLD%%include/nouveau/nouveau_class.h
-%%OLD%%include/nouveau/nouveau_device.h
-%%OLD%%include/nouveau/nouveau_grobj.h
-%%OLD%%include/nouveau/nouveau_notifier.h
-%%OLD%%include/nouveau/nouveau_pushbuf.h
-%%OLD%%include/nouveau/nouveau_resource.h
+include/nouveau/nouveau_device.h
+include/nouveau/nouveau_grobj.h
+include/nouveau/nouveau_notifier.h
+include/nouveau/nouveau_pushbuf.h
+%%NEW%%include/nouveau/nouveau_reloc.h
+include/nouveau/nouveau_resource.h
+%%NEW%%include/nouveau/nv04_pushbuf.h
+%%NEW%%include/nouveau/nvc0_pushbuf.h
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.la
@@ -31,11 +56,21 @@ lib/libdrm.so.2
 lib/libdrm_intel.la
 lib/libdrm_intel.so
 lib/libdrm_intel.so.1
-%%OLD%%lib/libdrm_nouveau.la
-%%OLD%%lib/libdrm_nouveau.so
-%%OLD%%lib/libdrm_nouveau.so.1
+lib/libdrm_nouveau.la
+lib/libdrm_nouveau.so
+lib/libdrm_nouveau.so.1
+%%NEW%%lib/libdrm_radeon.la
+%%NEW%%lib/libdrm_radeon.so
+%%NEW%%lib/libdrm_radeon.so.1
+%%NEW%%%%KMS%%lib/libkms.la
+%%NEW%%%%KMS%%lib/libkms.so
+%%NEW%%%%KMS%%lib/libkms.so.1
 libdata/pkgconfig/libdrm.pc
 libdata/pkgconfig/libdrm_intel.pc
-%%OLD%%libdata/pkgconfig/libdrm_nouveau.pc
-@dirrm include/drm
-%%OLD%%@dirrm include/nouveau
+libdata/pkgconfig/libdrm_nouveau.pc
+%%NEW%%libdata/pkgconfig/libdrm_radeon.pc
+%%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
+@dirrm include/nouveau
+%%NEW%%%%KMS%%@dirrm include/libkms
+%%NEW%%@dirrm include/libdrm
+%%OLD%%@dirrm include/drm