rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-mesa-6.5.2.patch, NONE, 1.1 xorg-x11-server.spec, 1.193, 1.194

[fedora-cvs-commits at redhat.com]

Author: atkac

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23219/xorg-x11-server/devel

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-mesa-6.5.2.patch 
Log Message:
Fixed building against mesa-6.5.2


xorg-x11-server-1.1.1-mesa-6.5.2.patch:
 main/Makefile.am         |    1 +
 shader/slang/Makefile.am |    1 +
 swrast/Makefile.am       |    1 +
 3 files changed, 3 insertions(+)

--- NEW FILE xorg-x11-server-1.1.1-mesa-6.5.2.patch ---
--- xorg-server-1.1.1/GL/mesa/swrast/Makefile.am.mesa-652	2006-07-05 20:31:36.000000000 +0200
+++ xorg-server-1.1.1/GL/mesa/swrast/Makefile.am	2006-12-11 13:57:00.000000000 +0100
@@ -8,6 +8,7 @@
 	@GLX_DEFINES@
 
 INCLUDES = -I at MESA_SOURCE@/include \
+           -I at MESA_SOURCE@/src/mesa/main \
            -I../X \
            -I../array_cache \
            -I../glapi \
--- xorg-server-1.1.1/GL/mesa/main/Makefile.am.mesa-652	2006-12-11 13:57:00.000000000 +0100
+++ xorg-server-1.1.1/GL/mesa/main/Makefile.am	2006-12-11 13:57:00.000000000 +0100
@@ -8,6 +8,7 @@
 	@GLX_DEFINES@
 
 INCLUDES = -I at MESA_SOURCE@/include \
+           -I at MESA_SOURCE@/src/mesa/main \
            -I../X \
            -I../array_cache \
            -I../glapi \
--- xorg-server-1.1.1/GL/mesa/shader/slang/Makefile.am.mesa-652	2006-12-11 14:10:36.000000000 +0100
+++ xorg-server-1.1.1/GL/mesa/shader/slang/Makefile.am	2006-12-11 14:11:11.000000000 +0100
@@ -8,6 +8,7 @@
 	@GLX_DEFINES@
 
 INCLUDES = -I at MESA_SOURCE@/include \
+           -I at MESA_SOURCE@/src/mesa/shader/slang \
            -I../grammar \
            -I../../X \
            -I../../array_cache \


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- xorg-x11-server.spec	1 Dec 2006 19:36:11 -0000	1.193
+++ xorg-x11-server.spec	11 Dec 2006 13:49:21 -0000	1.194
@@ -8,7 +8,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   54%{?dist}
+Release:   54.1%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -45,6 +45,7 @@
 Patch107:  xorg-x11-server-1.1.1-offscreen-pixmaps.patch
 Patch108:  xorg-x11-server-1.1.1-mesa-6.5.1.patch
 Patch109:  xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch
+Patch110:  xorg-x11-server-1.1.1-mesa-6.5.2.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -347,6 +348,7 @@
 %patch107 -p1 -b .offscreen-pixmaps
 %patch108 -p1 -b .mesa-651
 %patch109 -p1 -b .aiglx-happy-vt-switch
+%patch110 -p1 -b .mesa-652
 
 %patch1001 -p1 -b .Red-Hat-extramodes
 %patch1002 -p1 -b .xephyr
@@ -679,6 +681,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Dec 11 2006 Adam Tkac <atkac redhat com> 1.1.1-54.1.fc7
+- fixed building against mesa-6.5.2
+
 * Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.1.1-54.fc7
 - xorg-x11-server-1.1.1-xkb-vidmode-switch.patch: Fix string matching on
   XKB actions to be case-insensitive again.  (#216656)