Backout upgrade to 7.8 is has too many regressions

Reported by:	many

4 files changed, 31 insertions, 15 deletions

diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 0e7f646619e3..0179644559fa 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -1,18 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	7.8.0
+PORTVERSION=	7.5.0
+PORTEPOCH=	1
 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 \
@@ -25,5 +20,6 @@ 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 92256f81791d..6d7a37f5e8ce 100644
--- a/x11-drivers/xf86-video-ati/distinfo
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1484479584
+SHA256 (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936
+SIZE (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = 809756
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
new file mode 100644
index 000000000000..3de34a1b60ae
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c
@@ -0,0 +1,11 @@
+--- 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 dab18adef9ba..9966ec93ec70 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	2015-11-12 03:57:33.000000000 +0100
-+++ src/radeon_kms.c	2015-11-12 13:42:18.759377000 +0100
+--- 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
 @@ -30,6 +30,8 @@
  
  #include <errno.h>
@@ -8,8 +8,17 @@
 +#include <sys/linker.h>
  /* Driver data structures */
  #include "radeon.h"
- #include "radeon_drm_queue.h"
-@@ -829,7 +831,7 @@ static int radeon_get_drm_master_fd(Scrn
+ #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 @@
  #endif
      struct pci_device *dev = info->PciInfo;
      char *busid;
@@ -18,7 +27,7 @@
  
  #ifdef XF86_PDEV_SERVER_FD
      if (pRADEONEnt->platform_dev) {
-@@ -848,6 +850,15 @@ static int radeon_get_drm_master_fd(Scrn
+@@ -608,6 +610,15 @@
  		      dev->domain, dev->bus, dev->dev, dev->func);
  #endif