[xorg-x11-drv-ati] update to latest master to fix plymouth->gdm handover.

Dave Airlie airlied at fedoraproject.org
Sat Jun 2 16:29:34 UTC 2012


commit 26d84da0f8b362cc910d14b2854ca6303da98fa1
Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Jun 2 17:28:37 2012 +0100

    update to latest master to fix plymouth->gdm handover.

 .gitignore                     |    1 +
 radeon-6.9.0-bgnr-enable.patch |   11 -----------
 sources                        |    2 +-
 xorg-x11-drv-ati.spec          |   11 ++++++-----
 4 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b04eabc..401e965 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ xf86-video-ati-20100705.tar.xz
 /xf86-video-ati-20120206.tar.xz
 /xf86-video-ati-20120329.tar.xz
 /xf86-video-ati-20120417.tar.xz
+/xf86-video-ati-20120602.tar.xz
diff --git a/sources b/sources
index 61ee566..2ccf049 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db1babbfa4692d2ab76017bdec71358f  xf86-video-ati-20120417.tar.xz
+17df84f912a4f3c7ee49668aa6a2848a  xf86-video-ati-20120602.tar.xz
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index fa47339..3d7bea0 100644
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@ -1,8 +1,8 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gitdate 20120417
-%define gitversion 0bda305f7
+%define gitdate 20120602
+%define gitversion 930760942
 
 %if 0%{?gitdate}
 %define gver .%{gitdate}git%{gitversion}
@@ -11,7 +11,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.14.4
-Release:   5%{?gver}%{?dist}
+Release:   6%{?gver}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -19,7 +19,6 @@ Group:     User Interface/X Hardware Support
 #Source0:    http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source0: %{tarball}-%{gitdate}.tar.xz
 
-Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
 Patch14:    radeon-no-ums.patch
@@ -44,7 +43,6 @@ X.Org X11 ati video driver.
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}}
-%patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
 %patch14 -p1 -b .no-ums
@@ -75,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Sat Jun 02 2012 Dave Airlie <airlied at redhat.com> 6.14.4-6
+- update to latest master to fix plymouth->gdm handover.
+
 * Tue Apr 17 2012 Dave Airlie <airlied at redhat.com> 6.14.4-5
 - update to latest master for solid picture fixes
 


More information about the scm-commits mailing list