rpms/xorg-x11-drv-fglrx/F-9 fglrx-README.Fedora, 1.1, 1.2 fglrx-config-display, 1.2, 1.3 xorg-x11-drv-fglrx.spec, 1.10, 1.11

[Stewart Adam]

Author: firewing

Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23030/F-9

Modified Files:
	fglrx-README.Fedora fglrx-config-display 
	xorg-x11-drv-fglrx.spec 
Log Message:
* Sun Dec 28 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-4.8.12
- Move fglrx_dri.so to monolib package
- Static blacklist required for <R600 hardware, add it back
- Make fglrx-config-display check the ldfile to see if it's already enabled



Index: fglrx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/fglrx-README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fglrx-README.Fedora	16 Oct 2008 16:20:01 -0000	1.1
+++ fglrx-README.Fedora	30 Dec 2008 22:41:05 -0000	1.2
@@ -1,7 +1,8 @@
-README for AMD's Linux fglrx drivers, as packaged by livna.org.
+README for AMD's Linux fglrx drivers, as packaged by rpmfusion.org.
+
 
 1. After Installation
----------------------
+-----------------------------
 
 The easiest way to start using the fglrx drivers after installation is to
 restart your system.
@@ -44,8 +45,9 @@
     fglrx-config-display disable
 Note: DRI will be disabled in this case when the fglrx kernel-module was
 loaded. It will be enabled again on the next system restart.
-To re-enable the fglrx drivers, run:
-        fglrx-config-display enable
+To re-enable the fglrx drivers without a reboot, run:
+    fglrx-config-display enable
+
 
 
 3. Additional configuration
@@ -54,14 +56,16 @@
 For configuration options (TwinView, TV-out etc) see
 /usr/share/doc/fglrx-*/index.html
 
+
 4. Kernel Module
-----------------------
+-----------------------------
+
+The fglrx kernel module is required for DRI. For Fedora kernels you will find
+RPMs with the name:
+    kmod-fglrx-$(uname -r)-(ati-version)-fc(releasever).(arch).rpm
+    (e.g. kmod-fglrx-2.6.27.7-134.fc10.x86_64-8.561-1.8.12.fc10.x86_64)
+at rpmfusion.org. If you use another kernel, grab the proper SRPM:
+    (e.g fglrx-kmod-8.561-2.8.12.fc10.src.rpm)
+from rpmfusion.org and rebuild the kernel module with the following command:
+    rpmbuild --rebuild /path/to/fglrx-srpm.src.rpm
 
-The fglrx kernel module is required for DRI. For Fedora kernels you will
-find RPMs with the name:
-    kmod-fglrx-$(uname -r)-(ati-version)-(livna-release-tag).(arch).rpm
-    (e.g. kmod-fglrx-8.34.8-1.2.6.20_1.2933.fc6.i686.rpm)
-at rpm.livna.org. If you use another kernel grab the proper SRPM
-    (e.g fglrx-kmod-8.34.8-4.2.6.20_1.2962.fc7.src.rpm)
-from rpm.livna.org and rebuild the kernel module with the following command:
-    rpmbuild --rebuild /path/to/fglrxRPM.src.rpm


Index: fglrx-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/fglrx-config-display,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fglrx-config-display	26 Dec 2008 03:39:46 -0000	1.2
+++ fglrx-config-display	30 Dec 2008 22:41:05 -0000	1.3
@@ -55,7 +55,7 @@
         # Backup the file before make any change.
         currentDriver = self.getDriver()
         # Already enabled?
-        if currentDriver == self.majorVendor:
+        if os.path.exists(self.ldconf):
             print _('Driver already enabled.')
             return
         
@@ -101,16 +101,13 @@
             Utils.writeFile(self.ldconf,"/usr/lib/fglrx\n")
         print _('Running ldconfig, this could take some time...')
         Utils.runLdconfig()
-        # Haven't heard of this in a while either.
-        #if not self.checkForModuleAndRemove("radeon") or not self.checkForModuleAndRemove("drm"):
-        #    print WARNING_DRI_NOT_AVAILABLE
         Utils.writeXorgConf(self.xconfig, self.xconfigpath)
         self.restoreconf()
 
     def disable(self, isAutoConfigure=True):
         self.removeModulePath("/extensions/fglrx", self.TOP_MOD_DIR)
         # Check if it's already disabled
-        if self.getDriver() != self.majorVendor:
+        if not os.path.exists(self.ldconf):
             print _('Driver already disabled.')
             return
         # We have to save the status file so it can be restored later


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-fglrx.spec	26 Dec 2008 03:39:46 -0000	1.10
+++ xorg-x11-drv-fglrx.spec	30 Dec 2008 22:41:05 -0000	1.11
@@ -9,7 +9,7 @@
 
 Name:            xorg-x11-drv-fglrx
 Version:         8.561
-Release:         2.%{ativersion}%{?dist}
+Release:         3.%{ativersion}%{?dist}
 Summary:         AMD's proprietary driver for ATI graphic cards
 Group:           User Interface/X Hardware Support
 License:         BSD/Commercial/GPL/QPL
@@ -227,6 +227,10 @@
 chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
 chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh
 
+# dri workaround
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
+ln -s ../lib64/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -269,7 +273,7 @@
 %config %{_sysconfdir}/ati/control
 %config %{_sysconfdir}/ati/amdpcsdb.default
 %config(noreplace) %{_sysconfdir}/acpi/events/*aticonfig.conf
-%config(noreplace)%{_sysconfdir}/profile.d/fglrx.*
+%config(noreplace) %{_sysconfdir}/profile.d/fglrx.*
 %{_initrddir}/*
 %{_sbindir}/*
 %{_bindir}/*
@@ -283,6 +287,10 @@
 %{_mandir}/man[1-9]/atieventsd.*
 %{_libdir}/xorg/modules/extensions/fglrx/
 %{_libdir}/xorg/modules/*.so
+%{_libdir}/dri/
+%ifarch x86_64
+%{_prefix}/lib/dri/
+%endif
 
 %files libs
 %defattr(-,root,root,-)
@@ -290,7 +298,6 @@
 %{atilibdir}/*.so*
 # FIXME: This file is recognized as "data" - figure out how to move it later
 %{atilibdir}/libAMDXvBA.cap
-%{_libdir}/dri/
 
 %files devel
 %defattr(-,root,root,-)
@@ -301,6 +308,10 @@
 %{_includedir}/X11/extensions/*.h
 
 %changelog
+* Sun Dec 28 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-3.8.12
+- Move fglrx_dri.so to monolib package
+- Make fglrx-config-display check the ldfile to see if it's already enabled
+
 * 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