xorg-server: Changes to 'ubuntu'
ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++++
configure.ac | 6 +++---
debian/changelog | 10 ++++++++--
glx/glxdricommon.c | 2 +-
hw/kdrive/ephyr/hostx.c | 6 ++++++
5 files changed, 60 insertions(+), 6 deletions(-)
New commits:
commit e4f3e6ecea75901832e228931e39bc6d6b710fd8
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Apr 14 12:53:58 2014 +0200
bump changelog
diff --git a/debian/changelog b/debian/changelog
index 845ef24..38c8d47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,14 @@
-xorg-server (2:1.15.1-1) UNRELEASED; urgency=low
+xorg-server (2:1.15.1-0ubuntu1) UNRELEASED; urgency=low
- * New upstream release.
+ * Merge from unreleased debian unstable.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 14 Apr 2014 12:52:18 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Wed, 09 Apr 2014 15:31:23 +0200
-xorg-server (2:1.15.0.901-1ubuntu1) UNRELEASED; urgency=low
+xorg-server (2:1.15.1-1) UNRELEASED; urgency=low
- * Merge rc1 from released debian unstable.
+ * New upstream release.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Wed, 09 Apr 2014 15:31:23 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 14 Apr 2014 12:52:18 +0200
xorg-server (2:1.15.0.901-1) unstable; urgency=medium
commit ae39d7aa16c85db7b6115301d9e90a20ef73db90
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Apr 14 12:52:48 2014 +0200
New upstream release.
diff --git a/ChangeLog b/ChangeLog
index 1ff4f4e..83ced73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+commit 9182af8a09c326bb4b01d3645fb2936e93f02242
+Author: Matt Dew <marcoz@osource.org>
+Date: Sun Apr 13 20:55:40 2014 -0600
+
+ Bump version to 1.15.1
+
+commit eec04d76a39a7334de4e00ef9f0f6e44c92b3d91
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Mar 6 18:50:07 2014 -0800
+
+ glx: Clear new FBConfig attributes to 0 by default.
+
+ The visualSelectGroup wasn't getting set (since our DRI drivers don't
+ use it), and and since it's the top priority in the sort order, you
+ got random sorting of your visuals unless malloc really returned you
+ new memory. This manifested as Xephyr -glamor rendering to a
+ multisampled window on my system, which as you might guess was
+ slightly lower performance than expected.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit d6268c25a8d33241d817977a84f127f8ef0cb9ee
+Author: Julien Cristau <jcristau@debian.org>
+Date: Wed Mar 26 23:24:20 2014 +0100
+
+ Xephyr: restore initial window resize lost in xcb conversion
+
+ The XResizeWindow call wasn't replaced by the xcb equivalent, so we
+ were no longer setting the initial window size, only wm size hints.
+
+ Regression from commit a2b73da "Xephyr: start converting hostx.c over to
+ xcb"
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74849
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reported-by: Laércio de Sousa <lbsousajr@gmail.com>
+ Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
commit 300458fb8ad0a7957e941cd65f47d204c7886e22
Author: Matt Dew <marcoz@osource.org>
Date: Fri Mar 21 23:49:41 2014 -0600
diff --git a/debian/changelog b/debian/changelog
index 95966e2..76dbbd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 14 Apr 2014 12:52:18 +0200
+
xorg-server (2:1.15.0.901-1) unstable; urgency=medium
[ Robert Millan ]
commit 9182af8a09c326bb4b01d3645fb2936e93f02242
Author: Matt Dew <marcoz@osource.org>
Date: Sun Apr 13 20:55:40 2014 -0600
Bump version to 1.15.1
diff --git a/configure.ac b/configure.ac
index abd4604..b7b78a4 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.15.0.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2014-03-21"
-RELEASE_NAME="Heart Candy-rc1"
+AC_INIT([xorg-server], 1.15.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2014-04-13"
+RELEASE_NAME="Heart Candy"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_USE_SYSTEM_EXTENSIONS
commit eec04d76a39a7334de4e00ef9f0f6e44c92b3d91
Author: Eric Anholt <eric@anholt.net>
Date: Thu Mar 6 18:50:07 2014 -0800
glx: Clear new FBConfig attributes to 0 by default.
The visualSelectGroup wasn't getting set (since our DRI drivers don't
use it), and and since it's the top priority in the sort order, you
got random sorting of your visuals unless malloc really returned you
new memory. This manifested as Xephyr -glamor rendering to a
multisampled window on my system, which as you might guess was
slightly lower performance than expected.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index fc90272..a97d027 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -132,7 +132,7 @@ createModeFromConfig(const __DRIcoreExtension * core,
unsigned int attrib, value;
int i;
- config = malloc(sizeof *config);
+ config = calloc(1, sizeof *config);
config->driConfig = driConfig;
commit d6268c25a8d33241d817977a84f127f8ef0cb9ee
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 26 23:24:20 2014 +0100
Xephyr: restore initial window resize lost in xcb conversion
The XResizeWindow call wasn't replaced by the xcb equivalent, so we
were no longer setting the initial window size, only wm size hints.
Regression from commit a2b73da "Xephyr: start converting hostx.c over to
xcb"
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74849
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reported-by: Laércio de Sousa <lbsousajr@gmail.com>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 3e01a47..57e7dc2 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -695,6 +695,12 @@ hostx_screen_init(KdScreenInfo *screen,
malloc(scrpriv->ximg->stride * buffer_height);
}
+ {
+ uint32_t mask = XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT;
+ uint32_t values[2] = {width, height};
+ xcb_configure_window(HostX.conn, scrpriv->win, mask, values);
+ }
+
if (scrpriv->win_pre_existing == None && !EphyrWantResize) {
/* Ask the WM to keep our size static */
xcb_size_hints_t size_hints = {0};
Reply to: