From 0744e5a84ac80c870aea5940c1a2e33638bf898a Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Feb 03 2006 13:33:56 +0000
Subject: - Added r128.xinf and radeon.xinf videoalias files to fix bug (#174101).

- Added "BuildRequires: libdrm-devel >= 2.0-1" to fix bug (#178613)

---

diff --git a/r128.xinf b/r128.xinf
new file mode 100644
index 0000000..7101783
--- /dev/null
+++ b/r128.xinf
@@ -0,0 +1,47 @@
+alias pcivideo:v00001002d00004C45sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00004C46sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00004D46sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00004D4Csv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005041sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005042sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005043sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005044sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005045sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005046sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005047sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005048sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005049sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000504Asv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000504Bsv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000504Csv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000504Dsv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000504Esv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000504Fsv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005050sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005051sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005052sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005053sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005054sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005055sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005056sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005057sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005058sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005245sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005246sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005247sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000524Bsv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000524Csv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005345sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005346sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005347sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005348sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000534Bsv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000534Csv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000534Dsv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000534Esv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005446sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d0000544Csv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005452sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005453sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005454sv*sd*bc*sc*i* r128
+alias pcivideo:v00001002d00005455sv*sd*bc*sc*i* r128
diff --git a/radeon.xinf b/radeon.xinf
new file mode 100644
index 0000000..58671fb
--- /dev/null
+++ b/radeon.xinf
@@ -0,0 +1,115 @@
+alias pcivideo:v00001002d00003150sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00003154sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00003E50sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00003E54sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004136sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004137sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004144sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004145sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004146sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004147sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004148sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004149sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000414Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000414Bsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004150sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004151sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004152sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004153sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004154sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004155sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004156sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004157sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004237sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004242sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004243sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004336sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004337sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004437sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004964sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004965sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004966sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004967sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004A48sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004A49sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004A4Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004A4Bsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004A4Csv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004A4Dsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004A4Esv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004A50sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004C57sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004C58sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004C59sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004C5Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004C64sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004C65sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004C66sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004C67sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E44sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E45sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E46sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E47sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E48sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E49sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E4Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E4Bsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E50sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E51sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E52sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E53sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E54sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004E56sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005144sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005145sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005146sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005147sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005148sv00001002sd0000010Abc*sc*i* radeon
+alias pcivideo:v00001002d00005148sv00001002sd00000152bc*sc*i* radeon
+alias pcivideo:v00001002d00005148sv00001002sd00000162bc*sc*i* radeon
+alias pcivideo:v00001002d00005148sv00001002sd00000172bc*sc*i* radeon
+alias pcivideo:v00001002d00005148sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005149sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000514Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000514Bsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000514Csv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000514Dsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000514Esv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000514Fsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005157sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005158sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005159sv00001002sd0000000Bbc*sc*i* radeon
+alias pcivideo:v00001002d00005159sv00001002sd0000013Abc*sc*i* radeon
+alias pcivideo:v00001002d00005159sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000515Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000515Esv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005168sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005169sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000516Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000516Bsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000516Csv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005460sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005464sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005548sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005549sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000554Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000554Bsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005551sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005552sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005554sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005834sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005835sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005960sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005961sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005962sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005964sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005969sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005B60sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005B62sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005B64sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005B65sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005C61sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005C63sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005D57sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00007834sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00007835sv*sd*bc*sc*i* radeon
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index a364da8..a28b54c 100644
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@ -13,10 +13,12 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.5.7.3
-Release:   1
+Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ati.xinf
+Source2:   r128.xinf
+Source3:   radeon.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +29,7 @@ BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.4-4
+BuildRequires: libdrm-devel >= 2.0-1
 %endif
 
 Requires:  xorg-x11-server-Xorg
@@ -48,6 +51,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
 # INFO: We don't want to ship the libtool archives (*.la) from modules
 # directory, as they serve no useful purpose.
@@ -65,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/r128_drv.so
 %{driverdir}/radeon_drv.so
 %{_datadir}/hwdata/videoaliases/ati.xinf
+%{_datadir}/hwdata/videoaliases/r128.xinf
+%{_datadir}/hwdata/videoaliases/radeon.xinf
 %dir %{moduledir}/multimedia
 %{moduledir}/multimedia/theatre200_drv.so
 %{moduledir}/multimedia/theatre_detect_drv.so
@@ -75,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Feb  2 2006 Mike A. Harris <mharris@redhat.com> 6.5.7.3-2
+- Added r128.xinf and radeon.xinf videoalias files to fix bug (#174101).
+- Added "BuildRequires: libdrm-devel >= 2.0-1" to fix bug (#178613)
+
 * Wed Jan 18 2006 Mike A. Harris <mharris@redhat.com> 6.5.7.3-1
 - Updated xorg-x11-drv-ati to version 6.5.7.3 from X11R7.0
 - Added ati.xinf videoalias file for hardware autodetection.