SPECS: X11.spec - conditional r300 is back

[patrys]

Author: patrys                       Date: Tue Dec 27 22:14:44 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- conditional r300 is back

---- Files affected:
SPECS:
   X11.spec (1.171 -> 1.172) 

---- Diffs:

================================================================
Index: SPECS/X11.spec
diff -u SPECS/X11.spec:1.171 SPECS/X11.spec:1.172
--- SPECS/X11.spec:1.171	Sat Dec 24 17:35:12 2005
+++ SPECS/X11.spec	Tue Dec 27 23:14:38 2005
@@ -15,6 +15,7 @@
 
 #http://cambuca.ldhs.cetuc.puc-rio.br/multiuser/
 %bcond_with	dualhead	# apply dualhead patch
+%bcond_with	r300		# enable r300_dri
 
 Summary:	XOrg X11 Window System servers and basic programs
 Summary(de):	XOrg X11 Window-System-Server und grundlegende Programme
@@ -125,6 +126,9 @@
 
 Patch72:	http://glen.alkohol.ee/xkb/xorg.patch
 
+# r300
+Patch73:       %{name}-r300-Imakefile.patch
+
 #head-patch
 #ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/
 Patch100:	ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/xorg-x11-6.8.1-dualhead.patch
@@ -1991,8 +1995,11 @@
 # %patch71 -p0
 %{__patch} -d xc/programs/xkbcomp/symbols/pc < %{PATCH72}
 
+%{?with_r300:%patch73 -p0}
+
 %{?with_dualhead:%patch100 -p1}
 
+%{?with_r300:sed -i -e 's/r200/r200 r300/g' xc/config/cf/*.cf}
 
 sed -i -e 's#krb5/##g' xc/lib/Xau/*.* xc/programs/xdm/greeter/*.* \
 	xc/programs/xdm/*.* xc/programs/Xserver/os/*.*
@@ -3449,6 +3456,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172  2005/12/27 22:14:38  patrys
+- conditional r300 is back
+
 Revision 1.171  2005/12/24 16:35:12  glen
   BR cpp
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11.spec?r1=1.171&r2=1.172&f=u