Hello community,
here is the log from the commit of package xgl
checked in at Tue Apr 15 20:15:31 CEST 2008.
--------
--- xgl/xgl.changes 2008-04-15 02:59:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/xgl/xgl.changes 2008-04-15 17:23:34.602029000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 15 17:42:47 CEST 2008 - sndirsch@suse.de
+
+- updated xgl-crashfix.diff
+ * fixes unexpected termination ("BadAtom") (bnc #378450)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xgl.spec ++++++
--- /var/tmp/diff_new_pack.uN3599/_old 2008-04-15 20:15:22.000000000 +0200
+++ /var/tmp/diff_new_pack.uN3599/_new 2008-04-15 20:15:22.000000000 +0200
@@ -25,7 +25,7 @@
Requires: xgl-hardware-list
AutoReqProv: on
Version: git_071026
-Release: 56
+Release: 58
Summary: Xserver that uses OpenGL for its drawing operations.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
@@ -124,7 +124,7 @@
%patch14 -p0
%patch15 -p1
%patch16 -p1
-%patch17 -p0
+%patch17 -p1
%patch21 -p1
%patch22 -p1
%patch24 -p1
@@ -232,6 +232,9 @@
%changelog
* Tue Apr 15 2008 sndirsch@suse.de
+- updated xgl-crashfix.diff
+ * fixes unexpected termination ("BadAtom") (bnc #378450)
+* Tue Apr 15 2008 sndirsch@suse.de
- xgl-crashfix.diff
* fixes immediate crash when using Xgl as Xwrapper (bnc #378450)
* Thu Apr 10 2008 rodrigo@suse.de
++++++ xgl-crashfix.diff ++++++
--- /var/tmp/diff_new_pack.uN3599/_old 2008-04-15 20:15:23.000000000 +0200
+++ /var/tmp/diff_new_pack.uN3599/_new 2008-04-15 20:15:23.000000000 +0200
@@ -1,5 +1,5 @@
---- hw/xgl/glx/xglx.c 2008-02-01 12:47:52.000000000 -0500
-+++ hw/xgl/glx/xglx.c 2008-04-14 14:27:30.000000000 -0400
+--- a/hw/xgl/glx/xglx.c
++++ b/hw/xgl/glx/xglx.c
@@ -26,7 +26,6 @@
#include "xglx.h"
@@ -8,7 +8,7 @@
#include
#include
-@@ -186,7 +185,7 @@
+@@ -186,7 +185,7 @@ xglxAllocatePrivates (ScreenPtr pScreen)
#if RANDR_12_INTERFACE
static RRModePtr
xglxRRGetMode (XRRScreenResources *r,
@@ -17,7 +17,7 @@
{
xRRModeInfo modeInfo;
int i;
-@@ -218,8 +217,8 @@
+@@ -218,8 +217,8 @@ xglxRRGetMode (XRRScreenResources *r,
}
static RRCrtcPtr
@@ -28,7 +28,7 @@
{
int i;
-@@ -233,8 +232,8 @@
+@@ -233,8 +232,8 @@ xglxRRGetCrtc (ScreenPtr pScreen,
}
static RROutputPtr
@@ -39,7 +39,7 @@
{
int i;
-@@ -250,7 +249,7 @@
+@@ -250,7 +249,7 @@ xglxRRGetOutput (ScreenPtr pScreen,
static Bool
xglxRRUpdateCrtc (ScreenPtr pScreen,
XRRScreenResources *r,
@@ -48,7 +48,7 @@
{
XRRCrtcInfo *c;
RRCrtcPtr crtc;
-@@ -305,7 +304,7 @@
+@@ -305,7 +304,7 @@ xglxRRUpdateCrtc (ScreenPtr pScreen,
static Bool
xglxRRUpdateOutput (ScreenPtr pScreen,
XRRScreenResources *r,
@@ -57,16 +57,77 @@
{
XRROutputInfo *o;
RROutputPtr output, *clones = NULL;
-@@ -398,7 +397,7 @@
+@@ -398,8 +397,8 @@ xglxRRUpdateOutput (ScreenPtr pScreen,
static Bool
xglxRRUpdateOutputProperty (ScreenPtr pScreen,
XRRScreenResources *r,
- RROutput xoutput,
+- Atom xproperty)
+ unsigned long xoutput,
- Atom xproperty)
++ unsigned long xproperty)
{
RROutputPtr output;
-@@ -601,8 +600,10 @@
+ XRRPropertyInfo *info;
+@@ -436,24 +435,28 @@ xglxRRUpdateOutputProperty (ScreenPtr pScreen,
+
+ if (info->num_values)
+ {
++ int i;
++
+ values = xalloc (info->num_values * sizeof (INT32));
+ if (!values)
+ return FALSE;
+
+- memcpy (values, info->values, info->num_values * sizeof (INT32));
++ for (i = 0; i < info->num_values; i++)
++ values[i] = info->values[i];
+ }
+
+ if (type == XA_ATOM && format == 32)
+ {
+- int i;
++ INT32 *atoms = (INT32 *) prop;
++ int i;
+
+ for (i = 0; i < nElements; i++)
+ {
+- name = XGetAtomName (xdisplay, prop[i]);
++ name = XGetAtomName (xdisplay, atoms[i]);
+ if (!name)
+ return FALSE;
+
+- prop[i] = MakeAtom (name, strlen (name), TRUE);
++ atoms[i] = MakeAtom (name, strlen (name), TRUE);
+
+ XFree (name);
+ }
+@@ -514,8 +517,14 @@ xglxRRGetInfo (ScreenPtr pScreen,
+
+ for (i = 0; i < r->noutput; i++)
+ {
+- Atom *props;
+- int nProp, j;
++
++#ifdef _XSERVER64
++ Atom64 *props;
++#else
++ Atom *props;
++#endif
++
++ int nProp, j;
+
+ if (!xglxRRUpdateOutput (pScreen, r, r->outputs[i]))
+ return (xRRPending = FALSE);
+@@ -555,7 +564,7 @@ xglxRRGetInfo (ScreenPtr pScreen,
+ }
+
+ #if RANDR_12_INTERFACE
+-static RRMode
++static unsigned long
+ xglxRRGetXMode (XRRScreenResources *r,
+ RRModePtr mode)
+ {
+@@ -601,8 +610,10 @@ xglxRRScreenSetSize (ScreenPtr pScreen,
height != DisplayHeight (xdisplay, xscreen) ||
mmWidth != DisplayWidthMM (xdisplay, xscreen) ||
mmHeight != DisplayHeightMM (xdisplay, xscreen))
@@ -77,7 +138,7 @@
XResizeWindow (xdisplay, pScreenPriv->win, width, height);
-@@ -622,7 +623,13 @@
+@@ -622,7 +633,13 @@ xglxRRCrtcSet (ScreenPtr pScreen,
RROutputPtr *outputs)
{
XRRScreenResources *r;
@@ -91,7 +152,7 @@
RRMode m = None;
Status status;
int i;
-@@ -634,7 +641,7 @@
+@@ -634,7 +651,7 @@ xglxRRCrtcSet (ScreenPtr pScreen,
if (numOutputs)
{
@@ -100,7 +161,7 @@
if (!o)
return FALSE;
}
-@@ -651,10 +658,10 @@
+@@ -651,10 +668,10 @@ xglxRRCrtcSet (ScreenPtr pScreen,
}
for (i = 0; i < numOutputs; i++)
@@ -113,7 +174,7 @@
CurrentTime,
x, y,
m,
-@@ -689,7 +696,7 @@
+@@ -689,7 +706,7 @@ xglxRRCrtcSetGamma (ScreenPtr pScreen,
memcpy (gamma->green, crtc->gammaGreen, gamma->size * sizeof (CARD16));
memcpy (gamma->blue, crtc->gammaBlue, gamma->size * sizeof (CARD16));
@@ -122,7 +183,30 @@
XRRFreeGamma (gamma);
-@@ -783,11 +790,11 @@
+@@ -703,7 +720,13 @@ xglxRROutputSetProperty (ScreenPtr pScreen,
+ RRPropertyValuePtr value)
+ {
+ RRPropertyPtr p;
++
++#ifdef _XSERVER64
++ Atom64 atom, type;
++#else
+ Atom atom, type;
++#endif
++
+ long *values = value->data;
+ long *validValues;
+ int i;
+@@ -722,7 +745,7 @@ xglxRROutputSetProperty (ScreenPtr pScreen,
+
+ if (type == XA_ATOM && value->format == 32)
+ {
+- Atom *atoms = (Atom *) value->data;
++ INT32 *atoms = (INT32 *) value->data;
+
+ for (i = 0; i < value->size; i++)
+ if (!ValidAtom (atoms[i]))
+@@ -783,11 +806,11 @@ xglxRROutputSetProperty (ScreenPtr pScreen,
}
}
@@ -137,7 +221,7 @@
atom, type, value->format, PropModeReplace,
(unsigned char *) values, value->size);
-@@ -806,7 +813,12 @@
+@@ -806,7 +829,12 @@ xglxRROutputValidateMode (ScreenPtr pScreen,
RRModePtr mode)
{
XRRModeInfo *modeInfo;
@@ -151,7 +235,7 @@
XGLX_SCREEN_PRIV (pScreen);
-@@ -823,7 +835,7 @@
+@@ -823,7 +851,7 @@ xglxRROutputValidateMode (ScreenPtr pScreen,
XRRFreeModeInfo (modeInfo);
@@ -160,7 +244,7 @@
return TRUE;
}
-@@ -842,7 +854,12 @@
+@@ -842,7 +870,12 @@ xglxRRModeDestroy (ScreenPtr pScreen,
r = XRRGetScreenResources (xdisplay, pScreenPriv->root);
if (r)
{
@@ -174,9 +258,9 @@
m = xglxRRGetXMode (r, mode);
if (m)
---- hw/xgl/glx/xglx.h 2008-01-17 19:57:55.000000000 -0500
-+++ hw/xgl/glx/xglx.h 2008-04-14 14:11:54.000000000 -0400
-@@ -57,11 +57,15 @@
+--- a/hw/xgl/glx/xglx.h
++++ b/hw/xgl/glx/xglx.h
+@@ -57,11 +57,15 @@ typedef XID KeySym64;
#define Colormap Colormap64
#define GContext GContext64
#define KeySym KeySym64
@@ -192,7 +276,7 @@
#undef GC
#ifdef _XSERVER64_tmp
-@@ -82,6 +86,9 @@
+@@ -82,6 +86,9 @@ typedef XID KeySym64;
#undef Colormap
#undef GContext
#undef KeySym
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org