Author: firewing Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv28076 Modified Files: catalyst-config-display xorg-x11-drv-catalyst.spec Log Message: * Wed Dec 29 2010 Stewart Adam <s.adam at diffingo.com> - 10.12-2 - Fix semantic errors in catalyst-config-display that caused tracebacks on F-14 - Remove VideoOverlay from xorg.conf as it is no longer used by the driver Index: catalyst-config-display =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/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 29 Dec 2010 05:45:59 -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: xorg-x11-drv-catalyst.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/xorg-x11-drv-catalyst.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xorg-x11-drv-catalyst.spec 26 Dec 2010 21:42:07 -0000 1.2 +++ xorg-x11-drv-catalyst.spec 29 Dec 2010 05:46:00 -0000 1.3 @@ -8,7 +8,7 @@ Name: xorg-x11-drv-catalyst Version: 10.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: AMD's proprietary driver for ATI graphic cards Group: User Interface/X Hardware Support License: Redistributable, no modification permitted @@ -329,6 +329,10 @@ %{_includedir}/fglrx/ %changelog +* Wed Dec 29 2010 Stewart Adam <s.adam at diffingo.com> - 10.12-2 +- Fix semantic errors in catalyst-config-display that caused tracebacks on F-14 +- Remove VideoOverlay from xorg.conf as it is no longer used by the driver + * Sun Dec 26 2010 Stewart Adam <s.adam at diffingo.com> - 10.12-1 - Update to Catalyst 10.12 (internal version 8.80.1) - Merge changes from F-13 branch