Hello community, here is the log from the commit of package xgl checked in at Tue May 23 01:37:41 CEST 2006. -------- --- xgl/xgl.changes 2006-05-19 16:17:06.000000000 +0200 +++ xgl/xgl.changes 2006-05-22 02:31:24.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 22 02:28:48 CEST 2006 - dreveman@suse.de + +- Fix pbuffer resize issue that caused the server to crash when + using fglrx driver. (bnc #175637) + +------------------------------------------------------------------- Old: ---- glitz-0.5.4.tar.gz New: ---- glitz-0.5.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.4zOzGc/_old 2006-05-23 01:37:24.000000000 +0200 +++ /var/tmp/diff_new_pack.4zOzGc/_new 2006-05-23 01:37:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xgl (Version cvs_060519) +# spec file for package xgl (Version cvs_060522) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -23,13 +23,13 @@ PreReq: %fillup_prereq Requires: xgl-hardware-list Autoreqprov: on -Version: cvs_060519 +Version: cvs_060522 Release: 1 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 Source: xorg-server-1.1.99.1.tar.bz2 -Source1: glitz-0.5.4.tar.gz +Source1: glitz-0.5.6.tar.gz Source2: README.SUSE Source3: sysconfig.displaymanager.template Source4: Mesa-CVS-20060512.tar.bz2 @@ -141,6 +141,9 @@ /var/adm/fillup-templates/sysconfig.displaymanager-%name %changelog -n xgl +* Mon May 22 2006 - dreveman@suse.de +- Fix pbuffer resize issue that caused the server to crash when + using fglrx driver. (bnc #175637) * Fri May 19 2006 - dreveman@suse.de - Disable YUY2 format for XVideo as it's not accelerated and the software fallback got issues. ++++++ glitz-0.5.4.tar.gz -> glitz-0.5.6.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/ChangeLog new/glitz-0.5.6/ChangeLog --- old/glitz-0.5.4/ChangeLog 2006-02-23 02:15:23.000000000 +0100 +++ new/glitz-0.5.6/ChangeLog 2006-05-22 02:24:14.000000000 +0200 @@ -1,3 +1,71 @@ +2006-05-22 David Reveman <davidr@novell.com> + + * src/glx/glitz_glx_context.c (_glitz_glx_context_update): Update + drawable size before getting the current context. + + * src/glx/glitz_glx_drawable.c (_glitz_glx_drawable_update_size): + Make no context current if pbuffer drawable we're about to destroy + is current. (bnc #175637) + +2006-05-20 David Reveman <davidr@novell.com> + + * src/glitz.h (GLITZ_REVISION): Bump version to 0.5.6. + + * configure.in: Bump version to 0.5.6. + +2006-05-02 David Reveman <davidr@novell.com> + + * src/agl/glitz_agl_format.c (glitz_agl_query_formats): + Fix typo in AGL format initialization. (Junji Takagi) + +2006-03-13 David Reveman <davidr@novell.com> + + * src/glitz.h (GLITZ_REVISION): Bump version to 0.5.5. + + * configure.in: Bump version to 0.5.5. + + * src/glitz_pixel.c (glitz_set_pixels): + * src/glitz_gl.h: + Add experimental code for avoiding context switches when uploading + pixel data. + + * src/agl/glitz_glx_context.c: + * src/agl/glitz_glx_drawable.c: + * src/agl/glitz_glxint.h: + * src/agl/glitz_egl_context.c: + * src/agl/glitz_egl_surface.c: + * src/agl/glitz_eglint.h: + * src/agl/glitz_wgl_context.c: + * src/agl/glitz_wgl_drawable.c: + * src/agl/glitz_wglint.h: + * src/agl/glitz_agl_context.c: + * src/agl/glitz_agl_drawable.c: + * src/agl/glitz_aglint.h: + * src/glitzint.h: + * src/glitz_surface.c: + * src/glitz_framebuffer.c: + * src/glitz_drawable.c: + * src/glitz_buffer.c: Add support for avoiding context switches. + + * src/egl/glitz_egl_context.c (glitz_egl_context_get): + * src/egl/glitz_wgl_context.c (glitz_wgl_context_get): + * src/egl/glitz_agl_context.c (glitz_agl_context_get): + * src/glx/glitz_egl_drawable.c: + * src/glx/glitz_wgl_drawable.c: + * src/glx/glitz_agl_drawable.c: + * src/glx/glitz_eglint.h: + * src/glx/glitz_wglint.h: + * src/glx/glitz_aglint.h: + * src/glx/glitz_glxint.h: + * src/glx/glitz_glxext.h: + * src/glx/glitz_glx_info.c (_glitz_glx_proc_address_lookup): + * src/glx/glitz_glx_context.c: + * src/glx/glitz_glx_drawable.c: + * src/glx/glitz_glx_extension.c: + * src/glitz_framebuffer.c: + * src/glitz_drawable.c (glitz_drawable_swap_buffer_region): + * src/glitz.h: CopySubBufferMESA support. + 2006-02-23 David Reveman <davidr@novell.com> * src/glitz.h (GLITZ_REVISION): Bump version to 0.5.4. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/config/config.guess new/glitz-0.5.6/config/config.guess --- old/glitz-0.5.4/config/config.guess 2006-01-01 19:19:30.000000000 +0100 +++ new/glitz-0.5.6/config/config.guess 2006-03-05 01:57:50.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-23' +timestamp='2006-02-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -223,6 +224,9 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; @@ -794,6 +798,9 @@ i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS_NT-*:*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -802,7 +809,10 @@ echo ${UNAME_MACHINE}-pc-pw32 exit ;; x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[345]*) + echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -873,7 +883,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; mips64:Linux:*:*) @@ -892,7 +906,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; or32:Linux:*:*) @@ -991,7 +1009,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) LIBC=gnu #else LIBC=gnuaout @@ -1001,7 +1019,11 @@ LIBC=dietlibc #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/config/config.sub new/glitz-0.5.6/config/config.sub --- old/glitz-0.5.4/config/config.sub 2006-01-01 19:19:30.000000000 +0100 +++ new/glitz-0.5.6/config/config.sub 2006-03-05 01:57:50.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-23' +timestamp='2006-02-27' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -268,15 +269,16 @@ | mn10200 | mn10300 \ | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | shbe | sheb | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ @@ -298,10 +300,6 @@ ms1) basic_machine=mt-unknown ;; - nios2 | nios2-* | nios2 | nios2-*) - basic_machine=nios2-altera - os=-none - ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -354,17 +352,18 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | shbe-* | sheb-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ @@ -1148,7 +1147,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1221,7 +1220,8 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/configure new/glitz-0.5.6/configure --- old/glitz-0.5.4/configure 2006-02-23 10:27:51.000000000 +0100 +++ new/glitz-0.5.6/configure 2006-05-20 22:38:35.000000000 +0200 @@ -1509,7 +1509,7 @@ # Package version number, (as distinct from shared library version) # This must be manually synchronized with the version in src/glitz.h -GLITZ_VERSION=0.5.4 +GLITZ_VERSION=0.5.6 # libtool shared library version # Increment if the interface has additions, changes, removals. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/configure.in new/glitz-0.5.6/configure.in --- old/glitz-0.5.4/configure.in 2006-02-23 02:14:45.000000000 +0100 +++ new/glitz-0.5.6/configure.in 2006-05-20 22:29:43.000000000 +0200 @@ -6,7 +6,7 @@ # Package version number, (as distinct from shared library version) # This must be manually synchronized with the version in src/glitz.h -GLITZ_VERSION=0.5.4 +GLITZ_VERSION=0.5.6 # libtool shared library version # Increment if the interface has additions, changes, removals. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/agl/glitz_agl_format.c new/glitz-0.5.6/src/agl/glitz_agl_format.c --- old/glitz-0.5.4/src/agl/glitz_agl_format.c 2006-01-10 22:40:11.000000000 +0100 +++ new/glitz-0.5.6/src/agl/glitz_agl_format.c 2006-05-02 00:35:48.000000000 +0200 @@ -229,9 +229,9 @@ AGLPixelFormat pixel_format, *new_pfs; int n_attribs_list, i; - format.types = GLITZ_DRAWABLE_TYPE_WINDOW_MASK; - format.d.id = 0; - format.color.fourcc = GLITZ_FOURCC_RGB; + format.types = GLITZ_DRAWABLE_TYPE_WINDOW_MASK; + format.d.id = 0; + format.d.color.fourcc = GLITZ_FOURCC_RGB; n_attribs_list = sizeof (_attribs_list) / sizeof (GLint *); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glitz.h new/glitz-0.5.6/src/glitz.h --- old/glitz-0.5.4/src/glitz.h 2006-03-12 13:32:28.000000000 +0100 +++ new/glitz-0.5.6/src/glitz.h 2006-05-20 22:30:03.000000000 +0200 @@ -28,7 +28,7 @@ #define GLITZ_MAJOR 0 #define GLITZ_MINOR 5 -#define GLITZ_REVISION 4 +#define GLITZ_REVISION 6 #if defined(__cplusplus) || defined(c_plusplus) extern "C" { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glitz_drawable.c new/glitz-0.5.6/src/glitz_drawable.c --- old/glitz-0.5.4/src/glitz_drawable.c 2006-03-13 10:27:08.000000000 +0100 +++ new/glitz-0.5.6/src/glitz_drawable.c 2006-03-13 14:49:42.000000000 +0100 @@ -215,8 +215,8 @@ rect.x2 = x_origin + box->x2; rect.y2 = y_origin + box->y2; - if (rect.x1 <= 0 && - rect.y1 <= 0 && + if (rect.x1 <= 0 && + rect.y1 <= 0 && rect.x2 >= drawable->width && rect.x2 >= drawable->height) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glx/glitz_glx_context.c new/glitz-0.5.6/src/glx/glitz_glx_context.c --- old/glitz-0.5.4/src/glx/glitz_glx_context.c 2006-03-12 15:59:42.000000000 +0100 +++ new/glitz-0.5.6/src/glx/glitz_glx_context.c 2006-05-22 02:17:11.000000000 +0200 @@ -442,15 +442,15 @@ _glitz_glx_context_make_current (drawable, (context)? 1: 0); break; case GLITZ_DRAWABLE_CURRENT: - if (!dinfo->thread_info->cctx) - context = glXGetCurrentContext (); - if (drawable->base.width != drawable->width || drawable->base.height != drawable->height) _glitz_glx_drawable_update_size (drawable, drawable->base.width, drawable->base.height); + if (!dinfo->thread_info->cctx) + context = glXGetCurrentContext (); + if ((context != drawable->context->context) || (glXGetCurrentDrawable () != drawable->drawable)) _glitz_glx_context_make_current (drawable, (context)? 1: 0); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glx/glitz_glx_drawable.c new/glitz-0.5.6/src/glx/glitz_glx_drawable.c --- old/glitz-0.5.4/src/glx/glitz_glx_drawable.c 2006-03-13 10:27:43.000000000 +0100 +++ new/glitz-0.5.6/src/glx/glitz_glx_drawable.c 2006-05-22 02:21:31.000000000 +0200 @@ -79,6 +79,10 @@ { if (drawable->pbuffer) { + if (glXGetCurrentDrawable () == drawable->drawable) + glXMakeCurrent (drawable->screen_info->display_info->display, + None, NULL); + glitz_glx_pbuffer_destroy (drawable->screen_info, drawable->pbuffer); drawable->drawable = drawable->pbuffer = glitz_glx_pbuffer_create (drawable->screen_info, @@ -258,7 +262,6 @@ screen_info->glx.copy_sub_buffer (screen_info->display_info->display, drawable->drawable, x, y, width, height); - return 1; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.4/src/glx/glitz_glx_extension.c new/glitz-0.5.6/src/glx/glitz_glx_extension.c --- old/glitz-0.5.4/src/glx/glitz_glx_extension.c 2006-03-12 21:03:24.000000000 +0100 +++ new/glitz-0.5.6/src/glx/glitz_glx_extension.c 2006-03-13 15:16:09.000000000 +0100 @@ -39,6 +39,7 @@ { 0.0, NULL, 0 } }; +/* XXX: only checking for client side support right now */ static glitz_extension_map glx_client_extensions[] = { { 0.0, "GLX_MESA_copy_sub_buffer", GLITZ_GLX_FEATURE_COPY_SUB_BUFFER_MASK }, { 0.0, NULL, 0 } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de