svn commit: r403056 - in head/graphics: dri libGL/files

[Koop Mast]

Author: kwm
Date: Sat Dec  5 10:46:58 2015
New Revision: 403056
URL: https://svnweb.freebsd.org/changeset/ports/403056

Log:
  Add patch to use drm.h instead of redefining the types.
  
  This unbreaks the build of xorg-server on 9.3.

Added:
  head/graphics/libGL/files/patch-include__GL__internal__dri_interface.h   (contents, props changed)
Modified:
  head/graphics/dri/Makefile

Modified: head/graphics/dri/Makefile
==============================================================================
--- head/graphics/dri/Makefile	Sat Dec  5 10:16:22 2015	(r403055)
+++ head/graphics/dri/Makefile	Sat Dec  5 10:46:58 2015	(r403056)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dri
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	graphics
 

Added: head/graphics/libGL/files/patch-include__GL__internal__dri_interface.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libGL/files/patch-include__GL__internal__dri_interface.h	Sat Dec  5 10:46:58 2015	(r403056)
@@ -0,0 +1,19 @@
+GCC on 9.x doesn't allow types to be overwritten, these types are defined
+in drm.h also, which causes build issues in xorg-server.
+
+--- include/GL/internal/dri_interface.h.orig	2015-12-05 10:55:50.545108000 +0100
++++ include/GL/internal/dri_interface.h	2015-12-05 10:56:03.408589000 +0100
+@@ -40,13 +40,7 @@
+ #ifndef DRI_INTERFACE_H
+ #define DRI_INTERFACE_H
+ 
+-#ifdef HAVE_LIBDRM
+ #include <drm.h>
+-#else
+-typedef unsigned int drm_context_t;
+-typedef unsigned int drm_drawable_t;
+-typedef struct drm_clip_rect drm_clip_rect_t;
+-#endif
+ 
+ /**
+  * \name DRI interface structures