6:26 a.m.
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28917/F-10
Modified Files:
.cvsignore amdcccle.desktop fglrx-README.Fedora sources
xorg-x11-drv-fglrx.spec
Log Message:
* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
- Update to Catalyst 9.1
- Include README.Fedora in %doc
- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs
- Update License tag
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 16 Dec 2008 17:43:43 -0000 1.4
+++ .cvsignore 31 Jan 2009 06:25:44 -0000 1.5
@@ -1 +1 @@
-ati-driver-installer-8-12-x86.x86_64.run
+ati-driver-installer-9-1-x86.x86_64.run
Index: amdcccle.desktop
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/amdcccle.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amdcccle.desktop 16 Oct 2008 16:20:01 -0000 1.1
+++ amdcccle.desktop 31 Jan 2009 06:25:44 -0000 1.2
@@ -14,9 +14,8 @@
Comment[es]=Configuración del adaptador de los gráficos de ATI
Comment[fr]=Configuration d'adapteur de graphiques d'ATI
Comment[it]=Configurazione dell'adattatore dei grafici di ATI
-Icon=ccc_large.xpm
+Icon=ccc_large
Exec=amdcccle
Type=Application
Terminal=false
-Encoding=UTF-8
Categories=Qt;System;
Index: fglrx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/fglrx-README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fglrx-README.Fedora 30 Dec 2008 22:41:04 -0000 1.2
+++ fglrx-README.Fedora 31 Jan 2009 06:25:44 -0000 1.3
@@ -73,7 +73,7 @@
5. Release-specific notes
-----------------------------
-This release (Catalyst 8.12) is incompatible with the plymouth graphical boot
+Recent releases (Catalyst 8.12+) are incompatible with the plymouth boot
system implemented in Fedora 10, as the 'radeon' and 'drm' kernel modules
are
loaded from the kernel ramdisk image (initrd) before fglrx can be. Because of
this, these modules have been blacklisted. The open-source radeon driver as well
@@ -82,7 +82,15 @@
The initrd image for the current kernel will need to be regenerated before 3D
rendering will function correctly. To do this, execute these commands as root:
- mv /boot/initrd-`uname -r`.img /boot/initrd-`uname -r`.img.bak
- mkinitrd -f --allow-missing /boot/`uname -r`.img
+ mv /boot/initrd-`uname -r`.img /boot/initrd-`uname -r`.img.rfbak
+ mkinitrd -f --allow-missing /boot/initrd-`uname -r`.img `uname -r`
+
+A final reboot will be required before things function as expected. To restore
+plymouth functionality and use the open source drivers, first uninstall the
+xorg-x11-drv-fglrx package from your system and then run:
+ mv /boot/initrd-`uname -r`.img.rfbak /boot/initrd-`uname -r`.img
+
+Once again, a reboot will be required before the open source drivers being
+working properly.
+
-A final reboot will be required before things function as expected.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 16 Dec 2008 17:43:43 -0000 1.5
+++ sources 31 Jan 2009 06:25:44 -0000 1.6
@@ -1 +1 @@
-2a62d8c5173f091379e458371782a580 ati-driver-installer-8-12-x86.x86_64.run
+cc4ff401586a6c099c9fd002c25cf7bb ati-driver-installer-9-1-x86.x86_64.run
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-fglrx.spec 31 Dec 2008 18:46:58 -0000 1.15
+++ xorg-x11-drv-fglrx.spec 31 Jan 2009 06:25:44 -0000 1.16
@@ -1,5 +1,5 @@
%define atilibdir %{_libdir}/fglrx
-%define ativersion 8.12
+%define ativersion 9.1
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -8,13 +8,13 @@
%endif
Name: xorg-x11-drv-fglrx
-Version: 8.561
-Release: 6.%{ativersion}%{?dist}
+Version: 8.573
+Release: 1.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
-License: BSD/Commercial/GPL/QPL
+License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0:
https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0:
https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
Source1: fglrx-README.Fedora
Source3: fglrx-config-display
Source4: fglrx-init
@@ -119,12 +119,12 @@
%endif
%ifarch x86_64
-echo `pwd`
cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/
%endif
-# fix doc perms
+# fix doc perms & copy README.Fedora
find fglrxpkg/usr/share/doc/fglrx -type f -exec chmod 0644 {} \;
+install -pm 0644 %{SOURCE1} ./README.Fedora
%build
@@ -214,8 +214,7 @@
install -D -p -m 0644 %{SOURCE9}
$RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-lid-aticonfig.conf
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor livna \
- --add-category X-Livna \
+desktop-file-install --vendor rpmfusion \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE5}
@@ -238,12 +237,6 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d
install -pm 0644 %{SOURCE12}
$RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
-%ifarch x86_64
-# dri workaround
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
-ln -s ../../lib64/dri/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -275,7 +268,7 @@
%files
%defattr(-,root,root,-)
-%doc fglrxpkg/usr/share/doc/fglrx/*
+%doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora
%{_sysconfdir}/udev/makedev.d/40-fglrx-dri.nodes
%dir %{_sysconfdir}/ati/
%{_sysconfdir}/ati/authatieventsd.sh
@@ -302,17 +295,13 @@
%{_mandir}/man[1-9]/atieventsd.*
%{_libdir}/xorg/modules/extensions/fglrx/
%{_libdir}/xorg/modules/*.so
-%{_libdir}/dri/
-%ifarch x86_64
-%{_prefix}/lib/dri/
-%endif
%files libs
%defattr(-,root,root,-)
%dir %{atilibdir}
%{atilibdir}/*.so*
-# FIXME: This file is recognized as "data" - figure out how to move it later
%{atilibdir}/libAMDXvBA.cap
+%{_libdir}/dri/
%files devel
%defattr(-,root,root,-)
@@ -323,6 +312,12 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
+- Update to Catalyst 9.1
+- Include README.Fedora in %%doc
+- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs
+- Update License tag
+
* Wed Dec 31 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-6.8.12
- symlink needs to be ../lib64/dri, not ../lib64