From owner-svn-ports-all@freebsd.org Sat Dec 5 10:47:00 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F2F2A41AFB; Sat, 5 Dec 2015 10:47:00 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1BE59111B; Sat, 5 Dec 2015 10:47:00 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB5Akxi2025647; Sat, 5 Dec 2015 10:46:59 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB5AkxOI025645; Sat, 5 Dec 2015 10:46:59 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201512051046.tB5AkxOI025645@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sat, 5 Dec 2015 10:46:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403056 - in head/graphics: dri libGL/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Dec 2015 10:47:00 -0000 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 +-#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