svn commit: r371270 - in head/x11-drivers/xf86-video-ati: . files

[Koop Mast]

Author: kwm
Date: Mon Oct 20 14:27:59 2014
New Revision: 371270
URL: https://svnweb.freebsd.org/changeset/ports/371270
QAT: https://qat.redports.org/buildarchive/r371270/

Log:
  Remove the switch code between 6.14.6 and 7.2.0.
  Update to 7.2.0, since we have xf86-video-ati-ums for 6.14.6.

Added:
  head/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c
     - copied unchanged from r370183, head/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
Deleted:
  head/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
Modified:
  head/x11-drivers/xf86-video-ati/Makefile
  head/x11-drivers/xf86-video-ati/pkg-plist

Modified: head/x11-drivers/xf86-video-ati/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-ati/Makefile	Mon Oct 20 14:19:06 2014	(r371269)
+++ head/x11-drivers/xf86-video-ati/Makefile	Mon Oct 20 14:27:59 2014	(r371270)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	${ATI_VERSION}
-PORTREVISION=	${ATI_REVISION}
+PORTVERSION=	7.2.0
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -11,45 +11,11 @@ COMMENT=	X.Org ati display driver
 USE_GL=		gl
 XORG_CAT=	driver
 USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
-
-.include <bsd.port.options.mk>
-
-.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)
+INSTALL_TARGET=	install-strip
 # No Radeon kernel driver on non-x86 and PC98.
-NEW_ATI_DRIVER=	no
-.endif
+ONLY_FOR_ARCHS=	i386 amd64
 
-.if ${NEW_ATI_DRIVER} == no
-ATI_VERSION=	6.14.6
-ATI_REVISION=	4
-CONFIGURE_ARGS+=--disable-kms
-PLIST_SUB+=	OLD=""
-.else
-ATI_VERSION=	7.2.0
-ATI_REVISION=	4
 CONFIGURE_ARGS+=--disable-udev
 CONFIGURE_ARGS+=--disable-glamor
-EXTRA_PATCHES+=	${FILESDIR}/extra-src__radeon_kms.c
-PLIST_SUB+=	OLD="@comment "
-.endif
 
 .include <bsd.port.mk>

Copied: head/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c (from r370183, head/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c	Mon Oct 20 14:27:59 2014	(r371270, copy of r370183, head/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c)
@@ -0,0 +1,37 @@
+--- src/radeon_kms.c.orig	2013-08-07 10:44:09.000000000 +0200
++++ src/radeon_kms.c	2013-08-31 19:29:11.369001510 +0200
+@@ -30,6 +30,8 @@
+ 
+ #include <errno.h>
+ #include <sys/ioctl.h>
++#include <sys/param.h>
++#include <sys/linker.h>
+ /* Driver data structures */
+ #include "radeon.h"
+ #include "radeon_reg.h"
+@@ -270,7 +272,7 @@
+ radeon_dirty_update(ScreenPtr screen)
+ {
+ 	RegionPtr region;
+-	PixmapDirtyUpdatePtr ent;
++	PixmapDirtyUpdatePtr ent = NULL;
+ 
+ 	if (xorg_list_is_empty(&screen->pixmap_dirty_list))
+ 		return;
+@@ -606,6 +608,16 @@
+ 		      dev->domain, dev->bus, dev->dev, dev->func);
+ #endif
+ 
++    err = kldload("radeonkms");
++    if (err == -1 && errno != EEXIST) {
++
++	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++		   "[drm] Failed to load kernel module for %s: %s\n",
++		   busid, strerror(errno));
++	free(busid);
++	return FALSE;
++    }
++
+     info->dri2.drm_fd = drmOpen("radeon", busid);
+     if (info->dri2.drm_fd == -1) {
+ 

Modified: head/x11-drivers/xf86-video-ati/pkg-plist
==============================================================================
--- head/x11-drivers/xf86-video-ati/pkg-plist	Mon Oct 20 14:19:06 2014	(r371269)
+++ head/x11-drivers/xf86-video-ati/pkg-plist	Mon Oct 20 14:27:59 2014	(r371270)
@@ -1,11 +1,4 @@
 lib/xorg/modules/drivers/ati_drv.so
 lib/xorg/modules/drivers/radeon_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so
 man/man4/ati.4x.gz
 man/man4/radeon.4x.gz
- at dirrmtry lib/xorg/modules/drivers
-%%OLD%%@dirrmtry lib/xorg/modules/multimedia
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg