svn commit: r367808 - head/x11-drivers/xf86-video-ati

[Koop Mast]

Author: kwm
Date: Wed Sep 10 10:42:46 2014
New Revision: 367808
URL: http://svnweb.freebsd.org/changeset/ports/367808
QAT: https://qat.redports.org/buildarchive/r367808/

Log:
  Rework checks to select between UMS and KMS versions of the ati driver.
  
  Developed with:	dumbbell@
  Obtained from:	xorg-dev repo

Modified:
  head/x11-drivers/xf86-video-ati/Makefile

Modified: head/x11-drivers/xf86-video-ati/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-ati/Makefile	Wed Sep 10 09:36:24 2014	(r367807)
+++ head/x11-drivers/xf86-video-ati/Makefile	Wed Sep 10 10:42:46 2014	(r367808)
@@ -14,8 +14,31 @@ USE_XORG=	xf86driproto xineramaproto xf8
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG) || \
-	(${ARCH} != i386 && ${ARCH} != amd64)
+.if (${OSVERSION} >= 902508 && ${OSVERSION} < 1000000) || ${OSVERSION} >= 1000051
+#  902508: Radeon kernel driver imported in FreeBSD 9.x
+# 1000051: Radeon kernel driver imported in FreeBSD 10.x
+. if defined(WITH_NEW_XORG)
+NEW_ATI_DRIVER=	yes
+. else
+NEW_ATI_DRIVER=	no
+. endif
+.else
+# FreeBSD < 902508 doesn't have the Radeon kernel driver. No need to
+# check for WITH_NEW_XORG. But we do support a flag to force the usage
+# of the KMS-only DDX: this is used by the build cluster only.
+. if defined(FORCE_KMS_ONLY_DDX)
+NEW_ATI_DRIVER=	yes
+. else
+NEW_ATI_DRIVER=	no
+. endif
+.endif
+
+.if (${ARCH} != i386 && ${ARCH} != amd64)
+# No Radeon kernel driver on non-x86 and PC98.
+NEW_ATI_DRIVER=	no
+.endif
+
+.if ${NEW_ATI_DRIVER} == no
 ATI_VERSION=	6.14.6
 ATI_REVISION=	3
 CONFIGURE_ARGS+=--disable-kms