rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=8

Browse Source
This commit is contained in:
OBS User unknown 2007-01-18 00:48:45 +00:00 committed by Git OBS Bridge
parent b023bd93af
commit 758c43a790
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bug-211314_mesa-context.diff Normal file
View File

@ -0,0 +1,27 @@
--- src/mesa/drivers/x11/xm_api.c.orig 2006-11-30 20:45:42.000000000 +0100
+++ src/mesa/drivers/x11/xm_api.c 2006-11-30 20:47:12.000000000 +0100
@@ -2101,7 +2101,11 @@ static void FXgetImage( XMesaBuffer b )
static unsigned short pixbuf[MAX_WIDTH];
GLuint x, y;
GLuint width, height;
- XMesaContext xmesa = XMESA_CONTEXT(ctx);
+ XMesaContext xmesa;
+
+ if (! ctx)
+ return;
+ xmesa = XMESA_CONTEXT(ctx);
#ifdef XFree86Server
x = b->frontxrb->pixmap->x;
@@ -2535,7 +2539,9 @@ void
XMesaResizeBuffers( XMesaBuffer b )
{
GET_CURRENT_CONTEXT(ctx);
- XMesaContext xmctx = XMESA_CONTEXT(ctx);
- xmesa_check_and_update_buffer_size(xmctx, b);
+ if (ctx) {
+ XMesaContext xmctx = XMESA_CONTEXT(ctx);
+ xmesa_check_and_update_buffer_size(xmctx, b);
+ }
}

6
xorg-x11-server.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 17 20:21:04 CET 2007 - sndirsch@suse.de
- bug-211314_mesa-context.diff:
* fixes Xserver crash in software rendering fallback (Bug #211314)
-------------------------------------------------------------------
Tue Jan 16 22:50:02 CET 2007 - sndirsch@suse.de

9
xorg-x11-server.spec
View File

@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel
URL: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.2
Release: 43
Release: 44
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -83,6 +83,7 @@ Patch40: 0018-vnc-support.txt.diff
%endif
Patch41: loadmod-bug197195.diff
Patch42: bug227111-ddc_screensize.diff
Patch43: bug-211314_mesa-context.diff
Patch334: p_pci-domain.diff
Patch357: p_pci-ce-x.diff
@ -177,6 +178,9 @@ popd
%endif
%patch41 -p1
%patch42 -p1
pushd ../Mesa
%patch43 -p0
popd
%build
autoreconf -fi
@ -500,6 +504,9 @@ exit 0
%endif
%changelog -n xorg-x11-server
* Wed Jan 17 2007 - sndirsch@suse.de
- bug-211314_mesa-context.diff:
* fixes Xserver crash in software rendering fallback (Bug #211314)
* Tue Jan 16 2007 - sndirsch@suse.de
- 0018-vnc-support.txt.diff
* fixed unresolved symbols vncRandomBytes/deskey in VNC module