rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=2

Browse Source
This commit is contained in:
OBS User unknown 2007-01-18 00:35:28 +00:00 committed by Git OBS Bridge
parent ca278f335f
commit 97da78485e
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mesa.changes
View File

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

7
Mesa.spec
View File

@ -19,7 +19,7 @@ Provides: xorg-x11-Mesa
Obsoletes: xorg-x11-Mesa
Autoreqprov: on
Version: 6.5.2
Release: 11
Release: 13
Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.*
Source: Mesa-%{version}.tar.bz2
Source3: README.updates
@ -29,6 +29,7 @@ Source6: via.sh
Patch0: disable-sis_dri.diff
Patch1: dri_driver_dir.diff
Patch2: i915-crossbar.diff
Patch3: bug-211314_mesa-context.diff
Patch5: static.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -112,6 +113,7 @@ rm -rf src/glw/
%patch0
%patch1
%patch2
%patch3
%patch5
%build
@ -222,6 +224,9 @@ rm -rf $RPM_BUILD_ROOT
/usr/%{_lib}/libMesaGL.a
%changelog -n Mesa
* Wed Jan 17 2007 - sndirsch@suse.de
- bug-211314_mesa-context.diff:
* fixes Xserver crash in software rendering fallback (Bug #211314)
* Tue Jan 09 2007 - sndirsch@suse.de
- disabled build of sis DRI driver on i64 to fix build
* Sat Dec 02 2006 - sndirsch@suse.de

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);
+ }
}