From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB96A138350 for ; Fri, 28 Feb 2020 10:15:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA4BAE0897; Fri, 28 Feb 2020 10:15:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79C62E0897 for ; Fri, 28 Feb 2020 10:15:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B566E34F451 for ; Fri, 28 Feb 2020 10:15:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4462157 for ; Fri, 28 Feb 2020 10:15:42 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1582884463.14ee15e92aa9df567c0e7245b4e83190fc7ebab7.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwayland/metadata.xml dev-qt/qtwayland/qtwayland-5.14.9999.ebuild dev-qt/qtwayland/qtwayland-5.15.9999.ebuild X-VCS-Directories: dev-qt/qtwayland/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 14ee15e92aa9df567c0e7245b4e83190fc7ebab7 X-VCS-Branch: master Date: Fri, 28 Feb 2020 10:15:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7a771e69-3d82-441f-bffd-caa31d742f46 X-Archives-Hash: ddf1c88fdb7f62ecffd187e91da2e8bb commit: 14ee15e92aa9df567c0e7245b4e83190fc7ebab7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 26 20:37:41 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Feb 28 10:07:43 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=14ee15e9 dev-qt/qtwayland: Add USE vulkan Closes: https://bugs.gentoo.org/703594 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwayland/metadata.xml | 1 + dev-qt/qtwayland/qtwayland-5.14.9999.ebuild | 9 +++++++-- dev-qt/qtwayland/qtwayland-5.15.9999.ebuild | 9 +++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml index 4fb03e67..db7a41ae 100644 --- a/dev-qt/qtwayland/metadata.xml +++ b/dev-qt/qtwayland/metadata.xml @@ -7,6 +7,7 @@ Enable support for input devices via dev-libs/libinput + Enable support for Vulkan-based server buffer integration https://bugreports.qt.io/ diff --git a/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild index 0602db2f..5fa75b67 100644 --- a/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.14.9999.ebuild @@ -10,15 +10,16 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="+libinput xcomposite" +IUSE="+libinput vulkan xcomposite" 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 + vulkan? ( dev-util/vulkan-headers ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite @@ -37,6 +38,10 @@ src_prepare() { src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \ tests/auto/compositor/compositor/compositor.pro + qt_use_disable_config vulkan wayland-vulkan-server-buffer \ + src/plugins/hardwareintegration/client/client.pro \ + src/plugins/hardwareintegration/compositor/compositor.pro + use xcomposite || rm -r config.tests/xcomposite || die qt5-build_src_prepare diff --git a/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild index 5e2e0a8c..0f7e93ca 100644 --- a/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.15.9999.ebuild @@ -10,15 +10,16 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="+libinput xcomposite" +IUSE="+libinput vulkan xcomposite" 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 + vulkan? ( dev-util/vulkan-headers ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite @@ -37,5 +38,9 @@ src_prepare() { src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \ tests/auto/compositor/compositor/compositor.pro + 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 }