4 files changed, 15 insertions, 30 deletions

diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index af97c84ee183..0e7f646619e3 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -1,13 +1,18 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	7.5.0
-PORTREVISION=	3
+PORTVERSION=	7.8.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org ati display driver
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess \
+		libdrm_radeon.so:graphics/libdrm
+
 USE_GL=		gl
 XORG_CAT=	driver
 USE_XORG=	xf86driproto \
@@ -20,6 +25,5 @@ INSTALL_TARGET=	install-strip
 ONLY_FOR_ARCHS=	i386 amd64
 
 CONFIGURE_ARGS+=--disable-udev
-CONFIGURE_ARGS+=--disable-glamor
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
index c6949cd0ec9f..92256f81791d 100644
--- a/x11-drivers/xf86-video-ati/distinfo
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936
-SIZE (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = 809756
+TIMESTAMP = 1479393377
+SHA256 (xorg/driver/xf86-video-ati-7.8.0.tar.bz2) = 401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa
+SIZE (xorg/driver/xf86-video-ati-7.8.0.tar.bz2) = 845702
diff --git a/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c b/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c
deleted file mode 100644
index 3de34a1b60ae..000000000000
--- a/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/radeon_dri2.c.orig	2013-02-22 19:31:34.000000000 +0000
-+++ src/radeon_dri2.c	2013-02-22 19:31:47.000000000 +0000
-@@ -578,7 +578,7 @@
- radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer data, pointer calldata)
- {
-     DRI2ClientEventsPtr pClientEventsPriv;
--    DRI2FrameEventPtr ref;
-+    DRI2FrameEventPtr ref = NULL;
-     NewClientInfoRec *clientinfo = calldata;
-     ClientPtr pClient = clientinfo->client;
-     pClientEventsPriv = GetDRI2ClientEvents(pClient);
diff --git a/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c b/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c
index 9966ec93ec70..dab18adef9ba 100644
--- a/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c
+++ b/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c
@@ -1,5 +1,5 @@
---- src/radeon_kms.c.orig	2014-10-02 05:31:27.000000000 +0200
-+++ src/radeon_kms.c	2014-10-23 18:56:18.359108170 +0200
+--- src/radeon_kms.c.orig	2015-11-12 03:57:33.000000000 +0100
++++ src/radeon_kms.c	2015-11-12 13:42:18.759377000 +0100
 @@ -30,6 +30,8 @@
  
  #include <errno.h>
@@ -8,17 +8,8 @@
 +#include <sys/linker.h>
  /* Driver data structures */
  #include "radeon.h"
- #include "radeon_reg.h"
-@@ -280,7 +282,7 @@
- radeon_dirty_update(ScreenPtr screen)
- {
- 	RegionPtr region;
--	PixmapDirtyUpdatePtr ent;
-+	PixmapDirtyUpdatePtr ent = NULL;
- 
- 	if (xorg_list_is_empty(&screen->pixmap_dirty_list))
- 		return;
-@@ -589,7 +591,7 @@
+ #include "radeon_drm_queue.h"
+@@ -829,7 +831,7 @@ static int radeon_get_drm_master_fd(Scrn
  #endif
      struct pci_device *dev = info->PciInfo;
      char *busid;
@@ -27,7 +18,7 @@
  
  #ifdef XF86_PDEV_SERVER_FD
      if (pRADEONEnt->platform_dev) {
-@@ -608,6 +610,15 @@
+@@ -848,6 +850,15 @@ static int radeon_get_drm_master_fd(Scrn
  		      dev->domain, dev->bus, dev->dev, dev->func);
  #endif