Author: firewing Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv20378/F-13 Modified Files: .cvsignore catalyst-config-display sources xorg-x11-drv-catalyst.spec 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) Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-13/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 26 Dec 2010 21:56:04 -0000 1.9 +++ .cvsignore 2 May 2011 07:45:27 -0000 1.10 @@ -1 +1 @@ -ati-driver-installer-10-12-x86.x86_64.run +ati-driver-installer-11-4-x86.x86_64.run Index: catalyst-config-display =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-13/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:45:27 -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/F-13/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Dec 2010 21:56:04 -0000 1.8 +++ sources 2 May 2011 07:45:27 -0000 1.9 @@ -1 +1 @@ -debf1518bd58c49b49aafddbae60b748 ati-driver-installer-10-12-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/F-13/xorg-x11-drv-catalyst.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xorg-x11-drv-catalyst.spec 26 Dec 2010 21:56:04 -0000 1.7 +++ xorg-x11-drv-catalyst.spec 2 May 2011 07:45:27 -0000 1.8 @@ -7,13 +7,13 @@ %endif Name: xorg-x11-drv-catalyst -Version: 10.12 +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 @@ -125,11 +125,11 @@ mkdir fglrxpkg %ifarch %{ix86} -cp -r fglrx/common/* fglrx/x750/* fglrx/arch/x86/* fglrxpkg/ +cp -r fglrx/common/* fglrx/xpic/* fglrx/arch/x86/* fglrxpkg/ %endif %ifarch x86_64 -cp -r fglrx/common/* fglrx/x750_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 @@ -210,11 +210,12 @@ # 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 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 @@ -276,7 +277,7 @@ /sbin/chkconfig --del catalyst /sbin/chkconfig --del atieventsd if [ -x /sbin/grubby ] ; then - # leave rdblacklist here in case they installed with v10.7, which blacklisted radeon upon installation + # 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 @@ -329,6 +330,9 @@ %{_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) + * Sun Dec 26 2010 Stewart Adam <s.adam at diffingo.com> - 10.12-1 - Update to Catalyst 10.12 (internal version 8.80.1)