rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.901-old_memory_detection.patch, NONE, 1.1 xorg-x11-drv-openchrome.spec, 1.15, 1.16

Xavier Bachelot (xavierb) fedora-extras-commits at redhat.com
Sun Mar 9 18:06:36 UTC 2008


Author: xavierb

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

Modified Files:
	xorg-x11-drv-openchrome.spec 
Added Files:
	openchrome-0.2.901-old_memory_detection.patch 
Log Message:
- Temporarily revert to old memory detection method. We need something that
  works out of the box for F9 Beta.


openchrome-0.2.901-old_memory_detection.patch:

--- NEW FILE openchrome-0.2.901-old_memory_detection.patch ---
--- src/via_driver.c (revision 537)
+++ src/via_driver.c (revision 539)
@@ -1544,6 +1544,6 @@
 #else
             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ;
+#endif
             break;
-#endif
         case VIA_PM800:
         case VIA_VM800:
@@ -1554,6 +1554,6 @@
 #else
             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ;
+#endif
             break;
-#endif
         case VIA_K8M890:
         case VIA_P4M900:
@@ -1564,6 +1564,6 @@
 #else
             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ;
+#endif
             break;
-#endif
         default:
             if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) {


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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-openchrome.spec	8 Mar 2008 20:36:47 -0000	1.15
+++ xorg-x11-drv-openchrome.spec	9 Mar 2008 18:06:00 -0000	1.16
@@ -9,7 +9,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.901
-Release:	12%{?dist}
+Release:	13%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -22,6 +22,7 @@
 Patch2:         openchrome-0.2.901-replace_xf86memcpy.patch
 Patch3:         openchrome-0.2.901-P4M900_fifo_settings.patch
 Patch4:         openchrome-0.2.901-VM800_xv_LCD.patch
+Patch5:         openchrome-0.2.901-old_memory_detection.patch
 ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	pkgconfig
@@ -61,6 +62,7 @@
 %patch2 -p0 -b .xf86memcpy
 %patch3 -p0 -b .P4M900_fifo
 %patch4 -p0 -b .VM800_xv_LCD
+%patch5 -p0 -R -b .old_memory-detection
 
 %build
 autoreconf
@@ -109,6 +111,10 @@
 
 
 %changelog
+* Sun Mar 09 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-13
+- Temporarily revert to old memory detection method. We need something that
+  works out of the box for F9 Beta.
+
 * Sat Mar 08 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-12
 - Yet another revision of the libpciaccess patch.
 




More information about the fedora-extras-commits mailing list