xorg-server: version bump 1.17.1 -> 1.17.2

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 6 insertions, 62 deletions

diff --git a/patches/xorg-server-1.17.1/0001-glamor-fix-build-when-DRI3-is-not-defined.patch b/patches/xorg-server-1.17.1/0001-glamor-fix-build-when-DRI3-is-not-defined.patch
deleted file mode 100644
index 51e81ff7d..000000000
--- a/patches/xorg-server-1.17.1/0001-glamor-fix-build-when-DRI3-is-not-defined.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Jonathan Gray <jsg@jsg.id.au>
-Date: Wed, 15 Apr 2015 21:29:58 +1000
-Subject: [PATCH] glamor: fix build when DRI3 is not defined
-
-Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
-Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-Signed-off-by: Keith Packard <keithp@keithp.com>
----
- glamor/glamor_egl.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
-index 113450c8d4ca..6160032f0f3d 100644
---- a/glamor/glamor_egl.c
-+++ b/glamor/glamor_egl.c
-@@ -597,6 +597,7 @@ glamor_egl_close_screen(ScreenPtr screen)
-     return screen->CloseScreen(screen);
- }
- 
-+#ifdef DRI3
- static int
- glamor_dri3_open_client(ClientPtr client,
-                         ScreenPtr screen,
-@@ -653,12 +654,12 @@ static dri3_screen_info_rec glamor_dri3_info = {
-     .pixmap_from_fd = glamor_pixmap_from_fd,
-     .fd_from_pixmap = glamor_fd_from_pixmap,
- };
-+#endif /* DRI3 */
- 
- void
- glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
- {
-     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
--    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-     struct glamor_egl_screen_private *glamor_egl =
-         glamor_egl_get_screen_private(scrn);
- 
-@@ -670,7 +671,9 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
- 
-     glamor_ctx->make_current = glamor_egl_make_current;
- 
-+#ifdef DRI3
-     if (glamor_egl->dri3_capable) {
-+    	glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
-         /* Tell the core that we have the interfaces for import/export
-          * of pixmaps.
-          */
-@@ -693,6 +696,7 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
-             }
-         }
-     }
-+#endif
- }
- 
- static void
diff --git a/patches/xorg-server-1.17.1/series b/patches/xorg-server-1.17.1/series
deleted file mode 100644
index 23227fdfc..000000000
--- a/patches/xorg-server-1.17.1/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-glamor-fix-build-when-DRI3-is-not-defined.patch
-0002-xf86bigfont-always-include-unistd.h.patch
-# 66b7ddc3c7f6ee95700b6480f61f6496  - git-ptx-patches magic
diff --git a/patches/xorg-server-1.17.1/0002-xf86bigfont-always-include-unistd.h.patch b/patches/xorg-server-1.17.2/0001-xf86bigfont-always-include-unistd.h.patch
index 5792f3cd4..5792f3cd4 100644
--- a/patches/xorg-server-1.17.1/0002-xf86bigfont-always-include-unistd.h.patch
+++ b/patches/xorg-server-1.17.2/0001-xf86bigfont-always-include-unistd.h.patch
diff --git a/patches/xorg-server-1.17.2/series b/patches/xorg-server-1.17.2/series
new file mode 100644
index 000000000..47238ab69
--- /dev/null
+++ b/patches/xorg-server-1.17.2/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-xf86bigfont-always-include-unistd.h.patch
+# 25545eb055796221183d2418bb8d79dc  - git-ptx-patches magic
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index 30fa68a5e..4e3eedd98 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_XORG_SERVER) += xorg-server
 #
 # Paths and names
 #
-XORG_SERVER_VERSION	:= 1.17.1
-XORG_SERVER_MD5		:= 5986510d59e394a50126a8e2833e79d3
+XORG_SERVER_VERSION	:= 1.17.2
+XORG_SERVER_MD5		:= 397e405566651150490ff493e463f1ad
 XORG_SERVER		:= xorg-server-$(XORG_SERVER_VERSION)
 XORG_SERVER_SUFFIX	:= tar.bz2
 XORG_SERVER_URL		:= $(call ptx/mirror, XORG, individual/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX))