Add fix-include-locations.patch to standardize include locations to <X11/extensions/foo.h> instead of some mixture of <foo.h> and "foo.h."

(Portage version: 2.0.51.22-r2)

3 files changed, 95 insertions, 2 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 3e64092cb6e9..5d7612703de6 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.17 2005/08/10 22:04:46 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.18 2005/08/10 22:36:01 spyderous Exp $
+
+  10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/fix-include-locations.patch, mesa-6.3.1.1.ebuild:
+  Add fix-include-locations.patch to standardize include locations to
+  <X11/extensions/foo.h> instead of some mixture of <foo.h> and "foo.h."
 
   10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   +files/makedepend-location.patch, mesa-6.3.1.1.ebuild:
diff --git a/media-libs/mesa/files/fix-include-locations.patch b/media-libs/mesa/files/fix-include-locations.patch
new file mode 100644
index 000000000000..4498e5475a12
--- /dev/null
+++ b/media-libs/mesa/files/fix-include-locations.patch
@@ -0,0 +1,87 @@
+diff -urN Mesa-6.3.1.1.orig/src/glx/x11/dri_glx.c Mesa-6.3.1.1/src/glx/x11/dri_glx.c
+--- Mesa-6.3.1.1.orig/src/glx/x11/dri_glx.c	2005-07-27 17:29:51.000000000 -0700
++++ Mesa-6.3.1.1/src/glx/x11/dri_glx.c	2005-08-10 15:26:15.000000000 -0700
+@@ -38,7 +38,7 @@
+ #include <unistd.h>
+ #include <X11/Xlibint.h>
+ #include <X11/extensions/Xext.h>
+-#include "extutil.h"
++#include <X11/extensions/extutil.h>
+ #include "glxclient.h"
+ #include "xf86dri.h"
+ #include "sarea.h"
+diff -urN Mesa-6.3.1.1.orig/src/glx/x11/glxcmds.c Mesa-6.3.1.1/src/glx/x11/glxcmds.c
+--- Mesa-6.3.1.1.orig/src/glx/x11/glxcmds.c	2005-07-27 17:29:51.000000000 -0700
++++ Mesa-6.3.1.1/src/glx/x11/glxcmds.c	2005-08-10 15:31:21.000000000 -0700
+@@ -41,14 +41,14 @@
+ 
+ #include <inttypes.h>
+ #include "glxclient.h"
+-#include <extutil.h>
+-#include <Xext.h>
++#include <X11/extensions/extutil.h>
++#include <X11/extensions/Xext.h>
+ #include <assert.h>
+ #include <string.h>
+ #include "glapi.h"
+ #ifdef GLX_DIRECT_RENDERING
+ #include "indirect_init.h"
+-#include "xf86vmode.h"
++#include <X11/extensions/xf86vmode.h>
+ #include "xf86dri.h"
+ #endif
+ #include "glxextensions.h"
+diff -urN Mesa-6.3.1.1.orig/src/glx/x11/glxext.c Mesa-6.3.1.1/src/glx/x11/glxext.c
+--- Mesa-6.3.1.1.orig/src/glx/x11/glxext.c	2005-07-26 15:53:38.000000000 -0700
++++ Mesa-6.3.1.1/src/glx/x11/glxext.c	2005-08-10 15:30:01.000000000 -0700
+@@ -46,8 +46,8 @@
+ 
+ #include "glxclient.h"
+ #include <stdio.h>
+-#include <Xext.h>
+-#include <extutil.h>
++#include <X11/extensions/Xext.h>
++#include <X11/extensions/extutil.h>
+ #include <assert.h>
+ #include "indirect_init.h"
+ #include "glapi.h"
+diff -urN Mesa-6.3.1.1.orig/src/glx/x11/glxextensions.c Mesa-6.3.1.1/src/glx/x11/glxextensions.c
+--- Mesa-6.3.1.1.orig/src/glx/x11/glxextensions.c	2005-07-23 23:29:14.000000000 -0700
++++ Mesa-6.3.1.1/src/glx/x11/glxextensions.c	2005-08-10 15:30:13.000000000 -0700
+@@ -29,8 +29,8 @@
+  */
+ 
+ #include "glxclient.h"
+-#include <extutil.h>
+-#include <Xext.h>
++#include <X11/extensions/extutil.h>
++#include <X11/extensions/Xext.h>
+ #include <string.h>
+ #include "glapi.h"
+ #include "glxextensions.h"
+diff -urN Mesa-6.3.1.1.orig/src/glx/x11/glx_pbuffer.c Mesa-6.3.1.1/src/glx/x11/glx_pbuffer.c
+--- Mesa-6.3.1.1.orig/src/glx/x11/glx_pbuffer.c	2005-07-26 15:53:38.000000000 -0700
++++ Mesa-6.3.1.1/src/glx/x11/glx_pbuffer.c	2005-08-10 15:28:05.000000000 -0700
+@@ -31,8 +31,8 @@
+ 
+ #include <inttypes.h>
+ #include "glxclient.h"
+-#include <extutil.h>
+-#include <Xext.h>
++#include <X11/extensions/extutil.h>
++#include <X11/extensions/Xext.h>
+ #include <assert.h>
+ #include <string.h>
+ #include "glapi.h"
+diff -urN Mesa-6.3.1.1.orig/src/glx/x11/XF86dri.c Mesa-6.3.1.1/src/glx/x11/XF86dri.c
+--- Mesa-6.3.1.1.orig/src/glx/x11/XF86dri.c	2005-01-07 19:54:38.000000000 -0800
++++ Mesa-6.3.1.1/src/glx/x11/XF86dri.c	2005-08-10 15:27:21.000000000 -0700
+@@ -40,7 +40,7 @@
+ #define NEED_REPLIES
+ #include <X11/Xlibint.h>
+ #include <X11/extensions/Xext.h>
+-#include "extutil.h"
++#include <X11/extensions/extutil.h>
+ #include "glheader.h"
+ #include "xf86dristr.h"
+ 
diff --git a/media-libs/mesa/mesa-6.3.1.1.ebuild b/media-libs/mesa/mesa-6.3.1.1.ebuild
index cb2d6f86db90..d4dd26b744c7 100644
--- a/media-libs/mesa/mesa-6.3.1.1.ebuild
+++ b/media-libs/mesa/mesa-6.3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.3.1.1.ebuild,v 1.8 2005/08/10 22:04:46 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.3.1.1.ebuild,v 1.9 2005/08/10 22:36:01 spyderous Exp $
 
 inherit eutils toolchain-funcs
 
@@ -61,6 +61,7 @@ src_unpack() {
 	epatch ${FILESDIR}/fix-xthreads-location.patch
 	epatch ${FILESDIR}/use-xthreads.patch
 	epatch ${FILESDIR}/makedepend-location.patch
+	epatch ${FILESDIR}/fix-include-locations.patch
 
 	# Set up linux-dri configs
 	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}