Author: firewing Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv30474/F-9 Modified Files: fglrx-config-display xorg-x11-drv-fglrx.spec Log Message: * Thu Dec 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-3.8.12 - Remove blacklist, generate via fglrx-config-display instead - Add extra bits to create Screen section in xorg.conf Index: fglrx-config-display =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/fglrx-config-display,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fglrx-config-display 16 Oct 2008 16:20:01 -0000 1.1 +++ fglrx-config-display 26 Dec 2008 03:39:46 -0000 1.2 @@ -58,6 +58,27 @@ if currentDriver == self.majorVendor: print _('Driver already enabled.') return + + # Annoying bit because newer fglrx drivers require a Screen section + if len(self.xconfig.layout) == 0: # no layouts + layout = xf86config.XF86ConfLayout() + self.xconfig.layout.insert(layout) + layout.identifier = "Default Layout" + else: + layout = self.xconfig.layout[0] + if len(layout.adjacencies) == 0: # no layout adjacencies + layout.adjacencies.insert(xf86config.XF86ConfAdjacency()) + layout.adjacencies[0].screen = "Screen0" + if len(self.xconfig.screen) == 0: # no screens + screen = xf86config.XF86ConfScreen() + self.xconfig.screen.insert(screen) + else: + screen = self.xconfig.screen[0] + screen.device = "Videocard0" + screen.defaultdepth = 24 + screen.identifier = "Screen0" + self.xconfig.device[0].identifier = 'Videocard0' + # fglrx modules self.addModulePath("/extensions/fglrx", self.TOP_MOD_DIR) # 'remembering' magic's in here. @@ -84,10 +105,6 @@ #if not self.checkForModuleAndRemove("radeon") or not self.checkForModuleAndRemove("drm"): # print WARNING_DRI_NOT_AVAILABLE Utils.writeXorgConf(self.xconfig, self.xconfigpath) - # 20071023: AIGLX now supported by fglrx 8.42.3! - ## Disable AIGLX by default, it's not compatible - #self.setComposite(False) - #self.setAiglxFlag(False) self.restoreconf() def disable(self, isAutoConfigure=True): Index: xorg-x11-drv-fglrx.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/xorg-x11-drv-fglrx.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-drv-fglrx.spec 16 Dec 2008 17:43:43 -0000 1.9 +++ xorg-x11-drv-fglrx.spec 26 Dec 2008 03:39:46 -0000 1.10 @@ -9,7 +9,7 @@ Name: xorg-x11-drv-fglrx Version: 8.561 -Release: 1.%{ativersion}%{?dist} +Release: 2.%{ativersion}%{?dist} Summary: AMD's proprietary driver for ATI graphic cards Group: User Interface/X Hardware Support License: BSD/Commercial/GPL/QPL @@ -301,6 +301,9 @@ %{_includedir}/X11/extensions/*.h %changelog +* Thu Dec 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-2.8.12 +- Add extra bits to create Screen section in xorg.conf + * Tue Dec 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12 - Update to 8.12 - Add Conflicts: for new nvidia packages