[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/

[Andreas Sturmlechner]

commit:     ecfd89006795c61ad4d7b97a3b9ba93e01a8238b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 21:34:47 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=ecfd8900

dev-qt/qtwayland: Use config switch for USE vulkan

Thanks-to: Jimi Huotari <chiitoo <AT> gentoo.org>
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtwayland/qtwayland-5.14.9999.ebuild | 5 +----
 dev-qt/qtwayland/qtwayland-5.15.9999.ebuild | 9 +--------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild 
b/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild
index c190d0e5..391ab67a 100644
--- a/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild
@@ -28,10 +28,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-       qt_use_disable_config vulkan wayland-vulkan-server-buffer \
-               src/plugins/hardwareintegration/client/client.pro \
-               src/plugins/hardwareintegration/compositor/compositor.pro
-
        use X || rm -r config.tests/xcomposite || die
 
        qt5-build_src_prepare
@@ -40,6 +36,7 @@ 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)
        )

diff --git a/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild 
b/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild
index 67e16940..36cfd4d6 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild
@@ -27,17 +27,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-       qt_use_disable_config vulkan wayland-vulkan-server-buffer \
-               src/plugins/hardwareintegration/client/client.pro \
-               src/plugins/hardwareintegration/compositor/compositor.pro
-
-       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)
        )