Author: firewing Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv8727 Modified Files: .cvsignore catalyst-README.Fedora sources xorg-x11-drv-catalyst.spec Added Files: filter-provides.sh filter-requires.sh Removed Files: blacklist-radeon.conf dead.package Log Message: * Sat May 1 2010 Stewart Adam <s.adam at diffingo.com> - 10.4-1 - Update to Catalyst 10.4 (internal version 8.72.3) --- NEW FILE filter-provides.sh --- #!/bin/sh if [ -x /usr/lib/rpm/redhat/find-provides ]; then FINDPROV=/usr/lib/rpm/redhat/find-provides else FINDPROV=/usr/lib/rpm/find-provides fi $FINDPROV $* | sed -e '/libGL.so/d' --- NEW FILE filter-requires.sh --- #!/bin/sh if [ -x /usr/lib/rpm/redhat/find-requires ]; then FINDREQ=/usr/lib/rpm/redhat/find-requires else FINDREQ=/usr/lib/rpm/find-requires fi $FINDREQ $* | sed -e '/libGL.so/d' Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-12/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 May 2009 12:28:33 -0000 1.3 +++ .cvsignore 4 May 2010 05:06:50 -0000 1.4 @@ -1 +1 @@ -ati-driver-installer-9-5-x86.x86_64.run +ati-driver-installer-10-4-x86.x86_64.run Index: catalyst-README.Fedora =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-12/catalyst-README.Fedora,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- catalyst-README.Fedora 6 May 2009 20:01:21 -0000 1.1 +++ catalyst-README.Fedora 4 May 2010 05:06:50 -0000 1.2 @@ -73,32 +73,10 @@ 5. Release-specific notes ----------------------------- -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 -as the plymouth graphical boot system will not function while the this driver is -installed. If you would like to use them, please uninstall this driver first. - -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.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-catalyst 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. - - -* Please note that in some cases, the initrd image may need to be regenerated -twice (once for getting fglrx to load, the other for putting the udev config -file into the initrd image). If your machine still does not have working DRI -or 3D rendering after regenerating the image once and rebooting, regenerate -the image again: - mkinitrd -f --allow-missing /boot/initrd-`uname -r`.img `uname -r` - -Reboot and DRI should be enabled correctly now. +As of Catalyst version 9.10, the fglrx kernel module is no longer incompatible +with the open-source Radeon Xorg driver. The initrd image regeneration +workaround is therefore no longer required. However, during testing some +systems failed to poweroff properly if kernel modesetting (KMS) was enabled. If +you are affected by this problem, you can disable modesetting by executing the +following command as root: + grubby --update-kernel=/boot/vmlinuz-`uname -r` --args=nomodeset Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-12/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 May 2009 20:01:21 -0000 1.2 +++ sources 4 May 2010 05:06:50 -0000 1.3 @@ -1 +1 @@ -bdedd0405021f31000cca3399d5f7336 ati-driver-installer-9-4-x86.x86_64.run +f164488b9db552e06f7cb1c8246808be ati-driver-installer-10-4-x86.x86_64.run Index: xorg-x11-drv-catalyst.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-12/xorg-x11-drv-catalyst.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xorg-x11-drv-catalyst.spec 6 May 2009 20:01:21 -0000 1.1 +++ xorg-x11-drv-catalyst.spec 4 May 2010 05:06:50 -0000 1.2 @@ -7,13 +7,13 @@ %endif Name: xorg-x11-drv-catalyst -Version: 9.4 -Release: 4%{?dist} +Version: 10.4 +Release: 1%{?dist} Summary: AMD's proprietary driver for ATI graphic cards Group: User Interface/X Hardware Support 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: catalyst-README.Fedora Source3: catalyst-config-display Source4: catalyst-init @@ -24,7 +24,12 @@ Source9: catalyst-a-lid-aticonfig Source10: catalyst.sh Source11: catalyst.csh -Source13: blacklist-radeon.conf +# So we don't mess with mesa provides. +Source91: filter-requires.sh +Source92: filter-provides.sh +%define _use_internal_dependency_generator 0 +%define __find_requires %{SOURCE91} +%define __find_provides %{SOURCE92} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,6 +41,8 @@ Requires: catalyst-kmod >= %{version} +# It seems rpaths were introduced into the amdcccle/amdnotifyui binary in 9.12 +BuildRequires: chrpath # Needed in all nvidia or fglrx driver packages BuildRequires: desktop-file-utils Requires: livna-config-display >= 0.0.23 @@ -111,11 +118,11 @@ mkdir fglrxpkg %ifarch %{ix86} -cp -r fglrx/common/* fglrx/x740/* fglrx/arch/x86/* fglrxpkg/ +cp -r fglrx/common/* fglrx/x750/* fglrx/arch/x86/* fglrxpkg/ %endif %ifarch x86_64 -cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/ +cp -r fglrx/common/* fglrx/x750_64a/* fglrx/arch/x86_64/* fglrxpkg/ %endif # fix doc perms & copy README.Fedora @@ -129,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT ./__doc set +x -for file in $(cd fglrxpkg &> /dev/null; find . -type f | grep -v -e 'amdcccle.kdelnk$' -e 'amdcccle.desktop$' -e 'lib/modules/fglrx$' -e 'fireglcontrolpanel$' -e '/usr/share/doc/fglrx/' -e 'fglrx_panel_sources.tgz$' -e 'amdcccle.*.desktop$' -e 'amdcccle.*.kdelnk' -e 'fglrx_sample_source.tgz$' -e '^./lib/modules/fglrx' -e '/usr/share/icons/ccc_') +for file in $(cd fglrxpkg &> /dev/null; find . -type f | grep -v -e 'amdcccle.kdelnk$' -e 'amdcccle.desktop$' -e 'lib/modules/fglrx$' -e 'fireglcontrolpanel$' -e '/usr/share/doc/fglrx/' -e 'fglrx_panel_sources.tgz$' -e 'amdcccle.*.desktop$' -e 'amdcccle.*.kdelnk' -e 'fglrx_sample_source.tgz$' -e '^./lib/modules/fglrx' -e '/usr/share/icons/ccc_' -e '^./usr/share/ati/lib') do if [[ ! "/${file##}" = "/${file}" ]] then @@ -181,6 +188,9 @@ elif [[ ! "/${file##./usr/share/ati/amdcccle}" = "/${file}" ]] then install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/${file} + elif [[ ! "/${file##./usr/share/doc/amdcccle}" = "/${file}" ]] + then + install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/${file} else echo ${file} found -- don\'t know how to handle exit 1 @@ -203,7 +213,6 @@ install -D -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/catalyst.sh install -D -p -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/catalyst.csh -install -D -p -m 0644 fglrxpkg/usr/share/icons/ccc_small.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/ccc_small.xpm install -D -p -m 0644 fglrxpkg/usr/share/icons/ccc_large.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/ccc_large.xpm install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}/%(basename %{SOURCE3}) install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/catalyst @@ -228,9 +237,9 @@ chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh -# blacklist to prevent radeon autoloading -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d -install -pm 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/blacklist-radeon.conf +# Remove rpaths (see comment on chrpath BR above) +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/amdcccle +chrpath --delete $RPM_BUILD_ROOT%{_sbindir}/amdnotifyui %clean rm -rf $RPM_BUILD_ROOT @@ -263,6 +272,7 @@ %defattr(-,root,root,-) %doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora %dir %{_sysconfdir}/ati/ +%doc %{_docdir}/amdcccle/ccc_copyrights.txt %{_sysconfdir}/ati/atiogl.xml %{_sysconfdir}/ati/logo.xbm.example %{_sysconfdir}/ati/logo_mask.xbm.example @@ -274,7 +284,6 @@ %config %{_sysconfdir}/acpi/actions/ati-powermode.sh %config(noreplace) %{_sysconfdir}/acpi/events/*aticonfig.conf %config(noreplace) %{_sysconfdir}/profile.d/catalyst.* -%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-radeon.conf %{_initrddir}/* %{_sbindir}/* %{_bindir}/* @@ -300,11 +309,12 @@ %defattr(-,root,root,-) %doc fglrxpkg/usr/src/ati/fglrx_sample_source.tgz %{atilibdir}/*.a -%{_libdir}/xorg/modules/*.a -%{_includedir}/fglrx/GL/ -%{_includedir}/fglrx/X11/extensions/*.h +%{_includedir}/fglrx/ %changelog +* Sat May 1 2010 Stewart Adam <s.adam at diffingo.com> - 10.4-1 +- Update to Catalyst 10.4 (internal version 8.72.3) + * Sun May 3 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-4 - Make the ExclusiveArch dynamic - Fix requirement on libs subpackage --- blacklist-radeon.conf DELETED --- --- dead.package DELETED ---