rpms/xorg-x11-drv-openchrome/EL-5 openchrome-0.2.904-fix_dri_on_64_bits.patch, NONE, 1.1 xorg-x11-drv-openchrome.spec, 1.14, 1.15

[Xavier Bachelot]

Author: xavierb

Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29730/EL-5

Modified Files:
	xorg-x11-drv-openchrome.spec 
Added Files:
	openchrome-0.2.904-fix_dri_on_64_bits.patch 
Log Message:
fix for dri regression on 64 bits

openchrome-0.2.904-fix_dri_on_64_bits.patch:
 ChangeLog     |    6 ++++++
 src/via_dri.c |    4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE openchrome-0.2.904-fix_dri_on_64_bits.patch ---
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 853)
+++ ChangeLog	(revision 854)
@@ -1,3 +1,9 @@
+2010-06-09  Bartosz Kosiorek  <gang65 at poczta.onet.pl>
+
+	Fix freeze on 64bit system for K8M800 chipset
+
+	* src/via_dri.c: (VIADRIAgpInit):
+
 2010-05-04  Jon Nettleton <jon.nettleton at gmail.com>
 
 	Re-enable the Virtual Queue for the VX800/VX855 chipsets.
Index: src/via_dri.c
===================================================================
--- src/via_dri.c	(revision 853)
+++ src/via_dri.c	(revision 854)
@@ -267,10 +267,6 @@ VIADRIAgpInit(ScreenPtr pScreen, VIAPtr pVia)
     pVIADRI = pDRIInfo->devPrivate;
     pVia->agpSize = 0;
 
-/* For AMD64 */
-#ifdef __x86_64__
-    return FALSE;
-#endif
 
     if (drmAgpAcquire(pVia->drmFD) < 0) {
         xf86DrvMsg(pScreen->myNum, X_ERROR, "[drm] drmAgpAcquire failed %d\n",


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/EL-5/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xorg-x11-drv-openchrome.spec	24 May 2010 22:23:43 -0000	1.14
+++ xorg-x11-drv-openchrome.spec	10 Jun 2010 22:54:23 -0000	1.15
@@ -10,7 +10,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.904
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -22,6 +22,8 @@ Source1:	openchrome.xinf
 # Patches from upstream trunk :
 # svn diff -x -p http://svn.openchrome.org/svn/tags/release_0_2_904 http://svn.openchrome.org/svn/trunk
 Patch0:         openchrome-0.2.904-latest_trunk.patch
+# svn diff -x -p -r853:854 http://svn.openchrome.org/svn/trunk
+patch1:         openchrome-0.2.904-fix_dri_on_64_bits.patch
 
 # EPEL specific patches :
 
@@ -63,6 +65,8 @@ X.Org X11 openchrome video driver XvMC d
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch0 -p0
+%patch1 -p0
+
 %patch13 -p0
 %patch20 -p1
 
@@ -115,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 10 2010 Xavier Bachelot <xavier at bachelot.org> - 0.2.904-3
+- Add upstream fix for a regression with DRI on 64 bits.
+- Clean up spec indentation.
+
 * Sat May 08 2010 Xavier Bachelot <xavier at bachelot.org> - 0.2.904-2
 - Sync with trunk (r853) and drop patches accordingly.
 - Fix TV out flickering regression.