[Midnightbsd-cvs] mports [19229] trunk/x11-drivers/xf86-video-ati: update radeon

[laffer1 at midnightbsd.org]

Revision: 19229
          http://svnweb.midnightbsd.org/mports/?rev=19229
Author:   laffer1
Date:     2015-05-29 18:24:26 -0400 (Fri, 29 May 2015)
Log Message:
-----------
update radeon

Modified Paths:
--------------
    trunk/x11-drivers/xf86-video-ati/Makefile
    trunk/x11-drivers/xf86-video-ati/distinfo
    trunk/x11-drivers/xf86-video-ati/pkg-plist

Removed Paths:
-------------
    trunk/x11-drivers/xf86-video-ati/files/patch-src__radeom_kms.c

Modified: trunk/x11-drivers/xf86-video-ati/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-ati/Makefile	2015-05-29 22:23:53 UTC (rev 19228)
+++ trunk/x11-drivers/xf86-video-ati/Makefile	2015-05-29 22:24:26 UTC (rev 19229)
@@ -1,8 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	${ATI_VERSION}
-PORTREVISION=	${ATI_REVISION}
+PORTVERSION=	7.5.0
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -12,36 +12,24 @@
 
 USE_GL=		gl
 XORG_CAT=	driver
-USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
+USE_XORG=	xf86driproto \
+		xineramaproto \
+		xf86miscproto \
+		glproto \
+		presentproto
+INSTALL_TARGET=	install-strip
 
+CONFIGURE_ARGS+=--disable-udev
+CONFIGURE_ARGS+=--disable-glamor
+
 .include <bsd.mport.options.mk>
 
-.if (${OSVERSION} >= 6000)
-. if defined(WITH_NEW_XORG)
-NEW_ATI_DRIVER=	yes
-. else
-NEW_ATI_DRIVER=	no
-. endif
-.else
-. if defined(FORCE_KMS_ONLY_DDX)
-NEW_ATI_DRIVER=	yes
-. else
-NEW_ATI_DRIVER=	no
-. endif
-.endif
+.if (${OSVERSION} >= 903000 && ${OSVERSION} < 1000000)
+RUN_DEPENDS+=	drm-kmod>=9:${PORTSDIR}/x11-drivers/drm-kmod
 
-.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 "
+post-patch:
+	@${REINPLACE_CMD} -e 's|"radeonkms"|"radeonkms_port"|g' \
+		${WRKSRC}/src/radeon_kms.c
 .endif
 
 .include <bsd.port.mk>

Modified: trunk/x11-drivers/xf86-video-ati/distinfo
===================================================================
--- trunk/x11-drivers/xf86-video-ati/distinfo	2015-05-29 22:23:53 UTC (rev 19228)
+++ trunk/x11-drivers/xf86-video-ati/distinfo	2015-05-29 22:24:26 UTC (rev 19229)
@@ -1,4 +1,2 @@
-SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
-SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
-SHA256 (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) = f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4
-SIZE (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) = 824613
+SHA256 (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936
+SIZE (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = 809756

Deleted: trunk/x11-drivers/xf86-video-ati/files/patch-src__radeom_kms.c
===================================================================
--- trunk/x11-drivers/xf86-video-ati/files/patch-src__radeom_kms.c	2015-05-29 22:23:53 UTC (rev 19228)
+++ trunk/x11-drivers/xf86-video-ati/files/patch-src__radeom_kms.c	2015-05-29 22:24:26 UTC (rev 19229)
@@ -1,37 +0,0 @@
---- 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: trunk/x11-drivers/xf86-video-ati/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-ati/pkg-plist	2015-05-29 22:23:53 UTC (rev 19228)
+++ trunk/x11-drivers/xf86-video-ati/pkg-plist	2015-05-29 22:24:26 UTC (rev 19229)
@@ -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