From 3221bf225fb68a31e281fcdbfde4cea0d576d946 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Sep 2023 16:26:18 +0100 Subject: gentoo auto-resync : 06:09:2023 - 16:26:18 --- dev-qt/qtwayland/Manifest | 8 ++--- dev-qt/qtwayland/metadata.xml | 1 + dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild | 48 ---------------------------- dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild | 51 ++++++++++++++++++++++++++++++ dev-qt/qtwayland/qtwayland-6.5.9999.ebuild | 7 ++-- dev-qt/qtwayland/qtwayland-6.9999.ebuild | 7 ++-- 6 files changed, 66 insertions(+), 56 deletions(-) delete mode 100644 dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild create mode 100644 dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild (limited to 'dev-qt/qtwayland') diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 52d347025764..9b2a0f21ae95 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -5,7 +5,7 @@ DIST qtwayland-5.15.10-gentoo-kde-2.tar.xz 43076 BLAKE2B 735ac875c0957de47f90d08 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899 DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48 SHA512 520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477 EBUILD qtwayland-5.15.10-r4.ebuild 1353 BLAKE2B 3cab556185c182f4cd8ed280737e1434c51ec1c52719688a2ca5372d81baa5edca8675b22a7c0f9601f7dacec65f54e7e361fd851a2f226dcefaac38180bd9b5 SHA512 0ac3e896cc8c6c717e44dc3119b1c5cf3cc4cc6d22538f837699528c61e29e11a3969538b0518d21c7d7b1362ac81910e9508197076481a51b4bece379f7dca2 -EBUILD qtwayland-6.5.2-r2.ebuild 936 BLAKE2B 871a2bcda61722f15fd872007d61ccf0752f14bdf1d9f2fd7a040e172799145ae0cd764ada3f502a381f7c2cb44da9fd50fac6a0a083e52725a09ab93dcdc7c5 SHA512 2c9a21f9acecf3d91af405b5741496d4e24acc69e9bd3852dbc229839221d06eeaabf8b4d061a98bfd889c1dd5b841da3b89c1e786e07b1c24aca0ac395ce96c -EBUILD qtwayland-6.5.9999.ebuild 871 BLAKE2B 03b849df05b5422c679a9f9f6d21e06d2e199fad07fc8ad4b6cb7e704545c6242858cca963f16ee917165dc664962876f3cc05c73c8033603bd0d6d0b50486f1 SHA512 b5c7d5b33e297629b008eea9c1fe067ab2e389f252ce8c29f72c5f5bb43cd8f3dba6d16106978d0778358a748cdb53a7eedb3a9017a1f0963ee47c5a013b36c8 -EBUILD qtwayland-6.9999.ebuild 871 BLAKE2B 03b849df05b5422c679a9f9f6d21e06d2e199fad07fc8ad4b6cb7e704545c6242858cca963f16ee917165dc664962876f3cc05c73c8033603bd0d6d0b50486f1 SHA512 b5c7d5b33e297629b008eea9c1fe067ab2e389f252ce8c29f72c5f5bb43cd8f3dba6d16106978d0778358a748cdb53a7eedb3a9017a1f0963ee47c5a013b36c8 -MISC metadata.xml 701 BLAKE2B 4fb22f432cbefa04f10c1f988271ec1db696593f37b3f80edd14c7c669192013a6b43869646c710560bcd08e4acd176331b5c41920c7af111dd58a64c6557207 SHA512 fb99bb933700e619db5e7bec1977f0c51bc7bdbcb97a4411f56e8f41a357982ee3de8d8150dcffdf9a494a0a84437de8b7ccafd2e0006796cdd25947d25815d2 +EBUILD qtwayland-6.5.2-r3.ebuild 1008 BLAKE2B 82fde088be3934181ad2a9f1f767f93c12b61c3fb7f2b68fff8b1fe8219a22337fd51f3a7b9ce83418949415d759baa4373a86e6e86fbd84fa87a9928e649101 SHA512 956c882e53b9a09050c4d2e554e44e11813cbed5f177d9e73f393d8d21564ea393b28f0c392742e2d3190fff37493bf48221b7834a2cc464199784a5c02c8784 +EBUILD qtwayland-6.5.9999.ebuild 943 BLAKE2B 1527a7fe4f074ab0d22e1144aa46ccb2356d040777c8d43fb38400c05fd5c4c5b48f90ca06bcd78171ae23cb9bfe65e2764a4c1c32fddc6fcebbba318d0cb83d SHA512 b678155903b89df2e6171ea1a38ae2aca9260f99779935b7af89cca59a14445fbcec71cf49671f3aaf467ab069fbac1c61df4fbb19766229d281786905a5f0d6 +EBUILD qtwayland-6.9999.ebuild 943 BLAKE2B 1527a7fe4f074ab0d22e1144aa46ccb2356d040777c8d43fb38400c05fd5c4c5b48f90ca06bcd78171ae23cb9bfe65e2764a4c1c32fddc6fcebbba318d0cb83d SHA512 b678155903b89df2e6171ea1a38ae2aca9260f99779935b7af89cca59a14445fbcec71cf49671f3aaf467ab069fbac1c61df4fbb19766229d281786905a5f0d6 +MISC metadata.xml 790 BLAKE2B 61ed17b888bc084b787b06d504b86aaf7a55c87f332115d007340cc5e158d6b02f08b247140d4311f37cfe92c474a07faeef5470bbd109dbbe7f600faccb9724 SHA512 61e0b8812f02c9d51a31c0e1e05cfdf512c5dd0336c95f00db237f5e3419555cea90be0aaa02894c5a9e50ded43ccbcd1fd3a38d2fd93651a27dc0d85fccccc9 diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml index fe0b049a950d..1509a2e738a9 100644 --- a/dev-qt/qtwayland/metadata.xml +++ b/dev-qt/qtwayland/metadata.xml @@ -6,6 +6,7 @@ Gentoo Qt Project + Enable support for the wayland compositor / server APIs Build QML/QtQuick bindings and imports Enable support for Vulkan-based server buffer integration diff --git a/dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild b/dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild deleted file mode 100644 index accf21a914e6..000000000000 --- a/dev-qt/qtwayland/qtwayland-6.5.2-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Wayland platform plugin for Qt" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE="qml vulkan" - -RDEPEND=" - dev-libs/wayland - ~dev-qt/qtbase-${PV}:6[egl(+),gui,opengl,vulkan=] - media-libs/libglvnd - x11-libs/libxkbcommon - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND="dev-util/wayland-scanner" - -CMAKE_SKIP_TESTS=( - # segfaults for not-looked-into reasons, but not considered - # an issue given >=seatv5 exists since wayland-1.10 (2016) - tst_seatv4 - # needs a compositor/opengl, skip the extra trouble - tst_surface - tst_xdgdecorationv1 -) - -PATCHES=( - "${FILESDIR}"/${P}-drag-drop-segfault.patch -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Quick) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild b/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild new file mode 100644 index 000000000000..9cd6abd6eecf --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-6.5.2-r3.ebuild @@ -0,0 +1,51 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Wayland platform plugin for Qt" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="compositor qml vulkan" + +RDEPEND=" + dev-libs/wayland + ~dev-qt/qtbase-${PV}:6[egl(+),gui,opengl,vulkan=] + media-libs/libglvnd + x11-libs/libxkbcommon + compositor? ( + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND="dev-util/wayland-scanner" + +CMAKE_SKIP_TESTS=( + # segfaults for not-looked-into reasons, but not considered + # an issue given >=seatv5 exists since wayland-1.10 (2016) + tst_seatv4 + # needs a compositor/opengl, skip the extra trouble + tst_surface + tst_xdgdecorationv1 +) + +PATCHES=( + "${FILESDIR}"/${P}-drag-drop-segfault.patch +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package qml Qt6Quick) + $(qt_feature compositor wayland_server) + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild index 7319f5b43fd6..517bfcaf25e0 100644 --- a/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild @@ -11,14 +11,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="qml vulkan" +IUSE="compositor qml vulkan" RDEPEND=" dev-libs/wayland ~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=] media-libs/libglvnd x11-libs/libxkbcommon - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + compositor? ( + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + ) " DEPEND=" ${RDEPEND} @@ -38,6 +40,7 @@ CMAKE_SKIP_TESTS=( src_configure() { local mycmakeargs=( $(cmake_use_find_package qml Qt6Quick) + $(qt_feature compositor wayland_server) ) qt6-build_src_configure diff --git a/dev-qt/qtwayland/qtwayland-6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9999.ebuild index 7319f5b43fd6..517bfcaf25e0 100644 --- a/dev-qt/qtwayland/qtwayland-6.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.9999.ebuild @@ -11,14 +11,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="qml vulkan" +IUSE="compositor qml vulkan" RDEPEND=" dev-libs/wayland ~dev-qt/qtbase-${PV}:6[gui,opengl,vulkan=] media-libs/libglvnd x11-libs/libxkbcommon - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + compositor? ( + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + ) " DEPEND=" ${RDEPEND} @@ -38,6 +40,7 @@ CMAKE_SKIP_TESTS=( src_configure() { local mycmakeargs=( $(cmake_use_find_package qml Qt6Quick) + $(qt_feature compositor wayland_server) ) qt6-build_src_configure -- cgit v1.2.3