commit: de3b53dae6281b4cc3d0850627bf500bde60f6b7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 22:53:25 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 21:36:36 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=de3b53da
dev-qt/qtwayland: Sync recent changes to 5.9999
- add USE vulkan
- fix and rename xcomposite to X
- drop USE libinput
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwayland/metadata.xml | 1 -
dev-qt/qtwayland/qtwayland-5.9999.ebuild | 31 +++++++++++++------------------
2 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index db7a41ae..85cb4f0e 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
- <flag name="libinput">Enable support for input devices via
<pkg>dev-libs/libinput</pkg></flag>
<flag name="vulkan">Enable support for Vulkan-based server
buffer integration</flag>
</use>
<upstream>
diff --git a/dev-qt/qtwayland/qtwayland-5.9999.ebuild
b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
index ac4fdc11..36cfd4d6 100644
--- a/dev-qt/qtwayland/qtwayland-5.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9999.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
@@ -10,34 +10,29 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="+libinput xcomposite"
+IUSE="vulkan X"
DEPEND="
>=dev-libs/wayland-1.6.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl,libinput=]
+ ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
- xcomposite? (
+ vulkan? ( dev-util/vulkan-headers )
+ X? (
x11-libs/libX11
x11-libs/libXcomposite
)
"
RDEPEND="${DEPEND}"
-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
+src_configure() {
+ local myqmakeargs=(
+ --
+ $(qt_use vulkan feature-wayland-vulkan-server-buffer)
+ $(qt_use X feature-xcomposite-egl)
+ $(qt_use X feature-xcomposite-glx)
+ )
+ qt5-build_src_configure
}
