Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2013-02-01 16:15:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server", Maintainer is "sndir...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2013-01-17 11:06:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2013-02-01 16:15:54.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Jan 31 18:09:30 UTC 2013 - tobias.johannes.klausm...@mni.thm.de + +- Update to version 1.13.2: + No commits since rc1. + Commits from rc1: + + EnableDisableExtensionError: Use ARRAY_SIZE rather than sentinel + + glx/dri2: initialise api to avoid indirect rendering failing randomly + + XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS + X 10.8.2 + + XQuartz: Add some verbose logging to debug xp_lock_window being + unbalanced + + XQuartz: Don't add the 15bit visual any more + + version bump for 1.13.1.901 (rc1) + + vfb: Initialize the GLX extension again. + +------------------------------------------------------------------- Old: ---- xorg-server-1.13.1.tar.bz2 New: ---- xorg-server-1.13.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.p26lzr/_old 2013-02-01 16:15:57.000000000 +0100 +++ /var/tmp/diff_new_pack.p26lzr/_new 2013-02-01 16:15:57.000000000 +0100 @@ -17,7 +17,7 @@ Name: xorg-x11-server -%define dirsuffix 1.13.1 +%define dirsuffix 1.13.2 %define vnc 0 Summary: X License: GPL-2.0+ and MIT ++++++ xorg-server-1.13.1.tar.bz2 -> xorg-server-1.13.2.tar.bz2 ++++++ ++++ 12885 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.13.1/ChangeLog new/xorg-server-1.13.2/ChangeLog --- old/xorg-server-1.13.1/ChangeLog 2012-12-14 05:37:44.000000000 +0100 +++ new/xorg-server-1.13.2/ChangeLog 2013-01-25 06:56:20.000000000 +0100 @@ -1,3 +1,95 @@ +commit 100027127cf6ebcccd404eece2bf6862669fc8a9 +Author: Matt Dew <mar...@osource.org> +Date: Thu Jan 24 22:53:34 2013 -0700 + + Bump version number to 1.13.2 + +commit 3a8c618a731aced34ddc8c69a1798e2cfd967fbd +Author: Matt Dew <mar...@osource.org> +Date: Thu Jan 3 23:36:00 2013 -0700 + + version bump for 1.13.1.901 (rc1) + +commit 95780608df676473f501a6cd73248da9f7be82a0 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Tue Dec 18 00:41:08 2012 -0800 + + EnableDisableExtensionError: Use ARRAY_SIZE rather than sentinel + + d785368e0e converted the other miinitext functions to use ARRAY_SIZE, + and removed the sentinel, but missed EnableDisableExtensionError so + passing an invalid extension name could cause the server to walk off + the end off the list looking for a sentinel that wasn't there. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit a6d89f30dde50cbd1117e8639dfb99cc852cfd6a +Author: Dave Airlie <airl...@redhat.com> +Date: Mon Dec 17 15:40:17 2012 +1000 + + glx/dri2: initialise api to avoid indirect rendering failing randomly + + Running glxinfo under indirect rendering would randomly fail against the + intel driver, as it would create a context with no attribs, and then the + api value would be passed to the driver uninitialised. + + Signed-off-by: Dave Airlie <airl...@redhat.com> + Reviewed-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 65642ccb78aa2d4c4e17b9ac42e4ef625c4a6e8b +Author: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com> +Date: Fri Nov 16 19:51:58 2012 +0200 + + vfb: Initialize the GLX extension again. + + This should fix a regression in the 1.13.0 release: commit + 5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86 removed a code path used by Xvfb + and made it use the default one when initializing extensions. However, this + meant the GLX extension was not initialized anymore since it is not part of + the `staticExtensions' array. + + Since it is not possible to just add it to that array after commit + aad428b8e21c77397c623b78706eb64b1fea77c9, adopt an approach similar to + xwin's and xquartz's and initialize the extension from vfb's `InitOutput'. + + Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com> + Reviewed-by: Daniel Stone <dan...@fooishbar.org> + +commit e348e4afc5323779b686ee8ff2f094359664c42e +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Tue Dec 18 01:29:12 2012 -0800 + + XQuartz: Don't add the 15bit visual any more + + Mountain Lion only supports 32bit backing stores, so don't use 15bit visuals until libXplugin adapts + + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + (cherry picked from commit ba4bb3bc1b87eb57cc34d2ad1f302c9d2a15c847) + +commit 34fb39a960898f5a0bcc67f76f385ba8a91ea2ba +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Thu Sep 20 21:11:21 2012 -0700 + + XQuartz: Add some verbose logging to debug xp_lock_window being unbalanced + + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + (cherry picked from commit f54987de97720200ee94eba1c7a737d4ad8c55c8) + +commit 06e2ecd0df9b81dd518ae6017ec42765520e2e93 +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Thu Sep 20 21:49:40 2012 -0700 + + XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS X 10.8.2 + + <rdar://problem/12338921> + http://bugs.winehq.org/show_bug.cgi?id=31751 + + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + (cherry picked from commit 25d26875bc9bd6fd23ae1b5280f015abf1b033b7) + commit 92ecbf5f0f516aacb7f0034e3786c4454a07fe8d Author: Matt Dew <mar...@osource.org> Date: Thu Dec 13 21:05:24 2012 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.13.1/configure.ac new/xorg-server-1.13.2/configure.ac --- old/xorg-server-1.13.1/configure.ac 2012-12-14 05:04:55.000000000 +0100 +++ new/xorg-server-1.13.2/configure.ac 2013-01-25 06:53:20.000000000 +0100 @@ -26,9 +26,9 @@ dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.13.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2012-12-13" -RELEASE_NAME="Chrysanthemum Tea" +AC_INIT([xorg-server], 1.13.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2013-01-24" +RELEASE_NAME="Silver Needle" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.13.1/glx/glxdri2.c new/xorg-server-1.13.2/glx/glxdri2.c --- old/xorg-server-1.13.1/glx/glxdri2.c 2012-10-14 01:38:50.000000000 +0200 +++ new/xorg-server-1.13.2/glx/glxdri2.c 2013-01-04 07:03:42.000000000 +0100 @@ -514,7 +514,7 @@ unsigned minor_ver; uint32_t flags; int reset; - int api; + int api = __DRI_API_OPENGL; if (num_attribs != 0) { if (!dri2_convert_glx_attribs(screen, num_attribs, attribs, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.13.1/hw/vfb/InitOutput.c new/xorg-server-1.13.2/hw/vfb/InitOutput.c --- old/xorg-server-1.13.1/hw/vfb/InitOutput.c 2012-10-14 01:38:50.000000000 +0200 +++ new/xorg-server-1.13.2/hw/vfb/InitOutput.c 2012-12-23 23:22:25.000000000 +0100 @@ -66,6 +66,7 @@ #endif /* HAS_SHM */ #include "dix.h" #include "miline.h" +#include "glx_extinit.h" #define VFB_DEFAULT_WIDTH 1280 #define VFB_DEFAULT_HEIGHT 1024 @@ -885,12 +886,30 @@ } /* end vfbScreenInit */ +static const ExtensionModule vfbExtensions[] = { +#ifdef GLXEXT + { GlxExtensionInit, "GLX", &noGlxExtension }, +#endif +}; + +static +void vfbExtensionInit(void) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(vfbExtensions); i++) + LoadExtension(&vfbExtensions[i], TRUE); +} + void InitOutput(ScreenInfo * screenInfo, int argc, char **argv) { int i; int NumFormats = 0; + if (serverGeneration == 1) + vfbExtensionInit(); + /* initialize pixmap formats */ /* must have a pixmap depth to match every screen depth */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.13.1/hw/xquartz/darwin.c new/xorg-server-1.13.2/hw/xquartz/darwin.c --- old/xorg-server-1.13.1/hw/xquartz/darwin.c 2012-10-14 01:38:51.000000000 +0200 +++ new/xorg-server-1.13.2/hw/xquartz/darwin.c 2012-12-23 23:03:03.000000000 +0100 @@ -231,13 +231,15 @@ } // TODO: Make PseudoColor visuals not suck in TrueColor mode - // if(dfb->depth > 8) - // miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0); - if (dfb->depth > 15) - miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor, - RM_ARGB(0, 5, 5, 5), GM_ARGB(0, 5, 5, - 5), - BM_ARGB(0, 5, 5, 5)); + // if(dfb->depth > 8) + // miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0); + // + // TODO: Re-add support for 15bit + // if (dfb->depth > 15) + // miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor, + // RM_ARGB(0, 5, 5, 5), GM_ARGB(0, 5, 5, + // 5), + // BM_ARGB(0, 5, 5, 5)); if (dfb->depth > 24) miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor, RM_ARGB(0, 8, 8, 8), GM_ARGB(0, 8, 8, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.13.1/hw/xquartz/xpr/dri.c new/xorg-server-1.13.2/hw/xquartz/xpr/dri.c --- old/xorg-server-1.13.1/hw/xquartz/xpr/dri.c 2012-10-14 01:38:51.000000000 +0200 +++ new/xorg-server-1.13.2/hw/xquartz/xpr/dri.c 2012-12-23 23:03:03.000000000 +0100 @@ -64,6 +64,7 @@ #include "mi.h" #include "mipointer.h" #include "rootless.h" +#include "rootlessCommon.h" #include "x-hash.h" #include "x-hook.h" #include "driWrap.h" @@ -380,6 +381,11 @@ DRIDrawablePrivPtr pDRIDrawablePriv; if (pDrawable->type == DRAWABLE_WINDOW) { + /* <rdar://problem/12338921> + * http://bugs.winehq.org/show_bug.cgi?id=31751 + */ + RootlessStopDrawing((WindowPtr)pDrawable, FALSE); + pDRIDrawablePriv = CreateSurfaceForWindow(pScreen, (WindowPtr)pDrawable, &wid); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.13.1/hw/xquartz/xpr/xprFrame.c new/xorg-server-1.13.2/hw/xquartz/xpr/xprFrame.c --- old/xorg-server-1.13.1/hw/xquartz/xpr/xprFrame.c 2012-10-14 01:38:51.000000000 +0200 +++ new/xorg-server-1.13.2/hw/xquartz/xpr/xprFrame.c 2012-12-23 23:03:03.000000000 +0100 @@ -49,6 +49,10 @@ #include <pthread.h> #endif +#ifdef DEBUG_XP_LOCK_WINDOW +#include <execinfo.h> +#endif + #define DEFINE_ATOM_HELPER(func, atom_name) \ static Atom func(void) { \ static int generation; \ @@ -376,6 +380,18 @@ unsigned int rowbytes[2]; xp_error err; +#ifdef DEBUG_XP_LOCK_WINDOW + void* callstack[128]; + int i, frames = backtrace(callstack, 128); + char** strs = backtrace_symbols(callstack, frames); + + ErrorF("=== LOCK %d ===\n", (int)x_cvt_vptr_to_uint(wid)); + for (i = 0; i < frames; ++i) { + ErrorF(" %s\n", strs[i]); + } + free(strs); +#endif + err = xp_lock_window(x_cvt_vptr_to_uint( wid), NULL, NULL, data, rowbytes, NULL); if (err != Success) @@ -395,6 +411,18 @@ { xp_error err; +#ifdef DEBUG_XP_LOCK_WINDOW + void* callstack[128]; + int i, frames = backtrace(callstack, 128); + char** strs = backtrace_symbols(callstack, frames); + + ErrorF("=== UNLOCK %d ===\n", (int)x_cvt_vptr_to_uint(wid)); + for (i = 0; i < frames; ++i) { + ErrorF(" %s\n", strs[i]); + } + free(strs); +#endif + err = xp_unlock_window(x_cvt_vptr_to_uint(wid), flush); /* This should be a FatalError, but we started tripping over it. Make it a * FatalError after http://xquartz.macosforge.org/trac/ticket/482 is fixed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.13.1/hw/xquartz/xpr/xprScreen.c new/xorg-server-1.13.2/hw/xquartz/xpr/xprScreen.c --- old/xorg-server-1.13.1/hw/xquartz/xpr/xprScreen.c 2012-10-14 01:38:51.000000000 +0200 +++ new/xorg-server-1.13.2/hw/xquartz/xpr/xprScreen.c 2012-12-23 23:03:03.000000000 +0100 @@ -359,6 +359,10 @@ dfb->blueMask = 0; break; +#if 0 + // Removed because Mountain Lion removed support for + // 15bit backing stores. We can possibly re-add + // this once libXplugin is updated to work around it. case 15: dfb->visuals = TrueColorMask; //LARGE_VISUALS; dfb->preferredCVC = TrueColor; @@ -369,6 +373,7 @@ dfb->greenMask = GM_ARGB(0, 5, 5, 5); dfb->blueMask = BM_ARGB(0, 5, 5, 5); break; +#endif // case 24: default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xorg-server-1.13.1/mi/miinitext.c new/xorg-server-1.13.2/mi/miinitext.c --- old/xorg-server-1.13.1/mi/miinitext.c 2012-10-14 01:38:51.000000000 +0200 +++ new/xorg-server-1.13.2/mi/miinitext.c 2013-01-04 07:05:37.000000000 +0100 @@ -212,10 +212,12 @@ void EnableDisableExtensionError(const char *name, Bool enable) { - ExtensionToggle *ext = &ExtensionToggleList[0]; + ExtensionToggle *ext; + int i; Bool found = FALSE; - for (ext = &ExtensionToggleList[0]; ext->name != NULL; ext++) { + for (i = 0; i < ARRAY_SIZE(ExtensionToggleList); i++) { + ext = &ExtensionToggleList[i]; if ((strcmp(name, ext->name) == 0) && (ext->disablePtr == NULL)) { ErrorF("[mi] Extension \"%s\" can not be disabled\n", name); found = TRUE; @@ -226,7 +228,8 @@ ErrorF("[mi] Extension \"%s\" is not recognized\n", name); ErrorF("[mi] Only the following extensions can be run-time %s:\n", enable ? "enabled" : "disabled"); - for (ext = &ExtensionToggleList[0]; ext->name != NULL; ext++) { + for (i = 0; i < ARRAY_SIZE(ExtensionToggleList); i++) { + ext = &ExtensionToggleList[i]; if (ext->disablePtr != NULL) { ErrorF("[mi] %s\n", ext->name); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
