rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Wed Apr 2 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-16.20080401

Browse Source 
- Fix crash when DRI2 fails to initialize and crash when initializing
  software GL visuals (#440175).
This commit is contained in:
Kristian Høgsberg 2008-04-02 16:56:31 +00:00
parent 0c86ea808c
commit 1f8c132f14
3 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xorg-x11-server.spec
View File

@ -20,7 +20,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.4.99.901
Release: 15.%{gitdate}%{?dist}
Release: 16.%{gitdate}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@ -66,6 +66,8 @@ Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch
Patch5008: xserver-1.5.0-xaa-sucks.patch
Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
Patch5011: xserver-1.5.0-fix-lsl-quirk.patch
Patch5012: xserver-1.5.0-fix-dri2-crash-on-fail.patch
Patch5013: xserver-1.5.0-unbreak-dri2-glcore-visuals.patch
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
@ -514,6 +516,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Apr 2 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-16.20080401
- Fix crash when DRI2 fails to initialize and crash when initializing
software GL visuals (#440175).
* Tue Apr 1 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-15.20080401
- Rebase to new snapshot to pull in DRI2 direct rendering work.
- Stop shipping librecord.so.

25
xserver-1.5.0-fix-dri2-crash-on-fail.patch Normal file
View File

@ -0,0 +1,25 @@
From 7d97c19c2d530c8db16b01de9b168dd910059b4e Mon Sep 17 00:00:00 2001
From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed, 2 Apr 2008 16:29:30 +1000
Subject: [PATCH] dri2: fix crasher if DRI2Connect fails
---
hw/xfree86/dri2/dri2ext.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index ca2e029..d1d52a4 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -114,7 +114,7 @@ ProcDRI2Connect(ClientPtr client)
ScreenPtr pScreen;
int fd;
const char *driverName;
- char *busId;
+ char *busId = NULL;
unsigned int sareaHandle;
REQUEST_SIZE_MATCH(xDRI2ConnectReq);
--
1.5.4.5

37
xserver-1.5.0-unbreak-dri2-glcore-visuals.patch Normal file
View File

@ -0,0 +1,37 @@
From b13ab156894074fb38cc812738bc7aeeebd9614d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Wed, 2 Apr 2008 12:38:36 -0400
Subject: [PATCH] dri2: Unbreak glcore visual setup.
---
GL/glx/glxglcore.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c
index bbfa02b..972ab88 100644
--- a/GL/glx/glxglcore.c
+++ b/GL/glx/glxglcore.c
@@ -308,10 +308,9 @@ static const int glx_visual_types[] = {
static __GLXconfig *
createFBConfigsForVisual(__GLXscreen *screen, ScreenPtr pScreen,
- VisualPtr visual, __GLXconfig *tail)
+ VisualPtr visual, __GLXconfig *config)
{
int back, depth, stencil;
- __GLXconfig *config;
/* FIXME: Ok, I'm making all this up... anybody has a better idea? */
@@ -347,7 +346,7 @@ createFBConfigsForVisual(__GLXscreen *screen, ScreenPtr pScreen,
config->indexBits = config->colorIndexMode ? visual->nplanes : 0;
}
- return tail;
+ return config;
}
static void
--
1.5.4.5