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

* Tue Mar 13 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-2

Browse Source 
- xserver-1.2.99.901-xephyr-crash-at-exit.patch: Fix yet another GLX visual
  mess. (#231425)
This commit is contained in:
Adam Jackson 2007-03-13 20:21:25 +00:00
parent 18d7c50aa2
commit 1f7d5c80f2
2 changed files with 29 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

@ -9,7 +9,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.2.99.901 Version: 1.2.99.901
Release: 1%{?dist} Release: 2%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
@ -52,6 +52,7 @@ Patch2001: xserver-1.2.0-geode-mmx.patch
Patch2002: xserver-1.2.0-xephyr-keysym-madness.patch Patch2002: xserver-1.2.0-xephyr-keysym-madness.patch
Patch2003: xserver-1.2.0-vfprintf.patch Patch2003: xserver-1.2.0-vfprintf.patch
Patch2004: xserver-1.2.0-honor-displaysize.patch Patch2004: xserver-1.2.0-honor-displaysize.patch
Patch2005: xserver-1.2.99.901-xephyr-crash-at-exit.patch
%define moduledir %{_libdir}/xorg/modules %define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri %define drimoduledir %{_libdir}/dri
@ -272,6 +273,7 @@ Xserver source code needed to build VNC server (Xvnc)
%patch2002 -p1 -b .xephyr-keysym %patch2002 -p1 -b .xephyr-keysym
%patch2003 -p1 -b .vfprintf %patch2003 -p1 -b .vfprintf
%patch2004 -p1 -b .displaysize %patch2004 -p1 -b .displaysize
%patch2005 -p1 -b .xephyr-crash
%build %build
@ -559,6 +561,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Mar 13 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-2
- xserver-1.2.99.901-xephyr-crash-at-exit.patch: Fix yet another GLX visual
mess. (#231425)
* Mon Mar 05 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-1 * Mon Mar 05 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-1
- xserver 1.3 RC1. RANDR 1.2 hotness in the hizzouse. - xserver 1.3 RC1. RANDR 1.2 hotness in the hizzouse.
- xserver-1.2.0-honor-displaysize.patch: Honor the DisplaySize config - xserver-1.2.0-honor-displaysize.patch: Honor the DisplaySize config

22
xserver-1.2.99.901-xephyr-crash-at-exit.patch Normal file
View File

@ -0,0 +1,22 @@
--- xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c.jx 2007-03-07 14:15:25.000000000 -0500
+++ xorg-server-1.2.99.901/GL/mesa/X/xf86glx.c 2007-03-13 14:27:38.000000000 -0400
@@ -281,12 +281,14 @@
__GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
int i;
- for (i = 0; i < mesaScreen->num_vis; i++) {
- if (mesaScreen->xm_vis[i])
- XMesaDestroyVisual(mesaScreen->xm_vis[i]);
- }
+ if (mesaScreen->xm_vis) {
+ for (i = 0; i < mesaScreen->num_vis; i++) {
+ if (mesaScreen->xm_vis[i])
+ XMesaDestroyVisual(mesaScreen->xm_vis[i]);
+ }
- xfree(mesaScreen->xm_vis);
+ xfree(mesaScreen->xm_vis);
+ }
__glXScreenDestroy(screen);