xorg-server: Changes to 'ubuntu'
ChangeLog | 94 +++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 6 +-
debian/changelog | 34 +++++++++-------
glx/glxdri2.c | 2
hw/vfb/InitOutput.c | 19 +++++++++
hw/xquartz/darwin.c | 16 ++++---
hw/xquartz/xpr/dri.c | 6 ++
hw/xquartz/xpr/xprFrame.c | 28 +++++++++++++
hw/xquartz/xpr/xprScreen.c | 5 ++
mi/miinitext.c | 9 ++--
10 files changed, 191 insertions(+), 28 deletions(-)
New commits:
commit 56953a24f021a6769018bef12fef3ae74f4dff51
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 8 17:38:46 2013 +0200
release to raring
diff --git a/debian/changelog b/debian/changelog
index 01d261f..305deba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.13.1.901-0ubuntu1) raring; urgency=low
+
+ * Merge from unreleased debian git.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 08 Jan 2013 16:40:30 +0200
+
xorg-server (2:1.13.1.901-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
commit a658d3474bbb413d1dd51dae5b001dbe73794c3c
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 8 16:37:42 2013 +0200
update the changelogs
diff --git a/ChangeLog b/ChangeLog
index 8a45f13..e455b54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,97 @@
+commit 3a8c618a731aced34ddc8c69a1798e2cfd967fbd
+Author: Matt Dew <marcoz@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.coopersmith@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.coopersmith@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a6d89f30dde50cbd1117e8639dfb99cc852cfd6a
+Author: Dave Airlie <airlied@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 <airlied@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 65642ccb78aa2d4c4e17b9ac42e4ef625c4a6e8b
+Author: Raphael Kubo da Costa <raphael.kubo.da.costa@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.costa@intel.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit e348e4afc5323779b686ee8ff2f094359664c42e
+Author: Jeremy Huddleston Sequoia <jeremyhu@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 <jeremyhu@apple.com>
+ (cherry picked from commit ba4bb3bc1b87eb57cc34d2ad1f302c9d2a15c847)
+
+commit 34fb39a960898f5a0bcc67f76f385ba8a91ea2ba
+Author: Jeremy Huddleston Sequoia <jeremyhu@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 <jeremyhu@apple.com>
+ (cherry picked from commit f54987de97720200ee94eba1c7a737d4ad8c55c8)
+
+commit 06e2ecd0df9b81dd518ae6017ec42765520e2e93
+Author: Jeremy Huddleston Sequoia <jeremyhu@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 <jeremyhu@apple.com>
+ (cherry picked from commit 25d26875bc9bd6fd23ae1b5280f015abf1b033b7)
+
+commit 92ecbf5f0f516aacb7f0034e3786c4454a07fe8d
+Author: Matt Dew <marcoz@osource.org>
+Date: Thu Dec 13 21:05:24 2012 -0700
+
+ No changes from 1.13.0.902 (rc2)
+
+ Bump version to 1.13.1
+
commit ede07c1af35926c77c4e766cc02c00333b498460
Author: Matt Dew <marcoz@osource.org>
Date: Thu Dec 6 22:46:46 2012 -0700
diff --git a/debian/changelog b/debian/changelog
index 6dec1d0..79d828f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.13.0.902-1) UNRELEASED; urgency=low
+xorg-server (2:1.13.1.901-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream release
commit 3a8c618a731aced34ddc8c69a1798e2cfd967fbd
Author: Matt Dew <marcoz@osource.org>
Date: Thu Jan 3 23:36:00 2013 -0700
version bump for 1.13.1.901 (rc1)
diff --git a/configure.ac b/configure.ac
index 67b1eb4..649092b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
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.1.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2013-01-03"
+RELEASE_NAME=""
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 95780608df676473f501a6cd73248da9f7be82a0
Author: Alan Coopersmith <alan.coopersmith@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.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/mi/miinitext.c b/mi/miinitext.c
index d175440..a15e219 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -212,10 +212,12 @@ EnableDisableExtension(const char *name, Bool enable)
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 @@ EnableDisableExtensionError(const char *name, Bool enable)
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);
}
commit a6d89f30dde50cbd1117e8639dfb99cc852cfd6a
Author: Dave Airlie <airlied@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 <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index bce1bfa..b26e501 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -514,7 +514,7 @@ create_driver_context(__GLXDRIcontext * context,
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,
commit 65642ccb78aa2d4c4e17b9ac42e4ef625c4a6e8b
Author: Raphael Kubo da Costa <raphael.kubo.da.costa@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.costa@intel.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 955624f..5f20a1e 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -66,6 +66,7 @@ from The Open Group.
#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 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
} /* 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 */
commit e348e4afc5323779b686ee8ff2f094359664c42e
Author: Jeremy Huddleston Sequoia <jeremyhu@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 <jeremyhu@apple.com>
(cherry picked from commit ba4bb3bc1b87eb57cc34d2ad1f302c9d2a15c847)
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index d26f18a..b3a1fb3 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -231,13 +231,15 @@ DarwinScreenInit(ScreenPtr pScreen, int argc, char **argv)
}
// 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 --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index efe2aa8..e376019 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -359,6 +359,10 @@ have_depth:
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 @@ have_depth:
dfb->greenMask = GM_ARGB(0, 5, 5, 5);
dfb->blueMask = BM_ARGB(0, 5, 5, 5);
break;
+#endif
// case 24:
default:
commit 34fb39a960898f5a0bcc67f76f385ba8a91ea2ba
Author: Jeremy Huddleston Sequoia <jeremyhu@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 <jeremyhu@apple.com>
(cherry picked from commit f54987de97720200ee94eba1c7a737d4ad8c55c8)
diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c
index 01f1def..aad375b 100644
--- a/hw/xquartz/xpr/xprFrame.c
+++ b/hw/xquartz/xpr/xprFrame.c
@@ -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 @@ xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
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 @@ xprStopDrawing(RootlessFrameID wid, Bool flush)
{
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.
commit 06e2ecd0df9b81dd518ae6017ec42765520e2e93
Author: Jeremy Huddleston Sequoia <jeremyhu@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 <jeremyhu@apple.com>
(cherry picked from commit 25d26875bc9bd6fd23ae1b5280f015abf1b033b7)
diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c
index 03af163..adba69c 100644
--- a/hw/xquartz/xpr/dri.c
+++ b/hw/xquartz/xpr/dri.c
@@ -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 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
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);
commit 92ecbf5f0f516aacb7f0034e3786c4454a07fe8d
Author: Matt Dew <marcoz@osource.org>
Date: Thu Dec 13 21:05:24 2012 -0700
No changes from 1.13.0.902 (rc2)
Bump version to 1.13.1
diff --git a/configure.ac b/configure.ac
index ffd8a97..67b1eb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.13.0.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2012-12-06"
-RELEASE_NAME="Jasmine Tea"
+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_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit fef80d8bab86e75d2eb202b33e11e2e17584b2f6
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Fri Dec 7 09:17:43 2012 +0100
Bump ABI_VIDEODRV_VERSION to 13.1
xf86UpdateDesktopDimensions is newly exported for nvidia blob
diff --git a/debian/serverminver b/debian/serverminver
index 41482e2..b6b99d6 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
2:1.12.99.901
-ABI_VIDEODRV_VERSION:13.0
+ABI_VIDEODRV_VERSION:13.1
ABI_XINPUT_VERSION:18.0
Reply to: