Attachment #177093 for bug #214587




# $FreeBSD$

PORTNAME=	xf86-video-ati
PORTVERSION=	7.7.1
PORTREVISION=	3
CATEGORIES=	x11-drivers

MAINTAINER=	x11@FreeBSD.org
COMMENT=	X.Org ati display driver

LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess \
		libdrm_radeon.so:graphics/libdrm

USE_GL=		gl
XORG_CAT=	driver
USE_XORG=	xf86driproto \

Lines 1-2 Link Here

(-)x11-drivers/xf86-video-ati/distinfo (-2 / +3 lines)
1	SHA256 (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936	1	TIMESTAMP = 1473985028
2	SIZE (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = 809756	2	SHA256 (xorg/driver/xf86-video-ati-7.7.1.tar.bz2) = 00a58588db62ee309095c5c5920bbd248d965e8627f88affe68a73b18865078d
		3	SIZE (xorg/driver/xf86-video-ati-7.7.1.tar.bz2) = 837869

Lines 1-11 Link Here

(-)x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (-11 lines)
1	--- src/radeon_dri2.c.orig 2013-02-22 19:31:34.000000000 +0000
2	+++ src/radeon_dri2.c 2013-02-22 19:31:47.000000000 +0000
3	@@ -578,7 +578,7 @@
4	radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer data, pointer calldata)
5	{
6	DRI2ClientEventsPtr pClientEventsPriv;
7	- DRI2FrameEventPtr ref;
8	+ DRI2FrameEventPtr ref = NULL;
9	NewClientInfoRec *clientinfo = calldata;
10	ClientPtr pClient = clientinfo->client;
11	pClientEventsPriv = GetDRI2ClientEvents(pClient);




--- 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>

+#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
 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;

 
 #ifdef XF86_PDEV_SERVER_FD
     if (pRADEONEnt->platform_dev) {
@@ -848,6 +850,15 @@ static int radeon_get_drm_master_fd(Scrn
 		      dev->domain, dev->bus, dev->dev, dev->func);
 #endif
 

Return to bug 214587

Lines 1-13 Link Here

(-)x11-drivers/xf86-video-ati/Makefile (-2 / +4 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xf86-video-ati	3	PORTNAME= xf86-video-ati
4	PORTVERSION= 7.5.0	4	PORTVERSION= 7.7.1
5	PORTREVISION= 3
6	CATEGORIES= x11-drivers	5	CATEGORIES= x11-drivers
7		6
8	MAINTAINER= x11@FreeBSD.org	7	MAINTAINER= x11@FreeBSD.org
9	COMMENT= X.Org ati display driver	8	COMMENT= X.Org ati display driver
10		9
		10	LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \
		11	libdrm_radeon.so:graphics/libdrm
		12
11	USE_GL= gl	13	USE_GL= gl
12	XORG_CAT= driver	14	XORG_CAT= driver
13	USE_XORG= xf86driproto \	15	USE_XORG= xf86driproto \

Lines 1-5 Link Here

(-)x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c (-14 / +5 lines)
1	--- src/radeon_kms.c.orig 2014-10-02 05:31:27.000000000 +0200	1	--- src/radeon_kms.c.orig 2015-11-12 03:57:33.000000000 +0100
2	+++ src/radeon_kms.c 2014-10-23 18:56:18.359108170 +0200	2	+++ src/radeon_kms.c 2015-11-12 13:42:18.759377000 +0100
3	@@ -30,6 +30,8 @@	3	@@ -30,6 +30,8 @@
4		4
5	#include <errno.h>	5	#include <errno.h>
Lines 8-24 Link Here
8	+#include <sys/linker.h>	8	+#include <sys/linker.h>
9	/* Driver data structures */	9	/* Driver data structures */
10	#include "radeon.h"	10	#include "radeon.h"
11	#include "radeon_reg.h"	11	#include "radeon_drm_queue.h"
12	@@ -280,7 +282,7 @@	12	@@ -829,7 +831,7 @@ static int radeon_get_drm_master_fd(Scrn
13	radeon_dirty_update(ScreenPtr screen)
14	{
15	RegionPtr region;
16	- PixmapDirtyUpdatePtr ent;
17	+ PixmapDirtyUpdatePtr ent = NULL;
18
19	if (xorg_list_is_empty(&screen->pixmap_dirty_list))
20	return;
21	@@ -589,7 +591,7 @@
22	#endif	13	#endif
23	struct pci_device *dev = info->PciInfo;	14	struct pci_device *dev = info->PciInfo;
24	char *busid;	15	char *busid;
Lines 27-33 Link Here
27		18
28	#ifdef XF86_PDEV_SERVER_FD	19	#ifdef XF86_PDEV_SERVER_FD
29	if (pRADEONEnt->platform_dev) {	20	if (pRADEONEnt->platform_dev) {
30	@@ -608,6 +610,15 @@	21	@@ -848,6 +850,15 @@ static int radeon_get_drm_master_fd(Scrn
31	dev->domain, dev->bus, dev->dev, dev->func);	22	dev->domain, dev->bus, dev->dev, dev->func);
32	#endif	23	#endif
33		24