xorg-server: Changes to 'ubuntu+1'
debian/changelog | 12 ++
debian/control | 3
debian/patches/add_support_new_libsystemd.patch | 11 ++
debian/patches/series | 2
debian/patches/xmir-fixes.diff | 117 ++++++++++++++++++++++++
debian/rules | 16 ++-
6 files changed, 155 insertions(+), 6 deletions(-)
New commits:
commit c0f92327f0aa2ca28f0fb0941135f5ebba31e9bf
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Jan 18 11:35:37 2016 +0200
xmir-fixes.diff: Port xmir to 1.18.
diff --git a/debian/changelog b/debian/changelog
index 33aa763..cd7b2a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.18.0-1ubuntu1) UNRELEASED; urgency=medium
* Merge from Debian experimental
* patches: Refreshed, dropped what's upstream.
+ * xmir-fixes.diff: Port xmir to 1.18.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 08 Dec 2015 19:47:06 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 1216060..b63041e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,3 +49,4 @@ xmir.patch
xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
+xmir-fixes.diff
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
new file mode 100644
index 0000000..ea5b035
--- /dev/null
+++ b/debian/patches/xmir-fixes.diff
@@ -0,0 +1,117 @@
+Description: port xmir to 1.18
+
+--- a/hw/xmir/xmir-output.c
++++ b/hw/xmir/xmir-output.c
+@@ -327,10 +327,10 @@ xmir_output_handle_resize(struct xmir_wi
+
+ if (xmir_screen->glamor) {
+ glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
+- glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
++ glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
+ glClearColor(0., 0., 0., 1.);
+ glClear(GL_COLOR_BUFFER_BIT);
+- glamor_copy_n_to_n_nf(&screen->root->drawable, &pixmap->drawable,
++ glamor_copy(&screen->root->drawable, &pixmap->drawable,
+ NULL, ©_box, 1, 0, 0, FALSE, FALSE, 0, NULL);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ } else {
+--- a/hw/xmir/xmir.c
++++ b/hw/xmir/xmir.c
+@@ -1211,7 +1211,7 @@ xmir_create_screen_resources(ScreenPtr s
+ if (xmir_screen->glamor && !xmir_screen->rootless) {
+ glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(screen->devPrivate);
+
+- glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
++ glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+--- a/hw/xmir/xmir-glamor.c
++++ b/hw/xmir/xmir-glamor.c
+@@ -220,7 +220,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
+
+ pixmap_priv_get_scale(src_pixmap_priv, &src_xscale, &src_yscale);
+
+- if (src_pixmap_priv->base.gl_fbo == GLAMOR_FBO_UNATTACHED)
++ if (src_pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED)
+ FatalError("aeiou\n");
+
+ glViewport(dx, dy, width + dx, height + dy);
+@@ -231,7 +231,7 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
+
+ if (!fbo) {
+ glActiveTexture(GL_TEXTURE0);
+- glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->base.fbo->tex);
++ glBindTexture(GL_TEXTURE_2D, src_pixmap_priv->fbo->tex);
+
+ if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+@@ -368,7 +368,7 @@ xmir_glamor_copy_egl_common(DrawablePtr
+ DebugF("Box: (%i,%i)->(%i,%i)\n", ext->x1, ext->y1, ext->x2, ext->y2);
+
+ if (epoxy_has_gl_extension("GL_EXT_framebuffer_blit") && !xmir_screen->doubled && !orientation) {
+- glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, src_pixmap_priv->base.fbo->fb);
++ glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, src_pixmap_priv->fbo->fb);
+
+ glBlitFramebuffer(ext->x1, ext->y2, ext->x2, ext->y1,
+ ext->x1 + dx, ext->y2 + dy, ext->x2 + dx, ext->y1 + dy,
+@@ -404,7 +404,7 @@ xmir_glamor_copy_gbm(struct xmir_screen
+ PixmapPtr from = screen->GetWindowPixmap(window);
+ glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(back);
+
+- glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->base.fbo->fb);
++ glBindFramebuffer(GL_FRAMEBUFFER, pixmap_priv->fbo->fb);
+ xmir_glamor_copy_egl_common(&window->drawable, from, glamor_get_pixmap_private(from),
+ RegionExtents(dirty),
+ back->drawable.width, back->drawable.height, 0, 0, xmir_win->orientation);
+@@ -607,9 +607,9 @@ xmir_glamor_copy_egl_queue(struct xmir_s
+ * rotating back and forth.
+ */
+ glamor_set_pixmap_type(src_pixmap, GLAMOR_TEXTURE_DRM);
+- src_pixmap_priv->base.fbo->external = TRUE;
++ src_pixmap_priv->fbo->external = TRUE;
+
+- xmir_win->image = eglCreateImageKHR(xmir_screen->egl_display, xmir_screen->egl_context, EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer)(intptr_t)src_pixmap_priv->base.fbo->tex, attribs);
++ xmir_win->image = eglCreateImageKHR(xmir_screen->egl_display, xmir_screen->egl_context, EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer)(intptr_t)src_pixmap_priv->fbo->tex, attribs);
+ if (!xmir_win->image) {
+ GLint error;
+ ErrorF("eglCreateImageKHR failed with %x\n", eglGetError());
+@@ -1016,7 +1016,7 @@ glamor_egl_dri3_fd_name_from_tex(ScreenP
+ }
+
+ unsigned int
+-glamor_egl_create_argb8888_based_texture(ScreenPtr screen, int w, int h)
++glamor_egl_create_argb8888_based_texture(ScreenPtr screen, int w, int h, Bool linear)
+ {
+ return 0;
+ }
+@@ -1144,10 +1144,7 @@ xmir_glamor_init(struct xmir_screen *xmi
+ }
+
+ if (!glamor_init(screen,
+- GLAMOR_INVERTED_Y_AXIS |
+ GLAMOR_USE_EGL_SCREEN |
+- GLAMOR_USE_SCREEN |
+- GLAMOR_USE_PICTURE_SCREEN |
+ GLAMOR_NO_DRI3)) {
+ ErrorF("Failed to initialize glamor\n");
+ return FALSE;
+--- a/hw/xmir/xmir-input.c
++++ b/hw/xmir/xmir-input.c
+@@ -378,15 +378,13 @@ xmir_window_handle_input_event(struct xm
+ case mir_input_event_type_key: {
+ MirKeyboardEvent const *kev;
+ MirKeyboardAction action;
+- ValuatorMask mask;
+
+ kev = mir_input_event_get_keyboard_event(ev);
+ action = mir_keyboard_event_action(kev);
+
+- valuator_mask_zero(&mask);
+ QueueKeyboardEvents(xmir_input->keyboard,
+ action == mir_keyboard_action_up ? KeyRelease : KeyPress,
+- mir_keyboard_event_scan_code(kev) + 8, &mask);
++ mir_keyboard_event_scan_code(kev) + 8);
+ break;
+ }
+ case mir_input_event_type_touch: {
commit 03209b64a0bfcd0d76bf7438f9a33502081b8a05
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Dec 22 16:44:46 2015 +0100
Let xserver-xorg-dev depend on libxfont-dev
diff --git a/debian/changelog b/debian/changelog
index decde27..df2e086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
xorg-server (2:1.18.0-2) UNRELEASED; urgency=medium
+ [ Laurent Bigonville ]
* Enable systemd socket activation support (Closes: #803254)
+ [ Emilio Pozuelo Monfort ]
+ * Let xserver-xorg-dev depend on libxfont-dev, as dixfont.h needs
+ fontutil.h.
+
-- Laurent Bigonville <bigon@debian.org> Sat, 05 Dec 2015 20:26:53 +0100
xorg-server (2:1.18.0-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index f58a7b3..cce4d7a 100644
--- a/debian/control
+++ b/debian/control
@@ -213,6 +213,7 @@ Depends:
x11proto-xf86bigfont-dev (>= 1.2.0),
x11proto-dri3-dev,
x11proto-present-dev,
+ libxfont-dev,
libxkbfile-dev,
libpciaccess-dev,
mesa-common-dev,
commit 336d09cee7d7e8b1a1e4ea136911fb2ee416e35f
Author: Laurent Bigonville <bigon@bigon.be>
Date: Sat Dec 5 20:27:27 2015 +0100
Enable systemd socket activation support (Closes: #803254)
diff --git a/debian/changelog b/debian/changelog
index 09f1c95..decde27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.0-2) UNRELEASED; urgency=medium
+
+ * Enable systemd socket activation support (Closes: #803254)
+
+ -- Laurent Bigonville <bigon@debian.org> Sat, 05 Dec 2015 20:26:53 +0100
+
xorg-server (2:1.18.0-1) experimental; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 16c1496..f58a7b3 100644
--- a/debian/control
+++ b/debian/control
@@ -98,6 +98,8 @@ Build-Depends:
libwayland-dev [linux-any],
#logind
libdbus-1-dev (>= 1.0) [linux-any],
+# systemd-daemon
+ libsystemd-dev [linux-any],
Standards-Version: 3.9.6
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
diff --git a/debian/patches/add_support_new_libsystemd.patch b/debian/patches/add_support_new_libsystemd.patch
new file mode 100644
index 0000000..d642b60
--- /dev/null
+++ b/debian/patches/add_support_new_libsystemd.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -849,7 +849,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes;
+ AC_MSG_ERROR([systemd support requested but no library has been found])
+ fi
+ AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available])
+- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon"
++ REQUIRED_LIBS="$REQUIRED_LIBS libsystemd"
+ fi
+ AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"])
+
diff --git a/debian/patches/series b/debian/patches/series
index 2c8af94..d0ff25a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
03_static-nettle.diff
05_Revert-Unload-submodules.diff
#08_xfree86_fix_ia64_inx_outx.diff
+add_support_new_libsystemd.patch
diff --git a/debian/rules b/debian/rules
index fe1469a..9013e08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,13 +44,15 @@ endif
ifeq ($(DEB_HOST_ARCH_OS), linux)
- selinux = --enable-xselinux
- wayland = --enable-xwayland
- logind = --enable-systemd-logind
+ selinux = --enable-xselinux
+ wayland = --enable-xwayland
+ logind = --enable-systemd-logind
+ systemd-daemon = --with-systemd-daemon
else
- selinux = --disable-xselinux
- wayland = --disable-xwayland
- logind = --disable-systemd-logind
+ selinux = --disable-xselinux
+ wayland = --disable-xwayland
+ logind = --disable-systemd-logind
+ systemd-daemon = --without-systemd-daemon
endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -165,6 +167,7 @@ confflags_main = \
--enable-xfree86-utils \
$(wayland) \
$(logind) \
+ $(systemd-daemon) \
--enable-suid-wrapper \
--enable-dmx \
--enable-xvfb \
@@ -198,6 +201,7 @@ confflags_udeb = \
--disable-xfree86-utils \
--disable-xwayland \
--disable-systemd-logind \
+ --without-systemd-daemon \
--disable-suid-wrapper \
--disable-dmx \
--disable-xvfb \
Reply to: