diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-29 20:49:37 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-29 21:27:58 +0100 |
| commit | 47ea4a3f896a0b68a5742399e53b7b3e9021d9b0 (patch) | |
| tree | 8360a9e6f585de964c6d9a28c9f906e7f55c0b0d /dev-qt/qtwayland | |
| parent | dev-qt: Drop all KEYWORDS from 5.12.3 except arm, x86 (diff) | |
| download | gentoo-47ea4a3f896a0b68a5742399e53b7b3e9021d9b0.tar.gz gentoo-47ea4a3f896a0b68a5742399e53b7b3e9021d9b0.tar.bz2 gentoo-47ea4a3f896a0b68a5742399e53b7b3e9021d9b0.zip | |
dev-qt: Drop 5.14.0
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtwayland')
| -rw-r--r-- | dev-qt/qtwayland/Manifest | 1 | ||||
| -rw-r--r-- | dev-qt/qtwayland/files/qtwayland-5.14.0-fix-linuxdmabuf-build.patch | 31 | ||||
| -rw-r--r-- | dev-qt/qtwayland/qtwayland-5.14.0.ebuild | 47 |
3 files changed, 0 insertions, 79 deletions
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 99724012b2cb..bfcbc7c5f77f 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1,4 +1,3 @@ DIST qtwayland-everywhere-src-5.12.3.tar.xz 432304 BLAKE2B eb2ba520c651467c8ed5f0d870a69c9b07047cb4c05a0c889b36abeab30149861b83ca693efb0bb93dce4f5da5913afc3c8b61933ef0e8307d22b64fce530d87 SHA512 e66f9f41c15cf84165e559a1ff09e20ec21bb3f909b57fab08b0e3f8f9eeacf75d49541b499b1a6514a34d1ba5dd426ec1ce77719910588afa12cb3a7980dc90 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 DIST qtwayland-everywhere-src-5.14.1.tar.xz 544744 BLAKE2B cc74e6ac4519484713795169a91f18ed2535684bf604d12ab900a0fb2502d30c1fa4fbdc5899c4a32505e8f4b2be142d3b16540b6797c1624deac097d45ea41d SHA512 6cdfb527ce8160b562343bfb3959dfcd8ccc91a50817756547f4a0559b77372bee7587bc2e4e658e15b58ecb52c6eb0ef2193e30a285d13c4192bb03a1149cfc 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 deleted file mode 100644 index 7040a68a1b8d..000000000000 --- a/dev-qt/qtwayland/files/qtwayland-5.14.0-fix-linuxdmabuf-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -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.14.0.ebuild b/dev-qt/qtwayland/qtwayland-5.14.0.ebuild deleted file mode 100644 index 9f2838116819..000000000000 --- a/dev-qt/qtwayland/qtwayland-5.14.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# 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 -} |