- conditional r300 is back

Changed files:
    X11.spec -> 1.172

diff --git a/X11.spec b/X11.spec
index 27781a489481813f04ea293dcf27134062e52898..5d0b6c0240d2c620de0d1a0e047f12a176ccbdcf 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -14,6 +14,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
@@ -124,6 +125,9 @@ Patch71:    %{name}-radeon-set-fb-location.patch
 
 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
@@ -1990,8 +1994,11 @@ rm -f xc/config/cf/host.def
 # %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/*.*