rpms/mesa/devel mesa-6.5-build-config.patch, NONE, 1.1 mesa.spec, 1.51, 1.52 mesa-6.3.2-build-configuration-v4.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4150

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-build-config.patch 
Removed Files:
	mesa-6.3.2-build-configuration-v4.patch 
Log Message:
+- Go back to patching config/linux-dri, add mesa-6.5-build-config.patch,
+  drop mesa-6.3.2-build-configuration-v4.patch.
+- Disable sis dri driver for now, only builds on x86 and x86-64.


mesa-6.5-build-config.patch:
 linux     |    3 +++
 linux-dri |   10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE mesa-6.5-build-config.patch ---
--- ./configs/linux-dri.build-config	2006-03-31 12:29:46.000000000 -0500
+++ ./configs/linux-dri	2006-04-03 18:13:52.000000000 -0400
@@ -10,21 +10,21 @@
 CXX = g++
 
 #MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
+#MKDEP = gcc -M 
 #MKDEP_OPTIONS = -MF depend
 
 OPT_FLAGS  = -g
 PIC_FLAGS  = -fPIC
 
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
+ARCH_FLAGS ?= -DGLX_USE_TLS
 
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
 
-X11_INCLUDES = -I/usr/X11R6/include
+X11_INCLUDES =
 
 CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 	$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math 
@@ -35,7 +35,7 @@
 ASM_SOURCES = 
 
 # Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
+EXTRA_LIB_PATH =
 
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
@@ -64,4 +64,4 @@
 # gamma are missing because they have not been converted to use the new
 # interface.
 DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v \
-	savage sis tdfx trident unichrome ffb
+	savage tdfx trident unichrome ffb
--- ./configs/linux.build-config	2006-04-03 18:13:19.000000000 -0400
+++ ./configs/linux	2006-04-03 18:13:47.000000000 -0400
@@ -8,6 +8,9 @@
 CC = gcc
 CXX = g++
 
+MKDEP = gcc -M -MG
+MKDEP_OPTIONS = -MF depend
+
 OPT_FLAGS  = -O3 -g
 PIC_FLAGS  = -fPIC
 


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mesa.spec	3 Apr 2006 19:34:38 -0000	1.51
+++ mesa.spec	3 Apr 2006 23:02:12 -0000	1.52
@@ -67,7 +67,7 @@
 Source10: redhat-mesa-target
 Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
-Patch0: mesa-6.3.2-build-configuration-v4.patch
+Patch0: mesa-6.5-build-config.patch
 Patch1: mesa-6.3.2-fix-installmesa.patch
 Patch2: mesa-6.4-multilib-fix.patch
 Patch3: mesa-modular-dri-dir.patch
@@ -231,7 +231,7 @@
 install -m 755 %{SOURCE11} ./
 install -m 755 %{SOURCE12} ./
 
-#%patch0 -p0 -b .makedepend
+%patch0 -p0 -b .build-config
 %patch1 -p0 -b .fix-installmesa
 %patch2 -p0 -b .multilib-fix
 %patch3 -p1 -b .modular
@@ -253,7 +253,6 @@
 #-- Build ------------------------------------------------------------
 %build
 # Macroize this to simplify things
-%define makeopts MKDEP="gcc -M" MKDEP_OPTIONS="-MG depend" ARCH_FLAGS=-DGLX_USE_TLS
 export CFLAGS="$RPM_OPT_FLAGS"
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
@@ -444,6 +443,9 @@
 - Widen libGLU glob.
 - Reenable r300 driver install.
 - Widen libOSMesa glob.
+- Go back to patching config/linux-dri, add mesa-6.5-build-config.patch,
+  drop mesa-6.3.2-build-configuration-v4.patch.
+- Disable sis dri driver for now, only builds on x86 and x86-64.
 
 * Fri Mar 24 2006 Kristian Høgsberg <krh at redhat.com> 6.4.2-7
 - Set ARCH_FLAGS=-DGLX_USE_TLS to enable TLS for GL contexts.


--- mesa-6.3.2-build-configuration-v4.patch DELETED ---