rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.902-chipset_revision.patch, NONE, 1.1 openchrome-0.2.902-report_version.patch, NONE, 1.1 xorg-x11-drv-openchrome.spec, 1.20, 1.21

[Xavier Bachelot (xavierb)]

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19050

Modified Files:
	xorg-x11-drv-openchrome.spec 
Added Files:
	openchrome-0.2.902-chipset_revision.patch 
	openchrome-0.2.902-report_version.patch 
Log Message:
properly report driver version and chipset revision

openchrome-0.2.902-chipset_revision.patch:

--- NEW FILE openchrome-0.2.902-chipset_revision.patch ---
Index: /trunk/src/via_driver.c
===================================================================
--- /trunk/src/via_driver.c (revision 565)
+++ /trunk/src/via_driver.c (revision 566)
@@ -1066,5 +1066,5 @@
         struct pci_device *bridge = via_host_bridge();
 
-        pci_device_cfg_read_u32(bridge, &pVia->ChipRev, 0xF6);
+        pci_device_cfg_read_u8(bridge, &pVia->ChipRev, 0xF6);
 #else
         pVia->ChipRev = pciReadByte(pciTag(0, 0, 0), 0xF6);

openchrome-0.2.902-report_version.patch:

--- NEW FILE openchrome-0.2.902-report_version.patch ---
Index: /trunk/src/via_driver.c
===================================================================
--- /trunk/src/via_driver.c (revision 557)
+++ /trunk/src/via_driver.c (revision 565)
@@ -601,4 +601,7 @@
         xf86Msg(X_NOTICE,
                 "For support, please refer to http://www.openchrome.org/.\n");
+#ifdef BUILDCOMMENT
+        xf86Msg(X_NOTICE, BUILDCOMMENT"\n");
+#endif
     }
     return scrn != NULL;


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-drv-openchrome.spec	9 Apr 2008 20:26:19 -0000	1.20
+++ xorg-x11-drv-openchrome.spec	16 Apr 2008 21:45:05 -0000	1.21
@@ -9,7 +9,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.902
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -19,6 +19,8 @@
 Source1:	openchrome.xinf
 
 Patch1:         openchrome-0.2.902-re_enable_AGPDMA.patch
+Patch2:         openchrome-0.2.902-report_version.patch
+Patch3:         openchrome-0.2.902-chipset_revision.patch
 
 ExclusiveArch:	%{ix86} x86_64
 
@@ -56,6 +58,8 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch1 -p0 -b .agpdma
+%patch2 -p0 -b .version
+%patch3 -p0 -b .chiprev
 
 %build
 %configure --disable-static --enable-dri
@@ -103,6 +107,10 @@
 
 
 %changelog
+* Sun Apr 13 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-2
+- Add patch to properly report driver version in the libpciaccess code path.
+- Add patch to properly report chipset revision in the libpciaccess code path.
+
 * Wed Apr 09 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.902-1
 - New upstream release.
 - Re-enable AGPDMA for K8M800 and VM800, as the drm bug is fixed in kernel