rpms/xorg-x11-drv-ati/devel .cvsignore, 1.32, 1.33 sources, 1.33, 1.34 xorg-x11-drv-ati.spec, 1.188, 1.189

[Dave Airlie]

Author: airlied

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

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Log Message:
* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.18.20091201git88a50a30d
- add R600 RLC firmware for IRQ handling



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	29 Sep 2009 03:26:30 -0000	1.32
+++ .cvsignore	2 Dec 2009 03:58:16 -0000	1.33
@@ -1 +1,2 @@
 xf86-video-ati-20090929.tar.xz
+radeon-rlc-firmware-1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	2 Dec 2009 02:54:32 -0000	1.33
+++ sources	2 Dec 2009 03:58:17 -0000	1.34
@@ -1 +1,2 @@
 f66ac154c99ba836f38f4bea302e9d75  xf86-video-ati-20091201.tar.xz
+189be8ab60025bf81f8841ab53175665  radeon-rlc-firmware-1.tar.bz2


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.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- xorg-x11-drv-ati.spec	2 Dec 2009 02:54:32 -0000	1.188
+++ xorg-x11-drv-ati.spec	2 Dec 2009 03:58:17 -0000	1.189
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.17.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.18.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0: %{tarball}-%{gitdate}.tar.xz
 # unlike the other drivers, radeon.xinf is generated
 Source1:    mkxinf
+Source2:    radeon-rlc-firmware-1.tar.bz2
 
 Patch2:     radeon-ums-displayport.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
@@ -43,8 +44,14 @@ Obsoletes: xorg-x11-drv-avivo <= 0.0.2
 %description 
 X.Org X11 ati video driver.
 
+%package firmware
+Summary: ATI firmware for R600 RLC
+
+%description firmware
+Firmware for ATI R600/R700 IRQs
+
 %prep
-%setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{gitdate} -a 2
 %patch2 -p1 -b .dp
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
@@ -67,6 +74,9 @@ install -m 0644 radeon.xinf $RPM_BUILD_R
 
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+%{__mkdir_p} %{buildroot}/lib/firmware/radeon
+%{__install} -p -m 0644 *.bin %{buildroot}/lib/firmware/radeon/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,7 +91,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/ati.4*
 %{_mandir}/man4/radeon.4*
 
+%files firmware
+%defattr(-,root,root,-)
+%doc LICENSE.radeon.firmware
+/lib/firmware/radeon/*.bin
+
 %changelog
+* Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.18.20091201git88a50a30d
+- add R600 RLC firmware for IRQ handling
+
 * Wed Dec 02 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.17.20091201git88a50a30d
 - ums displayport + bump libdrm requires for new function needed