rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.904-fix_dri_on_64_bits.patch, NONE, 1.1 xorg-x11-drv-openchrome.spec, 1.58, 1.59

[Xavier Bachelot]

Author: xavierb

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

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/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- xorg-x11-drv-openchrome.spec	24 May 2010 21:22:12 -0000	1.58
+++ xorg-x11-drv-openchrome.spec	10 Jun 2010 22:46:30 -0000	1.59
@@ -1,48 +1,50 @@
 %define tarball xf86-video-openchrome
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
-%define driverdir	%{moduledir}/drivers
+%define driverdir %{moduledir}/drivers
 
 %define cvsdate xxxxxxx
 
 %define with_xvmc 1
 %define with_debug 0
 
-Summary:	Xorg X11 openchrome video driver
-Name:		xorg-x11-drv-openchrome
-Version:	0.2.904
-Release:        6%{?dist}
-URL:		http://www.openchrome.org
-License:	MIT
-Group:		User Interface/X Hardware Support
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:        Xorg X11 openchrome video driver
+Name:           xorg-x11-drv-openchrome
+Version:        0.2.904
+Release:        7%{?dist}
+URL:            http://www.openchrome.org
+License:        MIT
+Group:          User Interface/X Hardware Support
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	http://www.openchrome.org/releases/%{tarball}-%{version}.tar.bz2
-Source1:	openchrome.xinf
+Source0:        http://www.openchrome.org/releases/%{tarball}-%{version}.tar.bz2
+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
 
 # Fedora specific patches :
 
 # Experimental patches (branch backport, etc...): 
-Patch13:         openchrome-0.2.904-fix_tvout_flickering.patch
+Patch13:        openchrome-0.2.904-fix_tvout_flickering.patch
 Patch20:        openchrome-0.2.904-I420_Xv_surface_for_CME.patch
 
-ExclusiveArch:	%{ix86} x86_64
+ExclusiveArch:  %{ix86} x86_64
 
-BuildRequires:	xorg-x11-server-devel
-BuildRequires:	libX11-devel
-BuildRequires:	libXext-devel
-BuildRequires:	mesa-libGL-devel
+BuildRequires:  xorg-x11-server-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXext-devel
+BuildRequires:  mesa-libGL-devel
 %if %{with_xvmc}
-BuildRequires:	libXvMC-devel
+BuildRequires:  libXvMC-devel
 %endif
-BuildRequires:	libdrm-devel >= 2.0-1
-Requires:	xorg-x11-server-Xorg
+BuildRequires:  libdrm-devel >= 2.0-1
+Requires:       xorg-x11-server-Xorg
 
-Obsoletes:  xorg-x11-drv-via <= 0.2.2-4
-Provides:   xorg-x11-drv-via = 0.2.2-5
+Obsoletes:      xorg-x11-drv-via <= 0.2.2-4
+Provides:       xorg-x11-drv-via = 0.2.2-5
 
 
 %description 
@@ -51,11 +53,11 @@ X.Org X11 openchrome video driver.
 
 %if %{with_xvmc}
 %package devel
-Summary:	Xorg X11 openchrome video driver XvMC development package
-Group:		Development/System
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	xorg-x11-drv-via-devel <= 0.2.2-4
-Provides:	xorg-x11-drv-via-devel = 0.2.2-5
+Summary:        Xorg X11 openchrome video driver XvMC development package
+Group:          Development/System
+Requires:       %{name} = %{version}-%{release}
+Obsoletes:      xorg-x11-drv-via-devel <= 0.2.2-4
+Provides:       xorg-x11-drv-via-devel = 0.2.2-5
 
 %description devel
 X.Org X11 openchrome video driver XvMC development package.
@@ -65,6 +67,8 @@ X.Org X11 openchrome video driver XvMC d
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch0 -p0
+%patch1 -p0
+
 %patch13 -p0
 %patch20 -p1
 
@@ -123,10 +127,13 @@ fi
 
 
 %changelog
+* Thu Jun 10 2010 Xavier Bachelot <xavier at bachelot.org> - 0.2.904-7
+- 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-6
 - Sync with trunk (r853) and drop patches accordingly.
 - Add Xv acceleration for I420 on CME engine.
-- Clean up spec indentation.
 
 * Sat Apr 03 2010 Xavier Bachelot <xavier at bachelot.org> - 0.2.904-5.1
 - Workaround broken libdrm 2.4.19 Cflags.