Author: firewing Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20485/devel Modified Files: .cvsignore catalyst-README.Fedora catalyst-config-display sources xorg-x11-drv-catalyst.spec Added Files: filter-provides.sh filter-requires.sh Removed Files: blacklist-radeon.conf dead.package Log Message: * Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11-4-1 - Update to Catalyst 11.4 (internal version 8.84.1) - Port changes from F-14 branch --- 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/devel/.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 2 May 2011 07:46:01 -0000 1.4 @@ -1 +1 @@ -ati-driver-installer-9-5-x86.x86_64.run +ati-driver-installer-11-4-x86.x86_64.run Index: catalyst-README.Fedora =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/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 2 May 2011 07:46:01 -0000 1.2 @@ -73,32 +73,22 @@ 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. +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 it was found that in some cases, kernel modesetting +may need to be disabled in order for the fglrx driver to function correctly. +Upon a fresh installation, the Catalyst driver will automatically add +radeon.modeset=0 to the default kernel's parameters in /etc/grub.conf. If you +are upgrading from a previous version of the Catalyst driver, you may have to +make this change manually by running as root: + GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel` + /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0' &>/dev/null + +The Catalyst driver will automatically undo this change upon uninstallation. +Should you want to keep kernel modesetting disabled after uninstallation, run +the same command above after uninstalling the Catalyst drivers and then reboot. -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. +For legacy reasons, the driver will also remove rdblacklist=radeon from the +kernel parameters upon uninstallation. Index: catalyst-config-display =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/catalyst-config-display,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- catalyst-config-display 6 May 2009 20:01:21 -0000 1.1 +++ catalyst-config-display 2 May 2011 07:46:01 -0000 1.2 @@ -16,9 +16,9 @@ # Copyright 2003, 2004 Peter Backlund # Copyright 2004 Thorsten Leemhuis # Copyright 2006, 2007 Van Assche Alphonse -# Copyright 2006-2009 Stewart Adam +# Copyright 2006-2010 Stewart Adam -# internal revision: 2.0 +# internal revision: 2.1 import os import sys @@ -82,8 +82,8 @@ if currentDriver != self.majorVendor: self.config.setOldDriver(currentDriver) self.toggleDriver(currentDriver, self.majorVendor) - self.addOption(self.majorVendor,"OpenGLOverlay" ,"off") - self.addOption(self.majorVendor,"VideoOverlay" ,"on") + self.addOption(self.majorVendor, "OpenGLOverlay", "off") + self.removeOption(self.majorVendor, "VideoOverlay") if self.xconfig.modules: for module in ["glx", "dri", "extmod"]: if self.onlyHasModule(module): @@ -97,7 +97,7 @@ x86_64Content = "/usr/lib/catalyst\n/usr/lib64/catalyst\n" Utils.writeFile(self.ldconf, x86_64Content) else: - Utils.writeFile(self.ldconf,"/usr/lib/catalyst\n") + Utils.writeFile(self.ldconf, "/usr/lib/catalyst\n") print _('Running ldconfig, this could take some time...') Utils.runLdconfig() Utils.writeXorgConf(self.xconfig, self.xconfigpath) @@ -121,8 +121,8 @@ print _('Using the \'radeon\' driver instead.') prevDriver = "radeon" self.config.setOldDriver("radeon") - self.removeOption(self.majorVendor,"OpenGLOverlay") - self.removeOption(self.majorVendor,"VideoOverlay") + self.removeOption(self.majorVendor, "OpenGLOverlay") + self.removeOption(self.majorVendor, "VideoOverlay") self.toggleDriver(self.majorVendor, prevDriver) # Let's give control back to the naitive DRI Utils.removeFile(self.ldconf) @@ -140,7 +140,7 @@ """Runs the appropriate autoconfiguation function""" # Check number of arguments # arg = action - if len(sys.argv) > 2: + if len(sys.argv) != 2: print _('Wrong number of arguments') self.printUsage() sys.exit(1) @@ -159,7 +159,7 @@ elif arg == "disable": if self.getActive(): self.disable() - except error, errMsg: + except Exception, errMsg: #raise # Uncomment me to show the real error print MSG_CONF_APPLY_ERROR try: Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/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 2 May 2011 07:46:01 -0000 1.3 @@ -1 +1 @@ -bdedd0405021f31000cca3399d5f7336 ati-driver-installer-9-4-x86.x86_64.run +b50dc05ef3428a9ee632b09eebeb4586 ati-driver-installer-11-4-x86.x86_64.run Index: xorg-x11-drv-catalyst.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/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 2 May 2011 07:46:01 -0000 1.2 @@ -7,13 +7,13 @@ %endif Name: xorg-x11-drv-catalyst -Version: 9.4 -Release: 4%{?dist} +Version: 11.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,11 +24,18 @@ 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) -%if 0%{?fedora} >= 11 +%if 0%{?fedora} > 11 || 0%{?rhel} > 5 +ExclusiveArch: i686 x86_64 +%else 0%{?fedora} == 11 ExclusiveArch: i586 x86_64 %else ExclusiveArch: i386 x86_64 @@ -36,10 +43,17 @@ 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 +%if 0%{?fedora} > 10 || 0%{?rhel} > 5 +Requires: %{name}-libs%{_isa} = %{version}-%{release} +%else Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release} +%endif + Requires(post): livna-config-display Requires(preun): livna-config-display Requires(post): chkconfig @@ -69,7 +83,7 @@ This package provides the most recent proprietary AMD display driver which allows for hardware accelerated rendering with ATI Mobility, FireGL and Desktop GPUs. Some of the Desktop and Mobility GPUs supported are the -Radeon HD 2000 series to the Radeon HD 4800 series. +Radeon HD 2xxx series to the Radeon HD 6xxx series. For the full product support list, please consult the release notes for release %{version}. @@ -111,11 +125,11 @@ mkdir fglrxpkg %ifarch %{ix86} -cp -r fglrx/common/* fglrx/x740/* fglrx/arch/x86/* fglrxpkg/ +cp -r fglrx/common/* fglrx/xpic/* 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/xpic_64a/* fglrx/arch/x86_64/* fglrxpkg/ %endif # fix doc perms & copy README.Fedora @@ -129,7 +143,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 +195,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 @@ -193,17 +210,17 @@ # if we want versioned libs, then we need to change this and the loop above # to install the libs as soname.so.%{version} -ln -s libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/libGL.so.1 +ln -s fglrx-libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/fglrx-libGL.so.1 ln -s libfglrx_gamma.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_gamma.so.1 ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_dm.so.1 -ln -s libfglrx_pp.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_pp.so.1 -ln -s libfglrx_tvout.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_tvout.so.1 +ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libAMDXvBA.so.1 +ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libXvBAW.so.1 +ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libatiuki.so.1 # profile.d files 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 +245,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 @@ -244,6 +261,10 @@ /sbin/chkconfig --add catalyst /sbin/chkconfig --add atieventsd /etc/init.d/catalyst start &>/dev/null + if [ -x /sbin/grubby ] ; then + GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel` + /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0' &>/dev/null + fi fi ||: %post libs -p /sbin/ldconfig @@ -255,6 +276,11 @@ /etc/init.d/catalyst stop &>/dev/null /sbin/chkconfig --del catalyst /sbin/chkconfig --del atieventsd + if [ -x /sbin/grubby ] ; then + # remove rdblacklist from boot params in case they installed with v10.7, which blacklisted radeon upon installation + GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel` + /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --remove-args='radeon.modeset=0 rdblacklist=radeon' &>/dev/null + fi fi ||: %postun libs -p /sbin/ldconfig @@ -263,6 +289,8 @@ %defattr(-,root,root,-) %doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora %dir %{_sysconfdir}/ati/ +%doc %{_docdir}/amdcccle/ccc_copyrights.txt +%config(noreplace) %{_sysconfdir}/security/console.apps/amdcccle-su %{_sysconfdir}/ati/atiogl.xml %{_sysconfdir}/ati/logo.xbm.example %{_sysconfdir}/ati/logo_mask.xbm.example @@ -274,7 +302,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}/* @@ -293,6 +320,7 @@ %defattr(-,root,root,-) %dir %{atilibdir} %{atilibdir}/*.so* +%{atilibdir}/fglrx/*libGL*.so* %{atilibdir}/libAMDXvBA.cap %{_libdir}/dri/ @@ -300,11 +328,15 @@ %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 +#%{_libdir}/xorg/modules/*.a +%{_includedir}/fglrx/ + %changelog +* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11-4-1 +- Update to Catalyst 11.4 (internal version 8.84.1) +- Port changes from F-14 branch + * 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 ---