diff --git a/.cvsignore b/.cvsignore index 297178a..c6396d3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xf86-video-ati-6.5.7.2.tar.bz2 +xf86-video-ati-6.5.7.3.tar.bz2 diff --git a/ati.xinf b/ati.xinf new file mode 100644 index 0000000..b089297 --- /dev/null +++ b/ati.xinf @@ -0,0 +1,39 @@ +alias pcivideo:v00001002d00004158sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004354sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004358sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004554sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004654sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004742sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004744sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004747sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004749sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d0000474Csv*sd*bc*sc*i* ati +alias pcivideo:v00001002d0000474Dsv*sd*bc*sc*i* ati +alias pcivideo:v00001002d0000474Esv*sd*bc*sc*i* ati +alias pcivideo:v00001002d0000474Fsv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004750sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004751sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004752sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004753sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004754sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004755sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004756sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004757sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004758sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004759sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d0000475Asv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004C42sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004C44sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004C47sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004C49sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004C4Dsv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004C4Esv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004C50sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004C51sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004C52sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004C53sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00004C54sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00005354sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00005654sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00005655sv*sd*bc*sc*i* ati +alias pcivideo:v00001002d00005656sv*sd*bc*sc*i* ati diff --git a/sources b/sources index 8e8962e..7cd2758 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df8bc10377781fce78274fc58fbf8367 xf86-video-ati-6.5.7.2.tar.bz2 +a87420414681c53681a330b55ffb04ea xf86-video-ati-6.5.7.3.tar.bz2 diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index e2eb447..a364da8 100644 --- a/xorg-x11-drv-ati.spec +++ b/xorg-x11-drv-ati.spec @@ -1,14 +1,10 @@ %define tarball xf86-video-ati -# All packages should own all dirs they lead up to, for saner -# rpm packaging, in particular if the leading dirs are not owned by -# the "filesystem" package. %define moduledir %(pkg-config xorg-server --variable=moduledir ) -# define driverdir to the appropriate type for this driver class %define driverdir %{moduledir}/drivers %define cvsdate xxxxxxx -%ifarch %{ix86} x86_64 ia64 ppc +%ifarch %{ix86} x86_64 ia64 ppc alpha %define with_dri 1 %else %define with_dri 0 @@ -16,13 +12,11 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati -Version: 6.5.7.2 -Release: 1 +Version: 6.5.7.3 +Release: 1 URL: http://www.x.org -# FIXME: If using a CVS version, uncomment the second Source0 line and use -# it instead. Source0: http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2 -#Source0: http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2 +Source1: ati.xinf License: MIT/X11 Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,6 +30,7 @@ BuildRequires: mesa-libGL-devel >= 6.4-4 %endif Requires: xorg-x11-server-Xorg + %description X.Org X11 ati video driver. @@ -48,14 +43,15 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -# FIXME: This should be using makeinstall macro instead. Please test -# makeinstall with this driver, and if it works, check it into CVS. If -# it fails, fix it in upstream sources and file a patch upstream. + make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases +install -m 0644 %{SOURCE1} $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. -find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f -- +find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- %clean rm -rf $RPM_BUILD_ROOT @@ -68,15 +64,21 @@ rm -rf $RPM_BUILD_ROOT %{driverdir}/atimisc_drv.so %{driverdir}/r128_drv.so %{driverdir}/radeon_drv.so +%{_datadir}/hwdata/videoaliases/ati.xinf %dir %{moduledir}/multimedia %{moduledir}/multimedia/theatre200_drv.so %{moduledir}/multimedia/theatre_detect_drv.so %{moduledir}/multimedia/theatre_drv.so -%dir %{_mandir} -%dir %{_mandir}/man4 -%{_mandir}/man4/*.4* +#%dir %{_mandir}/man4x +%{_mandir}/man4/ati.4* +%{_mandir}/man4/r128.4* +%{_mandir}/man4/radeon.4* %changelog +* Wed Jan 18 2006 Mike A. Harris 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. + * Tue Dec 20 2005 Mike A. Harris 6.5.7.2-1 - Updated xorg-x11-drv-ati to version 6.5.7.2 from X11R7 RC4 - Removed 'x' suffix from manpage dirs to match RC4 upstream.