rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.12, 1.13 xorg-x11-drv-ati.spec, 1.110, 1.111

[Kristian Høgsberg]

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32113

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Log Message:
* Tue Sep  9 2008 Kristian Høgsberg <krh at redhat.com> 6.9.0-11
- Restore CFLAGS after testing for DRM_MODE in radeon-modeset.patch.


radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- radeon-modeset.patch	27 Aug 2008 05:56:29 -0000	1.12
+++ radeon-modeset.patch	9 Sep 2008 19:20:18 -0000	1.13
@@ -2,7 +2,7 @@
 index b8c18a6..a7e954d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -115,6 +115,14 @@ if test "$DRI" = yes; then
+@@ -115,6 +115,15 @@ if test "$DRI" = yes; then
  	if test "$have_damage_h" = yes; then
  		AC_DEFINE(DAMAGE,1,[Use Damage extension])
  	fi
@@ -14,6 +14,7 @@
 +        if test "x$DRM_MODE" = xyes; then
 +                AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
 +        fi
++        CFLAGS="$save_CFLAGS"
  fi
  
  save_CFLAGS="$CFLAGS"


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- xorg-x11-drv-ati.spec	8 Sep 2008 19:20:47 -0000	1.110
+++ xorg-x11-drv-ati.spec	9 Sep 2008 19:20:18 -0000	1.111
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -73,6 +73,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Sep  9 2008 Kristian Høgsberg <krh at redhat.com> 6.9.0-11
+- Restore CFLAGS after testing for DRM_MODE in radeon-modeset.patch.
+
 * Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 6.9.0-10
 - radeon-6.9.0-fb-size.patch: Yet more lame heuristics to preallocate a
   usable framebuffer for laptops. (#458864)