gentoo resync : 15.01.2020

4 files changed, 84 insertions, 3 deletions

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index deb1e55497ce..d937d505595f 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,10 +1,13 @@
 AUX qtwayland-5.13.2-fix-crash.patch 2173 BLAKE2B 80e797f7ce25085cddd4d9721e61cc94c48ab7310a9cd7f357bc0e6467f759a5c313564af808d4f5d6ffd1b5231731df5a69a6c01f876be6d9e53eb73084b23b SHA512 0071413c1bac608ad7591bb6e6b329424ed3dfac6cf1826cb9cedb512df83563fa995964fffb6e0b8ca47063b52835ffa8aeaf5612dbc72c0e916bd353c03965
 AUX qtwayland-5.13.2-fix-linuxdmabuf-build.patch 1052 BLAKE2B 7b184cbc66f5dab2dc8b640ae307f647bc4aea4772a5e74c5ee2be652ed2a90d6e682c4fafb9944d027022686f2be0cc666b2266051134ad57d7194f18eb48c3 SHA512 3c1c2b13c2ff632469f0e1f6c2d642303d359368343e679726d61357d8e104c483b6b3259f5e3b11961f64257f9d10b50d0bb2aa7d166eed5ffa5aaebcf58132
 AUX qtwayland-5.13.2-fix-touch-ignored.patch 1274 BLAKE2B a643a7df480ddf24939406a6479edb10a615ce031e249325c8509140c65c1377d58d37d29056fbd92cb0b943a01c4be0ec1408c5924e3bde8d07d8a100ae8554 SHA512 abdb8201873652510615e4d4db7ec3b415ba8f4f9db5b6258a4548101a25ea46c131d8bbb7d0d615aa4de384546f3d8ba6f299fa3fde3b0fbe5427b9e48103a9
+AUX qtwayland-5.14.0-fix-linuxdmabuf-build.patch 1322 BLAKE2B 419cffd8731094bde3a4aef3c87754e16a3cfd9fdc2641fc82fc771003231707671a2010fd981767cad92074a383dbe2bc340b4b419f6a4cc6ed7458aea7f308 SHA512 f68be03b81287a947fc9cd26dda3a78a27e0091dc880d027742ebc3839e80f50385182e630a9de332588c5f765c46ea1962f0c8284672cceb92f79b12c99010a
 DIST qtwayland-everywhere-src-5.12.3.tar.xz 432304 BLAKE2B eb2ba520c651467c8ed5f0d870a69c9b07047cb4c05a0c889b36abeab30149861b83ca693efb0bb93dce4f5da5913afc3c8b61933ef0e8307d22b64fce530d87 SHA512 e66f9f41c15cf84165e559a1ff09e20ec21bb3f909b57fab08b0e3f8f9eeacf75d49541b499b1a6514a34d1ba5dd426ec1ce77719910588afa12cb3a7980dc90
 DIST qtwayland-everywhere-src-5.12.5.tar.xz 448064 BLAKE2B e9ec631d1ec0f19cc5ef9f3c9e9e12d327da8ad896e40bb172b98191947ff20ba33b0fc747a9009d4d9147dd1cdea2d5376a12f25362bfa499eca6d0c838f2d2 SHA512 19e19b3d6226839856f8e8792665eda1f09f0bbf95a38077bdf2831205ee09254c8df6a521ba3f5a228bcd98c4d1929a2bd9e9aa2f6f14c218d4d7458d1a866c
 DIST qtwayland-everywhere-src-5.13.2.tar.xz 495536 BLAKE2B eb4352d76caba9ff1d217950b8be40edee1b963a085ca129938ade0d3a68569856bc1a745951d3731c81182b341704568a5036551693cad5926a239587dd506b SHA512 5eb895c2ef8e2e72b71fed027f760913bf754da213e488a6103d9034170a6333f034b3488115a87a5a4e90761425487b9a8ab8e84a68e2e614c159d747408d53
+DIST qtwayland-everywhere-src-5.14.0.tar.xz 544292 BLAKE2B 5982f1ecce500e5f8a541198e0362cf847c88cef81278b79a4d53db04f192aba0ebeaba7b0f2e0f6205a11352c281ac3bf320c8d25c598ed24663b8ceeef9e94 SHA512 2336e0f37ffcfc19c1fb3ba16bc853c0d3893d5b01fc1797c50b53057c0fb6827c2bb7e3d15fd943c6ecdefaf5cc544c7a59409f241dba39ed732bb6046ce1f6
 EBUILD qtwayland-5.12.3.ebuild 1137 BLAKE2B 91803151e658e54b23668c5ae4d387a2510d26ae42fb204cd6b5e3fc9649293ea90da44cb4243c0df686d42ba29f5b4875b9c2fc193e87a3e53f9bb1d5373996 SHA512 83d2ae87f67d4937bfbe1d24ac621afe0134c307479660e35aa4a4195b8879b6e891432c7e4a93e8822ea7b44c7a024c6cf38504526dba3ed9d4bcaa33b2ac48
 EBUILD qtwayland-5.12.5.ebuild 1139 BLAKE2B e60cfaa7752e389c1cbec992043903bb0f948621ea3afb6e55352de083c5b45189247451675856ae801e27cfaab6cd2ba6a8439e01c0909fe29a3dc2528a8fc8 SHA512 ffe06bcce71e01b74ee745b0a1b28b8f8c09e97461f0fca7428d6e103f3b3ef13056535a8513459a2e684041e59a4d7f9d0074325d6410fe751403cf10ad08f9
-EBUILD qtwayland-5.13.2-r1.ebuild 1358 BLAKE2B a793e0341d297620cc00573f81b61f8aeb5b00be7729d5c66939cd26b8d7363b1036d1bd7e66293b200b974eb03ef4d5dcfc9d7dfff6400f7491e253dcb9baf9 SHA512 4f6de1e03d17c679ed229878f297eeed2dfa689e44248230c044c2c5e97bc8c7056d2c20047c404dac04c0a9101646985ed27626dda1a5a4e00fdb0f73c5fb69
+EBUILD qtwayland-5.13.2-r1.ebuild 1354 BLAKE2B 1bbcdf954cc03a0fec1e3c2c9430ca068d857efcec4d44466459f589dce23a70bce595e2cb24bdb0a214c2b4b853e5acbbd1bdbb47813a1b5a1fed6b97c3b6ad SHA512 d854b7e5ea14cc1fbf9273bceada4211e8fa2d477fb4cd18fa1a95664b7239ba47e97e9262da4b5012f864be9bd9af2a7f3abb1e9c87ea41f37b163663e40874
+EBUILD qtwayland-5.14.0.ebuild 1229 BLAKE2B 2009a2ba3e264a9aab45fac53c95eb417d7e27adc80bd438149fd9f43ee6b09379ce3594dd558ee9925836873f1469078139b48fcd334f0f0b040ee53ba32087 SHA512 8c464119349b1bf064c93d46d439bfd9ce7b499593be917e2e158b6fd7c0737a04d1a33b6922af8dc50e9737e472986ad8687e256d384cb7e69cbe2835b57711
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/files/qtwayland-5.14.0-fix-linuxdmabuf-build.patch b/dev-qt/qtwayland/files/qtwayland-5.14.0-fix-linuxdmabuf-build.patch
new file mode 100644
index 000000000000..7040a68a1b8d
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.14.0-fix-linuxdmabuf-build.patch
@@ -0,0 +1,31 @@
+From c2105d8b7e16cc934b886537968228f6300bf4bc Mon Sep 17 00:00:00 2001
+From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
+Date: Fri, 8 Nov 2019 13:58:04 +0100
+Subject: [PATCH] Fix compilation of linuxdmabuf compositor plugin
+
+Mesa's eglext.h no longer includes eglmesaext.h, so copy over the typedefs we need.
+
+Fixes: QTBUG-79709
+Change-Id: I3190ef56e0e162636efea440dff7e760cf11fcd0
+Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
+---
+ .../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h                 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+index 8554721e1..02b5b6f88 100644
+--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
++++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+@@ -58,6 +58,10 @@
+ #define DRM_FORMAT_MOD_INVALID  fourcc_mod_code(NONE, DRM_FORMAT_RESERVED)
+ #endif
+ 
++// Copied from eglmesaext.h
++typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
++typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display);
++
+ QT_BEGIN_NAMESPACE
+ 
+ class QWaylandCompositor;
+-- 
+2.16.3
diff --git a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
index 5cc773676a7c..4a5e3a548fde 100644
--- a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~x86"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwayland/qtwayland-5.14.0.ebuild b/dev-qt/qtwayland/qtwayland-5.14.0.ebuild
new file mode 100644
index 000000000000..9f2838116819
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.14.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="+libinput xcomposite"
+
+DEPEND="
+	>=dev-libs/wayland-1.6.0
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}[egl,libinput=]
+	media-libs/mesa[egl]
+	>=x11-libs/libxkbcommon-0.2.0
+	xcomposite? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-linuxdmabuf-build.patch" # bug 699190, QTBUG-79709
+)
+
+src_prepare() {
+	qt_use_disable_config libinput xkbcommon-evdev \
+		src/client/client.pro \
+		src/compositor/wayland_wrapper/wayland_wrapper.pri \
+		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+		src/plugins/shellintegration/wl-shell/wl-shell.pro \
+		src/plugins/shellintegration/xdg-shell/xdg-shell.pro \
+		src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro \
+		src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \
+		tests/auto/compositor/compositor/compositor.pro
+
+	use xcomposite || rm -r config.tests/xcomposite || die
+
+	qt5-build_src_prepare
+}