gentoo resync : 19.04.2018

5 files changed, 237 insertions, 5 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 3ef66fc31c7b..60cf2be14b37 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 4b102cbf601b..476cac6465d5 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,10 +4,12 @@ AUX xdm.initd-11 6021 BLAKE2B 75b0ae0adb0a96324d6cd7be98686e3806ea87dada2cdd8ecb
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 AUX xorg-server-1.19.4-sysmacros.patch 986 BLAKE2B 04c111591a6a558913217b24aa2357478e7d931b6cee5185dda31ebd38d68463b4a158a18d8a60ffa7ccc5c65e246f261ebbf7c0ebc81fd3ae31e7579b7adab4 SHA512 858676058779363741901ffbf79666f723f917b49f8627ddd2f31768873adfb416a70bc298e2356861cb5abca8be54a6c64f8fa4fd11a91cce072b93857ad168
+AUX xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch 1501 BLAKE2B 7600b13947bf66e12dd65c2572e56615583f4118995d47d5bd5c87aec82abe37a14c468c3e2e081118af5e19cd56f9e69e9e5ca8af5f58afea145294135e5f88 SHA512 63fb9caa032873dee14b0ce34b615e3fbdf70ccf9e9788e17481ffa8d15290986731694b0f794701649e59c9b0156601e6f9a97146a22f25c62fe1042c0ec568
+AUX xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch 5560 BLAKE2B b0d5420e41417b162a16414ced5b95df046a4612b0064e78e0bc5e1a55551674f86c9083afd581d4a16cb1dd48bfe3721c58fdfc6fd7141a806149be76dc212b SHA512 4193e466cd0fd9c7ef4546cb23e3011e1f6ae671810dfdae5b4950ae7c92bc4abfdc786525626da5c4d922096887ea59b7c0cd2739498cca394f3f9420e09a77
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.19.99.904.tar.bz2 6083787 BLAKE2B 7b5ba4601494ab7714a977e6fcced12e373f5aaf30d433560a899d4446116cc4a5e22ae21378fea6ab07b68bad1a2544e065fd1d449b3b155b2c0e8a6787e479 SHA512 b9dccc777d0a30c6b40bddffe1f359dde4103539c6598f04bf8cf5f59e6770229221a199c1866b4eba0cf8d2d87fe878985bbd2e3c6ec5b65e3f16195ea8d57e
 EBUILD xorg-server-1.19.5-r1.ebuild 6481 BLAKE2B 7188ba3c7f817474511de8d06050a13b56889f4346db5aadc281abc88b72af9781cf99f9c793f63cbe0666d2c9abc333c229f40ffd500b5f1e09cc63fb487456 SHA512 937fbc0858228d52542ac8f8d22eabdd3787d6ea477ef5275cb9675a3de0fe10adeee83e51cce50397e713523fae907a14ab2080803076d8f5af368bd50f9ba9
-EBUILD xorg-server-1.19.99.904.ebuild 5550 BLAKE2B 5754df3f70aa9bf1a4bdc64b751801b410e2443847eb21df0a305ef517e265397f65e6454ec450751b183a72252baddb847ca645f5d5080b2c541388760f71f5 SHA512 0ebac3a78cd805b57bee23c7fb693864cdcc59a2d8ae11ef2bbac15e093dc833c91332315fe5a52ddcadf1f3dc95e89a814af047c098c59484f19dab945f085e
+EBUILD xorg-server-1.19.99.904.ebuild 5790 BLAKE2B c757f821d52eb26e4ad4de08296fda35d302e9a0da2d6570e0fc26216694fcef361445a366438a94b90a83e6006d2b9447f74d067c396ad60103d3c223ac7be4 SHA512 43652f71aa4e6cd9a1d3c2fa2ccd852a9394d81f0e73c7dc7f512f1687add43831a7656273bb197056912ba56800c910a3c684a7c2d6fcea4e335832d6f834a0
 EBUILD xorg-server-9999.ebuild 5550 BLAKE2B 5754df3f70aa9bf1a4bdc64b751801b410e2443847eb21df0a305ef517e265397f65e6454ec450751b183a72252baddb847ca645f5d5080b2c541388760f71f5 SHA512 0ebac3a78cd805b57bee23c7fb693864cdcc59a2d8ae11ef2bbac15e093dc833c91332315fe5a52ddcadf1f3dc95e89a814af047c098c59484f19dab945f085e
 MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
new file mode 100644
index 000000000000..f0c4ed58d33d
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
@@ -0,0 +1,48 @@
+From a98a95b798a0062783ae6fd2135ad488af5efcfd Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 15 Apr 2018 23:37:45 -0700
+Subject: [PATCH xserver 2/2] modesetting: Move GBM code inside #ifdef
+ GLAMOR_HAS_GBM
+
+Fixes a compilation error without Glamor.
+
+Bugzilla: https://bugs.gentoo.org/653288
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
+---
+ hw/xfree86/drivers/modesetting/drmmode_display.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
+index 322ef050b..79e91f0f8 100644
+--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
++++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
+@@ -998,18 +998,18 @@ static Bool
+ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
+                   unsigned width, unsigned height, unsigned bpp)
+ {
+-    uint32_t format;
+-
+-    if (drmmode->scrn->depth == 30)
+-        format = GBM_FORMAT_ARGB2101010;
+-    else
+-        format = GBM_FORMAT_ARGB8888;
+-
+     bo->width = width;
+     bo->height = height;
+ 
+ #ifdef GLAMOR_HAS_GBM
+     if (drmmode->glamor) {
++        uint32_t format;
++
++        if (drmmode->scrn->depth == 30)
++            format = GBM_FORMAT_ARGB2101010;
++        else
++            format = GBM_FORMAT_ARGB8888;
++
+ #ifdef GBM_BO_WITH_MODIFIERS
+         uint32_t num_modifiers;
+         uint64_t *modifiers = NULL;
+-- 
+2.16.1
+
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch
new file mode 100644
index 000000000000..312a5e05cdc6
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch
@@ -0,0 +1,175 @@
+From c3ae963a7b19e05b8296aae8b6354587756d48fa Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Mon, 16 Apr 2018 09:39:09 +0200
+Subject: [PATCH xserver 1/2] xwayland: Fix build without glamor
+
+Present support in Xwayland relies on glamor, make sure Xwayland can
+be built without glamor by moving references to Present code inside
+the conditional GLAMOR_HAS_GBM.
+
+Reported-by: Matt Turner <mattst88@gmail.com>
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+Reviewed-by: Matt Turner <mattst88@gmail.com>
+Reviewed-by: Roman Gilg <subdiff@gmail.com>
+---
+ hw/xwayland/Makefile.am |  4 ++--
+ hw/xwayland/meson.build |  3 +--
+ hw/xwayland/xwayland.c  | 10 +++++++++-
+ hw/xwayland/xwayland.h  |  7 ++++++-
+ 4 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
+index 0291afee7..80d3a1f19 100644
+--- a/hw/xwayland/Makefile.am
++++ b/hw/xwayland/Makefile.am
+@@ -11,7 +11,6 @@ Xwayland_CFLAGS =				\
+ 
+ Xwayland_SOURCES =				\
+ 	xwayland.c				\
+-	xwayland-present.c			\
+ 	xwayland-input.c			\
+ 	xwayland-cursor.c			\
+ 	xwayland-shm.c				\
+@@ -35,7 +34,8 @@ Xwayland_built_sources =
+ 
+ if GLAMOR_EGL
+ Xwayland_SOURCES += 				\
+-	xwayland-glamor.c
++	xwayland-glamor.c			\
++	xwayland-present.c
+ if XV
+ Xwayland_SOURCES += 				\
+ 	xwayland-glamor-xv.c
+diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
+index 69a5c819a..8d178825e 100644
+--- a/hw/xwayland/meson.build
++++ b/hw/xwayland/meson.build
+@@ -1,6 +1,5 @@
+ srcs = [
+     'xwayland.c',
+-    'xwayland-present.c',
+     'xwayland-input.c',
+     'xwayland-cursor.c',
+     'xwayland-shm.c',
+@@ -53,7 +52,7 @@ srcs += code.process(dmabuf_xml)
+ 
+ xwayland_glamor = []
+ if gbm_dep.found()
+-    srcs += 'xwayland-glamor.c'
++    srcs += [ 'xwayland-glamor.c', 'xwayland-present.c' ]
+     if build_xv
+         srcs += 'xwayland-glamor-xv.c'
+     endif
+diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
+index dd074c341..44bbc3b18 100644
+--- a/hw/xwayland/xwayland.c
++++ b/hw/xwayland/xwayland.c
+@@ -525,6 +525,7 @@ xwl_realize_window(WindowPtr window)
+         wl_region_destroy(region);
+     }
+ 
++#ifdef GLAMOR_HAS_GBM
+     if (xwl_screen->present) {
+         xwl_window->present_crtc_fake = RRCrtcCreate(xwl_screen->screen, xwl_window);
+         xwl_window->present_msc = 1;
+@@ -533,6 +534,7 @@ xwl_realize_window(WindowPtr window)
+         xorg_list_init(&xwl_window->present_event_list);
+         xorg_list_init(&xwl_window->present_release_queue);
+     }
++#endif
+ 
+     wl_display_flush(xwl_screen->display);
+ 
+@@ -599,9 +601,11 @@ xwl_unrealize_window(WindowPtr window)
+ 
+     compUnredirectWindow(serverClient, window, CompositeRedirectManual);
+ 
++#ifdef GLAMOR_HAS_GBM
+     if (xwl_screen->present)
+         /* Always cleanup Present (Present might have been active on child window) */
+         xwl_present_cleanup(window);
++#endif
+ 
+     screen->UnrealizeWindow = xwl_screen->UnrealizeWindow;
+     ret = (*screen->UnrealizeWindow) (window);
+@@ -621,8 +625,10 @@ xwl_unrealize_window(WindowPtr window)
+     if (xwl_window->frame_callback)
+         wl_callback_destroy(xwl_window->frame_callback);
+ 
++#ifdef GLAMOR_HAS_GBM
+     if (xwl_window->present_crtc_fake)
+         RRCrtcDestroy(xwl_window->present_crtc_fake);
++#endif
+ 
+     free(xwl_window);
+     dixSetPrivate(&window->devPrivates, &xwl_window_private_key, NULL);
+@@ -709,9 +715,11 @@ xwl_screen_post_damage(struct xwl_screen *xwl_screen)
+ 
+     xorg_list_for_each_entry_safe(xwl_window, next_xwl_window,
+                                   &xwl_screen->damage_window_list, link_damage) {
++#ifdef GLAMOR_HAS_GBM
+         /* Present on the main surface. So don't commit here as well. */
+         if (xwl_window->present_window)
+             continue;
++#endif
+         /* If we're waiting on a frame callback from the server,
+          * don't attach a new buffer. */
+         if (xwl_window->frame_callback)
+@@ -1053,10 +1061,10 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
+         ErrorF("Failed to initialize glamor, falling back to sw\n");
+         xwl_screen->glamor = 0;
+     }
+-#endif
+ 
+     if (xwl_screen->glamor && xwl_screen->rootless)
+         xwl_screen->present = xwl_present_init(pScreen);
++#endif
+ 
+     if (!xwl_screen->glamor) {
+         xwl_screen->CreateScreenResources = pScreen->CreateScreenResources;
+diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
+index a65559374..cf2551b99 100644
+--- a/hw/xwayland/xwayland.h
++++ b/hw/xwayland/xwayland.h
+@@ -127,7 +127,7 @@ struct xwl_window {
+     struct xorg_list link_damage;
+     struct wl_callback *frame_callback;
+     Bool allow_commits;
+-
++#ifdef GLAMOR_HAS_GBM
+     /* present */
+     RRCrtcPtr present_crtc_fake;
+     struct xorg_list present_link;
+@@ -143,8 +143,10 @@ struct xwl_window {
+ 
+     struct xorg_list present_event_list;
+     struct xorg_list present_release_queue;
++#endif
+ };
+ 
++#ifdef GLAMOR_HAS_GBM
+ struct xwl_present_event {
+     uint64_t event_id;
+     uint64_t target_msc;
+@@ -159,6 +161,7 @@ struct xwl_present_event {
+ 
+     struct xorg_list list;
+ };
++#endif
+ 
+ #define MODIFIER_META 0x01
+ 
+@@ -378,8 +381,10 @@ struct wl_buffer *xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap,
+                                                   unsigned short height,
+                                                   Bool *created);
+ 
++#ifdef GLAMOR_HAS_GBM
+ Bool xwl_present_init(ScreenPtr screen);
+ void xwl_present_cleanup(WindowPtr window);
++#endif
+ 
+ void xwl_screen_release_tablet_manager(struct xwl_screen *xwl_screen);
+ 
+-- 
+2.16.1
+
diff --git a/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild b/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild
index 7af80e32dab9..a1dff958c171 100644
--- a/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
+inherit autotools xorg-2 multilib versionator flag-o-matic
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
@@ -108,9 +108,10 @@ REQUIRED_USE="!minimal? (
 	)
 	xephyr? ( kdrive )"
 
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
+UPSTREAMED_PATCHES=(
+	"${FILESDIR}"/${P}-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
+	"${FILESDIR}"/${P}-xwayland-Fix-build-without-glamor.patch
+)
 
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
@@ -132,6 +133,12 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	xorg-2_src_prepare
+	# needed because xwayland patch touches hw/xwayland/Makefile.am
+	eautoreconf
+}
+
 src_configure() {
 	# localstatedir is used for the log location; we need to override the default
 	#	from ebuild.sh