rpms/xorg-x11-drv-ati/devel copy-fb-contents.patch, 1.3, 1.4 xorg-x11-drv-ati.spec, 1.119, 1.120

[Dave Airlie]

Author: airlied

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

Modified Files:
	copy-fb-contents.patch xorg-x11-drv-ati.spec 
Log Message:
- fix collision with copy fb contents patch


copy-fb-contents.patch:

Index: copy-fb-contents.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/copy-fb-contents.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- copy-fb-contents.patch	26 Sep 2008 21:13:31 -0000	1.3
+++ copy-fb-contents.patch	29 Sep 2008 06:55:09 -0000	1.4
@@ -26,15 +26,10 @@
  static Bool drmmode_resize_fb(ScrnInfoPtr scrn, drmmode_ptr drmmode, int width, int height);
  
  static Bool
-@@ -119,6 +122,76 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode)
+@@ -119,6 +122,71 @@ drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode)
  
  }
  
-+struct radeon_exa_pixmap_priv {
-+    dri_bo *bo;
-+    int flags;
-+};
-+
 +static PixmapPtr
 +create_pixmap_for_fb(drmmode_ptr drmmode, ScrnInfoPtr pScrn, drmModeFBPtr fb)
 +{
@@ -103,7 +98,7 @@
  static Bool
  drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		     Rotation rotation, int x, int y)
-@@ -174,7 +247,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -174,7 +242,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  	fb_id = drmmode->fb_id;
  	if (drmmode_crtc->rotate_fb_id)
  		fb_id = drmmode_crtc->rotate_fb_id;


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.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- xorg-x11-drv-ati.spec	29 Sep 2008 06:45:37 -0000	1.119
+++ xorg-x11-drv-ati.spec	29 Sep 2008 06:55:09 -0000	1.120
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   19%{?dist}
+Release:   20%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -75,6 +75,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Sep 29 2008 Dave Airlie <airlied at redhat.com> 6.9.0-20
+- fix collision with copy fb contents patch
+
 * Mon Sep 29 2008 Dave Airlie <airlied at redhat.com> 6.9.0-19
 - fix textured video + merge otaylor fix into exa fixes patch