[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 5ec681f9ee0adb25951dcff4f1155f8853edb77d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 5 19:55:12 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 5 20:52:56 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5ec681f9
dev-qt/qtwayland: Re-add IUSE=vulkan to 5.15.12
Bug: https://bugs.gentoo.org/923722
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/metadata.xml | 1 +
dev-qt/qtwayland/qtwayland-5.15.12..ebuild | 19 ++-
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 9f58d4b4..835e5da0 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -7,6 +7,7 @@
Enable support for the wayland
compositor / server APIs
+ Enable support for Vulkan-based server
buffer integration
https://bugreports.qt.io/
diff --git a/dev-qt/qtwayland/qtwayland-5.15.12..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.12..ebuild
index 57fced44..c9d27b00 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.12..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.12..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,21 +13,18 @@ inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
SLOT=5/${QT5_PV} # bug 815646
-IUSE="compositor"
+IUSE="compositor vulkan"
RDEPEND="
dev-libs/wayland
=dev-qt/qtcore-${QT5_PV}*:5=
- =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput]
+ =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=]
media-libs/libglvnd
x11-libs/libxkbcommon
- compositor? (
- =dev-qt/qtdeclarative-${QT5_PV}*:5=
- =dev-qt/qtgui-${QT5_PV}*:5=[vulkan]
- )
+ compositor? ( =dev-qt/qtdeclarative-${QT5_PV}*:5= )
"
DEPEND="${RDEPEND}
- compositor? ( dev-util/vulkan-headers )
+ vulkan? ( dev-util/vulkan-headers )
"
BDEPEND="dev-util/wayland-scanner"
@@ -40,8 +37,12 @@ src_configure() {
$(qt_use compositor feature-wayland-dmabuf-server-buffer)
$(qt_use compositor feature-wayland-drm-egl-server-buffer)
$(qt_use compositor feature-wayland-shm-emulation-server-buffer)
- $(qt_use compositor feature-wayland-vulkan-server-buffer)
)
+
+ use compositor && myqmakeargs+=(
+ $(qt_use vulkan feature-wayland-vulkan-server-buffer)
+ )
+
qt5-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 0a2103f93577456a8035949ebe59edc25770d659
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 30 14:02:52 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 30 14:02:52 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0a2103f9
dev-qt/qtwayland: Rebased to 5.15.12 branch
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../{qtwayland-5.15.11..ebuild => qtwayland-5.15.12..ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.11..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.12..ebuild
similarity index 100%
rename from dev-qt/qtwayland/qtwayland-5.15.11..ebuild
rename to dev-qt/qtwayland/qtwayland-5.15.12..ebuild
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: ad15f67d7658ce30e57a694e27a6d38dc4b6f880
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Oct 8 13:03:57 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Oct 8 13:03:57 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ad15f67d
dev-qt/qtwayland: Add missing x11-libs/libxkbcommon dependency
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.15.11..ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.11..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.11..ebuild
index d9d8d573..57fced44 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.11..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.11..ebuild
@@ -20,6 +20,7 @@ RDEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput]
media-libs/libglvnd
+ x11-libs/libxkbcommon
compositor? (
=dev-qt/qtdeclarative-${QT5_PV}*:5=
=dev-qt/qtgui-${QT5_PV}*:5=[vulkan]
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: caf38f786ea54fa29dcfdb216576657b028fe8da
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Oct 7 19:27:26 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Oct 8 12:03:30 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=caf38f78
dev-qt/qtwayland: make compositor APIs off-by-default optional
Would have preferred a clean split but wayland-server depends on
wayland-client in the buildsys.
- Drop IUSE vulkan: Merge with 'compositor' instead. This absolves us from
having to make a default conflicting REQUIRED_USE with compositor.
- Drop IUSE X: Unused, broken upstream since 2021 and removed in Qt6.
Quoting upstream from commit d4a7faff:
"These plugins were created to allow testing/debugging of QtWayland-
based compositors on desktops that did not support Wayland natively."
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/metadata.xml | 2 +-
dev-qt/qtwayland/qtwayland-5.15.11..ebuild | 29 ++
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index a8ce9005..9f58d4b4 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -6,7 +6,7 @@
Gentoo Qt Project
- Enable support for Vulkan-based server
buffer integration
+ Enable support for the wayland
compositor / server APIs
https://bugreports.qt.io/
diff --git a/dev-qt/qtwayland/qtwayland-5.15.11..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.11..ebuild
index 46f3a900..d9d8d573 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.11..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.11..ebuild
@@ -13,30 +13,33 @@ inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
SLOT=5/${QT5_PV} # bug 815646
-IUSE="vulkan X"
+IUSE="compositor"
-DEPEND="
+RDEPEND="
dev-libs/wayland
=dev-qt/qtcore-${QT5_PV}*:5=
- =dev-qt/qtdeclarative-${QT5_PV}*:5=
- =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
+ =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput]
media-libs/libglvnd
- vulkan? ( dev-util/vulkan-headers )
- X? (
- =dev-qt/qtgui-${QT5_PV}*[-gles2-only]
- x11-libs/libX11
- x11-libs/libXcomposite
+ compositor? (
+ =dev-qt/qtdeclarative-${QT5_PV}*:5=
+ =dev-qt/qtgui-${QT5_PV}*:5=[vulkan]
)
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ compositor? ( dev-util/vulkan-headers )
+"
BDEPEND="dev-util/wayland-scanner"
src_configure() {
local myqmakeargs=(
--
- $(qt_use vulkan feature-wayland-vulkan-server-buffer)
- $(qt_use X feature-xcomposite-egl)
- $(qt_use X feature-xcomposite-glx)
+ -no-feature-xcomposite-egl
+ -no-feature-xcomposite-glx
+ $(qt_use compositor feature-wayland-server)
+ $(qt_use compositor feature-wayland-dmabuf-server-buffer)
+ $(qt_use compositor feature-wayland-drm-egl-server-buffer)
+ $(qt_use compositor feature-wayland-shm-emulation-server-buffer)
+ $(qt_use compositor feature-wayland-vulkan-server-buffer)
)
qt5-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 53c1bc9a6f0d9f242f8027cdda2d81324362a101
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 5 09:07:52 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 5 09:07:52 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=53c1bc9a
dev-qt/qtwayland: drop 6.4.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/Manifest | 1 -
dev-qt/qtwayland/qtwayland-6.4.0.ebuild | 22 --
2 files changed, 23 deletions(-)
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
deleted file mode 100644
index 1e44f0d0..
--- a/dev-qt/qtwayland/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtwayland-everywhere-src-6.4.0.tar.xz 836088 BLAKE2B
3efc506e1a0bc63182397d483bf352e21d39c75a7360ee3fe839527451950875748aea5cf62207ffef38b845a12c2bbbefde918d14333d1b194a4ea39b82670f
SHA512
745fcc84c936c3f2fa7382291b5013679f9e57d6c680f1d352b0a132ba7cbaaea1495211f8fc4f1af85a81c711794987e4e05284d3ac06c94e92e9b601dae924
diff --git a/dev-qt/qtwayland/qtwayland-6.4.0.ebuild
b/dev-qt/qtwayland/qtwayland-6.4.0.ebuild
deleted file mode 100644
index 09413e55..
--- a/dev-qt/qtwayland/qtwayland-6.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 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
-
-BDEPEND="dev-util/wayland-scanner"
-DEPEND="
- dev-libs/wayland
- =dev-qt/qtbase-${PV}*[gui,opengl]
- =dev-qt/qtdeclarative-${PV}*
- media-libs/libglvnd
- x11-libs/libxkbcommon
-"
-RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: e10f04361f98b6fcd0f65542ed71b1d278049b0c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 24 20:25:40 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 24 20:25:40 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e10f0436
dev-qt/qtwayland: drop 6.3.
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-6.3..ebuild | 22 --
1 file changed, 22 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-6.3..ebuild
b/dev-qt/qtwayland/qtwayland-6.3..ebuild
deleted file mode 100644
index 09413e55..
--- a/dev-qt/qtwayland/qtwayland-6.3..ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 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
-
-BDEPEND="dev-util/wayland-scanner"
-DEPEND="
- dev-libs/wayland
- =dev-qt/qtbase-${PV}*[gui,opengl]
- =dev-qt/qtdeclarative-${PV}*
- media-libs/libglvnd
- x11-libs/libxkbcommon
-"
-RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 731f623e4c9c6df3a95c6b9e7608845a5369260d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 24 14:42:40 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 24 14:42:40 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=731f623e
dev-qt/qtwayland: drop 6.3.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/Manifest | 1 -
dev-qt/qtwayland/qtwayland-6.3.2.ebuild | 22 --
2 files changed, 23 deletions(-)
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
deleted file mode 100644
index 590505ab..
--- a/dev-qt/qtwayland/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtwayland-everywhere-src-6.3.2.tar.xz 836192 BLAKE2B
3cb7c72c37d4b69a798cd14cc9aca694ba6ed01330e71772653e841717dcdd1c6e0d77597066647430e5f52dd5cd48636e1a6a2dcaadc2ab86a52be803c90f92
SHA512
475ba168bacb2d35a5962b27542f43420e3baf42d2026699b272174076ee6a26f8c3663ba8e44508f2011c5b7a2e4b3086390264cdf621b393c79fe89265bd03
diff --git a/dev-qt/qtwayland/qtwayland-6.3.2.ebuild
b/dev-qt/qtwayland/qtwayland-6.3.2.ebuild
deleted file mode 100644
index 09413e55..
--- a/dev-qt/qtwayland/qtwayland-6.3.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 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
-
-BDEPEND="dev-util/wayland-scanner"
-DEPEND="
- dev-libs/wayland
- =dev-qt/qtbase-${PV}*[gui,opengl]
- =dev-qt/qtdeclarative-${PV}*
- media-libs/libglvnd
- x11-libs/libxkbcommon
-"
-RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: d30a5f510f53b71ecb86091024dde62e2919f943
Author: Jimi Huotari gentoo org>
AuthorDate: Mon Jun 20 17:16:27 2022 +
Commit: Jimi Huotari gentoo org>
CommitDate: Mon Jun 20 18:02:05 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d30a5f51
dev-qt/qtwayland: add wayland-scanner dependency for qt6
As requested at: https://github.com/gentoo/gentoo/pull/25635
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari gentoo.org>
dev-qt/qtwayland/qtwayland-6.3.1.ebuild| 1 +
dev-qt/qtwayland/qtwayland-6.3..ebuild | 1 +
dev-qt/qtwayland/qtwayland-6..ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtwayland/qtwayland-6.3.1.ebuild
b/dev-qt/qtwayland/qtwayland-6.3.1.ebuild
index 14b556b1..09413e55 100644
--- a/dev-qt/qtwayland/qtwayland-6.3.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.3.1.ebuild
@@ -11,6 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
+BDEPEND="dev-util/wayland-scanner"
DEPEND="
dev-libs/wayland
=dev-qt/qtbase-${PV}*[gui,opengl]
diff --git a/dev-qt/qtwayland/qtwayland-6.3..ebuild
b/dev-qt/qtwayland/qtwayland-6.3..ebuild
index 14b556b1..09413e55 100644
--- a/dev-qt/qtwayland/qtwayland-6.3..ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.3..ebuild
@@ -11,6 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
+BDEPEND="dev-util/wayland-scanner"
DEPEND="
dev-libs/wayland
=dev-qt/qtbase-${PV}*[gui,opengl]
diff --git a/dev-qt/qtwayland/qtwayland-6..ebuild
b/dev-qt/qtwayland/qtwayland-6..ebuild
index 14b556b1..09413e55 100644
--- a/dev-qt/qtwayland/qtwayland-6..ebuild
+++ b/dev-qt/qtwayland/qtwayland-6..ebuild
@@ -11,6 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
+BDEPEND="dev-util/wayland-scanner"
DEPEND="
dev-libs/wayland
=dev-qt/qtbase-${PV}*[gui,opengl]
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 164d4a8ff0d18a9a84e9b0ca9e1becbad6721e72
Author: WANG Xuerui gentoo org>
AuthorDate: Wed May 25 11:17:40 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 18 14:21:55 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=164d4a8f
dev-qt/qtwayland: keyword 5.15.5. for ~loong
See: https://github.com/xen0n/loongson-overlay/pull/25
Tested-by: HougeLangley gmail.com>
Signed-off-by: WANG Xuerui gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.15.5..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.5..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.5..ebuild
index e45f03de..ee7fc050 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.5..ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Wayland platform plugin for Qt"
SLOT=5/${QT5_PV} # bug 815646
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
fi
IUSE="vulkan X"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 824c022390af83a9deabf21306c188bdabcf650e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat May 14 21:08:28 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat May 14 21:14:24 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=824c0223
dev-qt/qtwayland: Rebased to 5.15.4 branch
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../{qtwayland-5.15.3..ebuild => qtwayland-5.15.4..ebuild}| 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.3..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.4..ebuild
similarity index 100%
rename from dev-qt/qtwayland/qtwayland-5.15.3..ebuild
rename to dev-qt/qtwayland/qtwayland-5.15.4..ebuild
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: cc0782fc941179d3c378ca8f23717218e36836d3
Author: Jimi Huotari gentoo org>
AuthorDate: Wed Apr 27 20:25:57 2022 +
Commit: Jimi Huotari gentoo org>
CommitDate: Wed Apr 27 20:26:39 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=cc0782fc
dev-qt/qtwayland: add version 6*
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari gentoo.org>
dev-qt/qtwayland/Manifest | 1 +
dev-qt/qtwayland/qtwayland-6.3.0.ebuild| 21 +
dev-qt/qtwayland/qtwayland-6.3..ebuild | 21 +
dev-qt/qtwayland/qtwayland-6..ebuild | 21 +
4 files changed, 64 insertions(+)
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
new file mode 100644
index ..f7368b6d
--- /dev/null
+++ b/dev-qt/qtwayland/Manifest
@@ -0,0 +1 @@
+DIST qtwayland-everywhere-src-6.3.0.tar.xz 835420 BLAKE2B
4efce671030d2662b291d04291e80ef1784d3616c26581293779511adff9cfba8007925a0b9b2c5dec938a813e49f3e786021bac145ac49477600b7fddda926d
SHA512
0c64b114c5b3edd2b278f03dbc46aa1907e5accf4c9512cc0b594f6a58571eb023541a3bc0185aec24367d9e6e675e32999bc5ac4f0ac671b09100e86add4cd6
diff --git a/dev-qt/qtwayland/qtwayland-6.3.0.ebuild
b/dev-qt/qtwayland/qtwayland-6.3.0.ebuild
new file mode 100644
index ..14b556b1
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-6.3.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 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
+
+DEPEND="
+ dev-libs/wayland
+ =dev-qt/qtbase-${PV}*[gui,opengl]
+ =dev-qt/qtdeclarative-${PV}*
+ media-libs/libglvnd
+ x11-libs/libxkbcommon
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwayland/qtwayland-6.3..ebuild
b/dev-qt/qtwayland/qtwayland-6.3..ebuild
new file mode 100644
index ..14b556b1
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-6.3..ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 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
+
+DEPEND="
+ dev-libs/wayland
+ =dev-qt/qtbase-${PV}*[gui,opengl]
+ =dev-qt/qtdeclarative-${PV}*
+ media-libs/libglvnd
+ x11-libs/libxkbcommon
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwayland/qtwayland-6..ebuild
b/dev-qt/qtwayland/qtwayland-6..ebuild
new file mode 100644
index ..14b556b1
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-6..ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 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
+
+DEPEND="
+ dev-libs/wayland
+ =dev-qt/qtbase-${PV}*[gui,opengl]
+ =dev-qt/qtdeclarative-${PV}*
+ media-libs/libglvnd
+ x11-libs/libxkbcommon
+"
+RDEPEND="${DEPEND}"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 47117a1902e026ea0be4e9b11a6cab74ccc415a5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Feb 17 18:33:44 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 12 14:06:40 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=47117a19
dev-qt/qtwayland: Drop install of qtwaylandscanner
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.15.3..ebuild | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.3..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.3..ebuild
index 7ecd5279..e45f03de 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.3..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.3..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -41,3 +41,8 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+ rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
+}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: aec0e82a2672e891831559049203f983a6d2d41c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 4 09:39:41 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 4 09:39:41 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=aec0e82a
dev-qt/qtwayland: Rebased to 5.15.3 branch
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../{qtwayland-5.15.2..ebuild => qtwayland-5.15.3..ebuild}| 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.3..ebuild
similarity index 100%
rename from dev-qt/qtwayland/qtwayland-5.15.2..ebuild
rename to dev-qt/qtwayland/qtwayland-5.15.3..ebuild
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 36b75f925c082a01ab9c0d20226bd2c73bcc8a16
Author: Davide Pesavento gentoo org>
AuthorDate: Thu Oct 21 00:15:37 2021 +
Commit: Davide Pesavento gentoo org>
CommitDate: Thu Oct 21 00:15:37 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=36b75f92
dev-qt/qtwayland: drop redundant/indirect dep on libxkbcommon
qtwayland uses libxkbcommon only through qtgui's QtXkbCommonSupport.
There are some conditional code paths depending on QT_CONFIG(xkbcommon)
but the latter is already force-enabled via qtgui[libinput].
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento gentoo.org>
dev-qt/qtwayland/qtwayland-5.15.2..ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
index 0e26d41f..7ecd5279 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
@@ -20,7 +20,6 @@ DEPEND="
=dev-qt/qtdeclarative-${QT5_PV}*:5=
=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
media-libs/libglvnd
- x11-libs/libxkbcommon
vulkan? ( dev-util/vulkan-headers )
X? (
=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 62332410050ad50c0751ab255531c23531096207
Author: Davide Pesavento gentoo org>
AuthorDate: Wed Oct 20 23:48:13 2021 +
Commit: Davide Pesavento gentoo org>
CommitDate: Wed Oct 20 23:48:13 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=62332410
dev-qt/qtwayland: add missing dep on dev-util/wayland-scanner
Bug: https://bugs.gentoo.org/818997
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento gentoo.org>
dev-qt/qtwayland/qtwayland-5.15.2..ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
index 6b0c9b9c..0e26d41f 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
@@ -29,6 +29,9 @@ DEPEND="
)
"
RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-util/wayland-scanner
+"
src_configure() {
local myqmakeargs=(
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 71fa0ab23155e978d0e8d945bcbef8df7dfcfee8
Author: Davide Pesavento gentoo org>
AuthorDate: Sat Oct 16 23:15:36 2021 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sat Oct 16 23:15:36 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=71fa0ab2
dev-qt/qtwayland: simplify depend atom
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento gentoo.org>
dev-qt/qtwayland/qtwayland-5.15.2..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
index b680c42c..6b0c9b9c 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
@@ -20,7 +20,7 @@ DEPEND="
=dev-qt/qtdeclarative-${QT5_PV}*:5=
=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
media-libs/libglvnd
- >=x11-libs/libxkbcommon-0.2.0
+ x11-libs/libxkbcommon
vulkan? ( dev-util/vulkan-headers )
X? (
=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 4d770b30a57b8f36bdd4c1e7851b427f642ac3e6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Oct 2 14:09:03 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Oct 3 12:39:14 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4d770b30
dev-qt/qtwayland: More fine-grained subslot
Bug: https://bugs.gentoo.org/806797
Bug: https://bugs.gentoo.org/815646
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.15.2..ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
index b403369c..b680c42c 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
@@ -6,6 +6,7 @@ EAPI=8
inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
+SLOT=5/${QT5_PV} # bug 815646
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: e9b274c39fc3323901fef57b8f9c23e067fe9c79
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 15 18:10:22 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 22 07:10:55 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e9b274c3
dev-qt/qtwayland: Replace media-libs/{mesa[egl] -> libglvnd}
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.15.2..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
index 6ec43e20..b403369c 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2..ebuild
@@ -18,7 +18,7 @@ DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
=dev-qt/qtdeclarative-${QT5_PV}*:5=
=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
- media-libs/mesa[egl]
+ media-libs/libglvnd
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
X? (
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 83a89072526e19defc606e2a2cbe07aedcd98b1d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 26 10:51:25 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Aug 27 11:40:45 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=83a89072
dev-qt/qtwayland: Add USEdep on dev-qt/qtgui[X] for IUSE="X"
Bug: https://bugs.gentoo.org/810343
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.15..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index e5b5c621..fb5f576a 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..ebuild
@@ -17,7 +17,7 @@ DEPEND="
dev-libs/wayland
~dev-qt/qtcore-${PV}:5=
~dev-qt/qtdeclarative-${PV}:5=
- ~dev-qt/qtgui-${PV}:5=[egl,libinput,vulkan=]
+ ~dev-qt/qtgui-${PV}:5=[egl,libinput,vulkan=,X?]
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 5265e227f1499045b938a3f875de14d1a5bcd781 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 19 18:38:04 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 20 12:34:10 2021 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5265e227 dev-qt/qtwayland: EAPI-8 bump Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwayland/qtwayland-5.15..ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtwayland/qtwayland-5.15..ebuild b/dev-qt/qtwayland/qtwayland-5.15..ebuild index 83de2ff7..e5b5c621 100644 --- a/dev-qt/qtwayland/qtwayland-5.15..ebuild +++ b/dev-qt/qtwayland/qtwayland-5.15..ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qt5-build
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: b1696d43af231e86b23674d57c27a9ffa0ace7c7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 25 20:49:31 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 25 20:49:31 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b1696d43
dev-qt/qtwayland: Cleanup obsolete minimum dev-libs/wayland version
Even the latest upstream requirement was dropped from Gentoo ebuild
repository many years ago.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.15..ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index f15c3b42..2ae0db4d 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..ebuild
@@ -14,7 +14,7 @@ fi
IUSE="vulkan X"
DEPEND="
- >=dev-libs/wayland-1.6.0
+ dev-libs/wayland
~dev-qt/qtcore-${PV}:5=
~dev-qt/qtdeclarative-${PV}:5=
~dev-qt/qtgui-${PV}:5=[egl,libinput,vulkan=]
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 3d428620736d6f798c62f274a14d42cdd2543f0c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 29 01:15:18 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 29 01:18:44 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3d428620
dev-qt/qtwayland: Add missing slot ops
Package is using private headers from qtcore, qtdeclarative, qtgui.
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.15..ebuild | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index e2924071..b0953bab 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
@@ -14,9 +15,9 @@ IUSE="vulkan X"
DEPEND="
>=dev-libs/wayland-1.6.0
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
+ ~dev-qt/qtcore-${PV}:5=
+ ~dev-qt/qtdeclarative-${PV}:5=
+ ~dev-qt/qtgui-${PV}:5=[egl,libinput,vulkan=]
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 52e4b457cc4bcf3458cfc17a3aef998e5343c140
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Thu Apr 16 13:12:19 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 16 19:31:57 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=52e4b457
dev-qt/qtwayland: keyworded 5.14.2 for sparc
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.14..ebuild | 2 +-
dev-qt/qtwayland/qtwayland-5.15..ebuild | 2 +-
dev-qt/qtwayland/qtwayland-5..ebuild| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.14..ebuild
b/dev-qt/qtwayland/qtwayland-5.14..ebuild
index 00131b6e..03b11bd2 100644
--- a/dev-qt/qtwayland/qtwayland-5.14..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14..ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
IUSE="vulkan X"
diff --git a/dev-qt/qtwayland/qtwayland-5.15..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index 3edb9436..e2924071 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
IUSE="vulkan X"
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index 3edb9436..e2924071 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
IUSE="vulkan X"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/, dev-qt/qtsql/, dev-qt/qtserialport/, ...
commit: 073fb0d9d0e1b507a9cf6a50d17520ec79936ba9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Apr 6 22:06:08 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Apr 6 22:06:08 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=073fb0d9 dev-qt: Add Qt 5.15.0_beta3 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/assistant/Manifest | 1 + dev-qt/assistant/assistant-5.15.0_beta3.ebuild | 55 ++ dev-qt/designer/Manifest | 1 + dev-qt/designer/designer-5.15.0_beta3.ebuild | 57 +++ dev-qt/linguist-tools/Manifest | 1 + .../linguist-tools-5.15.0_beta3.ebuild | 35 dev-qt/linguist/Manifest | 1 + dev-qt/linguist/linguist-5.15.0_beta3.ebuild | 48 ++ dev-qt/pixeltool/Manifest | 1 + dev-qt/pixeltool/pixeltool-5.15.0_beta3.ebuild | 25 +++ dev-qt/qdbus/Manifest | 1 + dev-qt/qdbus/qdbus-5.15.0_beta3.ebuild | 25 +++ dev-qt/qdbusviewer/Manifest| 1 + dev-qt/qdbusviewer/qdbusviewer-5.15.0_beta3.ebuild | 45 + dev-qt/qdoc/Manifest | 1 + dev-qt/qdoc/qdoc-5.15.0_beta3.ebuild | 40 + dev-qt/qt3d/Manifest | 1 + dev-qt/qt3d/qt3d-5.15.0_beta3.ebuild | 34 dev-qt/qtbluetooth/Manifest| 1 + dev-qt/qtbluetooth/qtbluetooth-5.15.0_beta3.ebuild | 33 dev-qt/qtcharts/Manifest | 1 + dev-qt/qtcharts/qtcharts-5.15.0_beta3.ebuild | 29 dev-qt/qtconcurrent/Manifest | 1 + .../qtconcurrent/qtconcurrent-5.15.0_beta3.ebuild | 23 +++ dev-qt/qtcore/Manifest | 1 + dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild | 85 ++ dev-qt/qtdatavis3d/Manifest| 1 + dev-qt/qtdatavis3d/qtdatavis3d-5.15.0_beta3.ebuild | 31 dev-qt/qtdbus/Manifest | 1 + dev-qt/qtdbus/qtdbus-5.15.0_beta3.ebuild | 43 + dev-qt/qtdeclarative/Manifest | 1 + .../qtdeclarative-5.15.0_beta3.ebuild | 53 ++ dev-qt/qtdiag/Manifest | 1 + dev-qt/qtdiag/qtdiag-5.15.0_beta3.ebuild | 36 dev-qt/qtgamepad/Manifest | 1 + dev-qt/qtgamepad/qtgamepad-5.15.0_beta3.ebuild | 35 dev-qt/qtgraphicaleffects/Manifest | 1 + .../qtgraphicaleffects-5.15.0_beta3.ebuild | 21 +++ dev-qt/qtgui/Manifest | 1 + dev-qt/qtgui/qtgui-5.15.0_beta3.ebuild | 184 + dev-qt/qthelp/Manifest | 1 + dev-qt/qthelp/qthelp-5.15.0_beta3.ebuild | 29 dev-qt/qtimageformats/Manifest | 1 + .../qtimageformats-5.15.0_beta3.ebuild | 30 dev-qt/qtlocation/Manifest | 1 + dev-qt/qtlocation/qtlocation-5.15.0_beta3.ebuild | 46 ++ dev-qt/qtmultimedia/Manifest | 1 + .../qtmultimedia/qtmultimedia-5.15.0_beta3.ebuild | 68 dev-qt/qtnetwork/Manifest | 1 + dev-qt/qtnetwork/qtnetwork-5.15.0_beta3.ebuild | 60 +++ dev-qt/qtnetworkauth/Manifest | 1 + .../qtnetworkauth-5.15.0_beta3.ebuild | 20 +++ dev-qt/qtopengl/Manifest | 1 + dev-qt/qtopengl/qtopengl-5.15.0_beta3.ebuild | 34 dev-qt/qtpaths/Manifest| 1 + dev-qt/qtpaths/qtpaths-5.15.0_beta3.ebuild | 23 +++ dev-qt/qtplugininfo/Manifest | 1 + .../qtplugininfo/qtplugininfo-5.15.0_beta3.ebuild | 23 +++ dev-qt/qtpositioning/Manifest | 1 + .../qtpositioning-5.15.0_beta3.ebuild | 40 + dev-qt/qtprintsupport/Manifest | 1 + .../qtprintsupport-5.15.0_beta3.ebuild | 42 + dev-qt/qtquickcontrols/Manifest| 1 + .../qtquickcontrols-5.15.0_beta3.ebuild| 32 dev-qt/qtquickcontrols2/Manifest | 1 + .../qtquickcontrols2-5.15.0_beta3.ebuild | 30 dev-qt/qtscript/Manifest | 1 + dev-qt/qtscript/qtscript-5.15.0_beta3.ebuild | 36 dev-qt/qtscxml/Manifest| 1 + dev-qt/qtscxml/qtscxml-5.15.0_beta3.ebuild | 19 +++ dev-qt/qtsensors/Manifest | 1 + dev-qt/qtsensors/qtsensors-5.15.0_beta3.ebuild | 28 dev-qt/qtserialbus/Manifest| 1 +
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: df92520291c791323a1724f3bd7550925ef65c5a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 21 13:07:18 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 2 18:09:22 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=df925202
dev-qt/qtwayland: rename USE=gles2 to USE=gles2-only
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.14..ebuild | 2 +-
dev-qt/qtwayland/qtwayland-5.15..ebuild | 2 +-
dev-qt/qtwayland/qtwayland-5..ebuild| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.14..ebuild
b/dev-qt/qtwayland/qtwayland-5.14..ebuild
index 750d316d..00131b6e 100644
--- a/dev-qt/qtwayland/qtwayland-5.14..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14..ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
X? (
- ~dev-qt/qtgui-${PV}[-gles2]
+ ~dev-qt/qtgui-${PV}[-gles2-only]
x11-libs/libX11
x11-libs/libXcomposite
)
diff --git a/dev-qt/qtwayland/qtwayland-5.15..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index 639828bf..3edb9436 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
X? (
- ~dev-qt/qtgui-${PV}[-gles2]
+ ~dev-qt/qtgui-${PV}[-gles2-only]
x11-libs/libX11
x11-libs/libXcomposite
)
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index 639828bf..3edb9436 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
X? (
- ~dev-qt/qtgui-${PV}[-gles2]
+ ~dev-qt/qtgui-${PV}[-gles2-only]
x11-libs/libX11
x11-libs/libXcomposite
)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 678cb1240d935c417d471813522ca72baba91b7d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 21 13:07:18 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 21 17:25:28 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=678cb124
dev-qt/qtwayland: USE X requires dev-qt/qtgui[-gles2]
Closes: https://bugs.gentoo.org/713362
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.14..ebuild | 1 +
dev-qt/qtwayland/qtwayland-5.15..ebuild | 1 +
dev-qt/qtwayland/qtwayland-5..ebuild| 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtwayland/qtwayland-5.14..ebuild
b/dev-qt/qtwayland/qtwayland-5.14..ebuild
index 391ab67a..750d316d 100644
--- a/dev-qt/qtwayland/qtwayland-5.14..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14..ebuild
@@ -21,6 +21,7 @@ DEPEND="
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
X? (
+ ~dev-qt/qtgui-${PV}[-gles2]
x11-libs/libX11
x11-libs/libXcomposite
)
diff --git a/dev-qt/qtwayland/qtwayland-5.15..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index 36cfd4d6..639828bf 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..ebuild
@@ -21,6 +21,7 @@ DEPEND="
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
X? (
+ ~dev-qt/qtgui-${PV}[-gles2]
x11-libs/libX11
x11-libs/libXcomposite
)
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index 36cfd4d6..639828bf 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -21,6 +21,7 @@ DEPEND="
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
X? (
+ ~dev-qt/qtgui-${PV}[-gles2]
x11-libs/libX11
x11-libs/libXcomposite
)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: de3b53dae6281b4cc3d0850627bf500bde60f6b7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 17 22:53:25 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 18 21:36:36 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=de3b53da
dev-qt/qtwayland: Sync recent changes to 5.
- 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 gentoo.org>
dev-qt/qtwayland/metadata.xml| 1 -
dev-qt/qtwayland/qtwayland-5..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 @@
Gentoo Qt Project
- Enable support for input devices via
dev-libs/libinput
Enable support for Vulkan-based server
buffer integration
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index ac4fdc11..36cfd4d6 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..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
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: ecfd89006795c61ad4d7b97a3b9ba93e01a8238b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Mar 18 21:34:47 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 18 21:36:36 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ecfd8900
dev-qt/qtwayland: Use config switch for USE vulkan
Thanks-to: Jimi Huotari gentoo.org>
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.14..ebuild | 5 +
dev-qt/qtwayland/qtwayland-5.15..ebuild | 9 +
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.14..ebuild
b/dev-qt/qtwayland/qtwayland-5.14..ebuild
index c190d0e5..391ab67a 100644
--- a/dev-qt/qtwayland/qtwayland-5.14..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14..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..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index 67e16940..36cfd4d6 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..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)
)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 1482fbb5e09dab1f4a38d5c611fd658d4151ec3c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 17 22:51:43 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 18 21:35:00 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1482fbb5
dev-qt/qtwayland: Fix and rename USE xcomposite to X
Add missing config switches.
Thanks-to: Jimi Huotari gentoo.org>
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.14..ebuild | 15 ---
dev-qt/qtwayland/qtwayland-5.15..ebuild | 13 +++--
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.14..ebuild
b/dev-qt/qtwayland/qtwayland-5.14..ebuild
index 474000fb..c190d0e5 100644
--- a/dev-qt/qtwayland/qtwayland-5.14..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14..ebuild
@@ -10,7 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="vulkan xcomposite"
+IUSE="vulkan X"
DEPEND="
>=dev-libs/wayland-1.6.0
@@ -20,7 +20,7 @@ DEPEND="
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
- xcomposite? (
+ X? (
x11-libs/libX11
x11-libs/libXcomposite
)
@@ -32,7 +32,16 @@ src_prepare() {
src/plugins/hardwareintegration/client/client.pro \
src/plugins/hardwareintegration/compositor/compositor.pro
- use xcomposite || rm -r config.tests/xcomposite || die
+ use X || rm -r config.tests/xcomposite || die
qt5-build_src_prepare
}
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ $(qt_use X feature-xcomposite-egl)
+ $(qt_use X feature-xcomposite-glx)
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtwayland/qtwayland-5.15..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index 52fb0bcb..67e16940 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..ebuild
@@ -10,7 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="vulkan xcomposite"
+IUSE="vulkan X"
DEPEND="
>=dev-libs/wayland-1.6.0
@@ -20,7 +20,7 @@ DEPEND="
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
- xcomposite? (
+ X? (
x11-libs/libX11
x11-libs/libXcomposite
)
@@ -34,3 +34,12 @@ src_prepare() {
qt5-build_src_prepare
}
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ $(qt_use X feature-xcomposite-egl)
+ $(qt_use X feature-xcomposite-glx)
+ )
+ qt5-build_src_configure
+}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 085ca84d81440d0d31296a0f99e8b72920099ac4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 17 22:36:41 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 18 11:06:55 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=085ca84d
dev-qt/qtwayland: Drop USE libinput
USE -libinput is broken with dev-qt/qtgui[-libinput,X], would also need -X.
Closes: https://bugs.gentoo.org/711476
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.14..ebuild | 14 ++
dev-qt/qtwayland/qtwayland-5.15..ebuild | 14 ++
2 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.14..ebuild
b/dev-qt/qtwayland/qtwayland-5.14..ebuild
index 5fa75b67..474000fb 100644
--- a/dev-qt/qtwayland/qtwayland-5.14..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14..ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="+libinput vulkan xcomposite"
+IUSE="vulkan xcomposite"
DEPEND="
>=dev-libs/wayland-1.6.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl,libinput=,vulkan=]
+ ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
@@ -28,16 +28,6 @@ DEPEND="
RDEPEND="${DEPEND}"
src_prepare() {
- qt_use_disable_config libinput xkbcommon \
- 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
-
qt_use_disable_config vulkan wayland-vulkan-server-buffer \
src/plugins/hardwareintegration/client/client.pro \
src/plugins/hardwareintegration/compositor/compositor.pro
diff --git a/dev-qt/qtwayland/qtwayland-5.15..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index 0f7e93ca..52fb0bcb 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="+libinput vulkan xcomposite"
+IUSE="vulkan xcomposite"
DEPEND="
>=dev-libs/wayland-1.6.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl,libinput=,vulkan=]
+ ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
vulkan? ( dev-util/vulkan-headers )
@@ -28,16 +28,6 @@ DEPEND="
RDEPEND="${DEPEND}"
src_prepare() {
- qt_use_disable_config libinput xkbcommon \
- 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
-
qt_use_disable_config vulkan wayland-vulkan-server-buffer \
src/plugins/hardwareintegration/client/client.pro \
src/plugins/hardwareintegration/compositor/compositor.pro
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 6878e3e22339f965e33f9cedc435542a7728c425
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 26 19:22:05 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Feb 28 09:59:11 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6878e3e2
dev-qt/qtwayland: Fix USE libinput
Upstream commit a8fed201
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.14..ebuild | 4 ++--
dev-qt/qtwayland/qtwayland-5.15..ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.14..ebuild
b/dev-qt/qtwayland/qtwayland-5.14..ebuild
index ac4fdc11..0602db2f 100644
--- a/dev-qt/qtwayland/qtwayland-5.14..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14..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
@@ -27,7 +27,7 @@ DEPEND="
RDEPEND="${DEPEND}"
src_prepare() {
- qt_use_disable_config libinput xkbcommon-evdev \
+ qt_use_disable_config libinput xkbcommon \
src/client/client.pro \
src/compositor/wayland_wrapper/wayland_wrapper.pri \
src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
diff --git a/dev-qt/qtwayland/qtwayland-5.15..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index 30d80e6b..5e2e0a8c 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..ebuild
@@ -27,7 +27,7 @@ DEPEND="
RDEPEND="${DEPEND}"
src_prepare() {
- qt_use_disable_config libinput xkbcommon-evdev \
+ qt_use_disable_config libinput xkbcommon \
src/client/client.pro \
src/compositor/wayland_wrapper/wayland_wrapper.pri \
src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 14ee15e92aa9df567c0e7245b4e83190fc7ebab7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 26 20:37:41 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Feb 28 10:07:43 2020 +
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..ebuild | 9 +++--
dev-qt/qtwayland/qtwayland-5.15..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..ebuild
b/dev-qt/qtwayland/qtwayland-5.14..ebuild
index 0602db2f..5fa75b67 100644
--- a/dev-qt/qtwayland/qtwayland-5.14..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14..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..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index 5e2e0a8c..0f7e93ca 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..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
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: e96fea3eedeb3427a19b1a1f8e532db5bb7fe05f
Author: Jimi Huotari gentoo org>
AuthorDate: Wed Jan 22 12:21:36 2020 +
Commit: Jimi Huotari gentoo org>
CommitDate: Wed Jan 22 12:25:09 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e96fea3e
dev-qt/qtwayland: remove 'xcomposite' tests related bits from 5.15
These have been dropped in upstream commit 9e875410 [1].
1. https://code.qt.io/cgit/qt/qtwayland.git/diff/?h=5.15=9e875410
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jimi Huotari gentoo.org>
dev-qt/qtwayland/qtwayland-5.15..ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.15..ebuild
b/dev-qt/qtwayland/qtwayland-5.15..ebuild
index ac4fdc11..30d80e6b 100644
--- a/dev-qt/qtwayland/qtwayland-5.15..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15..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
@@ -37,7 +37,5 @@ src_prepare() {
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
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/files/
commit: a98589b15d96854c7654fa0e9bed5625ed5a6ee3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 18 15:33:10 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 18 15:33:10 2019 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a98589b1 dev-qt/qtwayland: Drop unused patch Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../qtwayland-5.13.2-fix-linuxdmabuf-build.patch | 29 -- 1 file changed, 29 deletions(-) diff --git a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch deleted file mode 100644 index f9b6b657.. --- a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 23ea5504200ff5f7e40bd264280a78db09c1bc5b Mon Sep 17 00:00:00 2001 -From: Johan Klokkhammer Helsing -Date: Fri, 8 Nov 2019 13:58:04 +0100 -Subject: [PATCH] WIP: Fix compilation of linuxdmabuf compositor plugin - -WIP, because I'm not sure if this is the way to go, but it fixes -compilation on my machine. - -Fixes: QTBUG-79709 -Change-Id: I3190ef56e0e162636efea440dff7e760cf11fcd0 - .../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h| 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h -index 2abc2ce6b..d1f4a3039 100644 a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h -+++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h -@@ -53,6 +53,7 @@ - - #include - #include -+#include - - // compatibility with libdrm <= 2.4.74 - #ifndef DRM_FORMAT_RESERVED --- -2.16.3 -
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/files/, dev-qt/qtwayland/
commit: c44760bfd0fa7f8bb9d31a06346fb9367795ba56
Author: Jimi Huotari gentoo org>
AuthorDate: Sun Nov 24 23:19:55 2019 +
Commit: Jimi Huotari gentoo org>
CommitDate: Sun Nov 24 23:19:55 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c44760bf
dev-qt/qtwayland: fix build with >=media-libs/mesa-19.3.0_rc4
Bug: https://bugs.gentoo.org/700832
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jimi Huotari gentoo.org>
.../qtwayland-5.13.2-fix-linuxdmabuf-build.patch | 29 ++
dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild | 2 ++
2 files changed, 31 insertions(+)
diff --git
a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch
b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch
new file mode 100644
index ..f9b6b657
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch
@@ -0,0 +1,29 @@
+From 23ea5504200ff5f7e40bd264280a78db09c1bc5b Mon Sep 17 00:00:00 2001
+From: Johan Klokkhammer Helsing
+Date: Fri, 8 Nov 2019 13:58:04 +0100
+Subject: [PATCH] WIP: Fix compilation of linuxdmabuf compositor plugin
+
+WIP, because I'm not sure if this is the way to go, but it fixes
+compilation on my machine.
+
+Fixes: QTBUG-79709
+Change-Id: I3190ef56e0e162636efea440dff7e760cf11fcd0
+---
+ .../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h| 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git
a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+index 2abc2ce6b..d1f4a3039 100644
+--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+@@ -53,6 +53,7 @@
+
+ #include
+ #include
++#include
+
+ // compatibility with libdrm <= 2.4.74
+ #ifndef DRM_FORMAT_RESERVED
+--
+2.16.3
+
diff --git a/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild
b/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild
index ac4fdc11..921cad2b 100644
--- a/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild
@@ -26,6 +26,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-5.13.2-fix-linuxdmabuf-build.patch" )
+
src_prepare() {
qt_use_disable_config libinput xkbcommon-evdev \
src/client/client.pro \
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 72dc7c9f1dad238b15b9d68c48c9c46267af7d9d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 3 18:55:48 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Dec 5 22:16:55 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=72dc7c9f
dev-qt/qtwayland: Cover new sightings of xkbcommon-evdev
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-qt/qtwayland/qtwayland-5.12.0_rc.ebuild | 4
dev-qt/qtwayland/qtwayland-5.12..ebuild | 6 +-
dev-qt/qtwayland/qtwayland-5..ebuild| 6 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.12.0_rc.ebuild
b/dev-qt/qtwayland/qtwayland-5.12.0_rc.ebuild
index 1379e01e..d7a70086 100644
--- a/dev-qt/qtwayland/qtwayland-5.12.0_rc.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.12.0_rc.ebuild
@@ -31,6 +31,10 @@ src_prepare() {
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
diff --git a/dev-qt/qtwayland/qtwayland-5.12..ebuild
b/dev-qt/qtwayland/qtwayland-5.12..ebuild
index 3a5d6261..d7a70086 100644
--- a/dev-qt/qtwayland/qtwayland-5.12..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.12..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -31,6 +31,10 @@ src_prepare() {
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
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index 3a5d6261..d7a70086 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -31,6 +31,10 @@ src_prepare() {
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
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 2157bc10c7db702ca2bc10fd1f44fa13136ca36e
Author: Andreas Sturmlechner gmail com>
AuthorDate: Wed Dec 5 12:48:17 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Dec 5 22:16:26 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2157bc10
dev-qt/qtwayland: Fix build with USE -libinput
Bug: https://bugs.gentoo.org/616522
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-qt/qtwayland/qtwayland-5.11..ebuild | 4 ++--
dev-qt/qtwayland/qtwayland-5.12.0_rc.ebuild | 2 +-
dev-qt/qtwayland/qtwayland-5.12..ebuild | 2 +-
dev-qt/qtwayland/qtwayland-5.9..ebuild | 4 ++--
dev-qt/qtwayland/qtwayland-5..ebuild| 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.11..ebuild
b/dev-qt/qtwayland/qtwayland-5.11..ebuild
index 4c355304..1379e01e 100644
--- a/dev-qt/qtwayland/qtwayland-5.11..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ 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=]
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
diff --git a/dev-qt/qtwayland/qtwayland-5.12.0_rc.ebuild
b/dev-qt/qtwayland/qtwayland-5.12.0_rc.ebuild
index ff62f71d..1379e01e 100644
--- a/dev-qt/qtwayland/qtwayland-5.12.0_rc.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.12.0_rc.ebuild
@@ -16,7 +16,7 @@ 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=]
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
diff --git a/dev-qt/qtwayland/qtwayland-5.12..ebuild
b/dev-qt/qtwayland/qtwayland-5.12..ebuild
index 4c355304..3a5d6261 100644
--- a/dev-qt/qtwayland/qtwayland-5.12..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.12..ebuild
@@ -16,7 +16,7 @@ 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=]
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
diff --git a/dev-qt/qtwayland/qtwayland-5.9..ebuild
b/dev-qt/qtwayland/qtwayland-5.9..ebuild
index 4c355304..1379e01e 100644
--- a/dev-qt/qtwayland/qtwayland-5.9..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ 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=]
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index 4c355304..3a5d6261 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -16,7 +16,7 @@ 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=]
media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 2220fff71ccdf7679ee2fd012357d9eff44b2857
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Jan 26 11:45:16 2018 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Jan 26 11:45:37 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=2220fff7
dev-qt/qtwayland: restore ~arm64 keyword
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-qt/qtwayland/qtwayland-5.10.0.ebuild| 4 ++--
dev-qt/qtwayland/qtwayland-5.10..ebuild | 4 ++--
dev-qt/qtwayland/qtwayland-5.11..ebuild | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.10.0.ebuild
b/dev-qt/qtwayland/qtwayland-5.10.0.ebuild
index 0629d749..4c355304 100644
--- a/dev-qt/qtwayland/qtwayland-5.10.0.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwayland/qtwayland-5.10..ebuild
b/dev-qt/qtwayland/qtwayland-5.10..ebuild
index 0629d749..4c355304 100644
--- a/dev-qt/qtwayland/qtwayland-5.10..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.10..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwayland/qtwayland-5.11..ebuild
b/dev-qt/qtwayland/qtwayland-5.11..ebuild
index b2b68306..4c355304 100644
--- a/dev-qt/qtwayland/qtwayland-5.11..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11..ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
fi
IUSE="+libinput xcomposite"
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 3233ef7e39636128b31a4144cd4d0efe7247491a
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sun Sep 3 19:52:29 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Sep 3 19:52:29 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3233ef7e
dev-qt/qtwayland: Drop USE=egl
In this case, USE=egl was not enabling additional support but enabled-
instead-of GLX. Rather than complicating things with REQUIRED_USE, build
with EGL unconditionally as the use of GLX in context of Wayland is
questionable.
Gentoo-bug: 627758
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-qt/qtwayland/metadata.xml | 1 -
dev-qt/qtwayland/qtwayland-5.10..ebuild | 6 +++---
dev-qt/qtwayland/qtwayland-5.6..ebuild | 6 +++---
dev-qt/qtwayland/qtwayland-5.9.1.ebuild | 6 +++---
dev-qt/qtwayland/qtwayland-5.9..ebuild | 6 +++---
dev-qt/qtwayland/qtwayland-5..ebuild| 6 +++---
6 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 00ed5295..9bd59538 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -6,7 +6,6 @@
Gentoo Qt Project
- Use EGL instead of GLX to manage OpenGL
contexts
Enable support for input devices via
dev-libs/libinput
Build QML/QtQuick bindings
Build Qt compositor for
wayland
diff --git a/dev-qt/qtwayland/qtwayland-5.10..ebuild
b/dev-qt/qtwayland/qtwayland-5.10..ebuild
index fe6a245a..0629d749 100644
--- a/dev-qt/qtwayland/qtwayland-5.10..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.10..ebuild
@@ -10,14 +10,14 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl +libinput xcomposite"
+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?]
+ ~dev-qt/qtgui-${PV}[egl,libinput?]
+ media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
x11-libs/libX11
diff --git a/dev-qt/qtwayland/qtwayland-5.6..ebuild
b/dev-qt/qtwayland/qtwayland-5.6..ebuild
index 3fb13e35..e706826a 100644
--- a/dev-qt/qtwayland/qtwayland-5.6..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.6..ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl qml wayland-compositor xcomposite"
+IUSE="qml wayland-compositor xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}[egl=]
- media-libs/mesa[egl?]
+ ~dev-qt/qtgui-${PV}[egl]
+ media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
wayland-compositor? (
qml? ( ~dev-qt/qtdeclarative-${PV} )
diff --git a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
index fe6a245a..0629d749 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
@@ -10,14 +10,14 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl +libinput xcomposite"
+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?]
+ ~dev-qt/qtgui-${PV}[egl,libinput?]
+ media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
x11-libs/libX11
diff --git a/dev-qt/qtwayland/qtwayland-5.9..ebuild
b/dev-qt/qtwayland/qtwayland-5.9..ebuild
index fe6a245a..0629d749 100644
--- a/dev-qt/qtwayland/qtwayland-5.9..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9..ebuild
@@ -10,14 +10,14 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl +libinput xcomposite"
+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?]
+ ~dev-qt/qtgui-${PV}[egl,libinput?]
+ media-libs/mesa[egl]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
x11-libs/libX11
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index fe6a245a..0629d749 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -10,14 +10,14 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl +libinput xcomposite"
+IUSE="+libinput xcomposite"
DEPEND="
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 819f99ba8f419374a9b36ef6df18f07cc34bf2ac
Author: Davide Pesavento gentoo org>
AuthorDate: Sun Sep 3 00:00:35 2017 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sun Sep 3 00:00:35 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=819f99ba
dev-qt/qtwayland: raise dev-libs/wayland dep
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-qt/qtwayland/qtwayland-5.10..ebuild | 2 +-
dev-qt/qtwayland/qtwayland-5.9.1.ebuild | 2 +-
dev-qt/qtwayland/qtwayland-5.9..ebuild | 2 +-
dev-qt/qtwayland/qtwayland-5..ebuild| 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.10..ebuild
b/dev-qt/qtwayland/qtwayland-5.10..ebuild
index 9455cb3b..fe6a245a 100644
--- a/dev-qt/qtwayland/qtwayland-5.10..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.10..ebuild
@@ -13,7 +13,7 @@ fi
IUSE="egl +libinput xcomposite"
DEPEND="
- >=dev-libs/wayland-1.4.0
+ >=dev-libs/wayland-1.6.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}[egl=,libinput?]
diff --git a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
index 9455cb3b..fe6a245a 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
@@ -13,7 +13,7 @@ fi
IUSE="egl +libinput xcomposite"
DEPEND="
- >=dev-libs/wayland-1.4.0
+ >=dev-libs/wayland-1.6.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}[egl=,libinput?]
diff --git a/dev-qt/qtwayland/qtwayland-5.9..ebuild
b/dev-qt/qtwayland/qtwayland-5.9..ebuild
index 9455cb3b..fe6a245a 100644
--- a/dev-qt/qtwayland/qtwayland-5.9..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9..ebuild
@@ -13,7 +13,7 @@ fi
IUSE="egl +libinput xcomposite"
DEPEND="
- >=dev-libs/wayland-1.4.0
+ >=dev-libs/wayland-1.6.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}[egl=,libinput?]
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index 9455cb3b..fe6a245a 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -13,7 +13,7 @@ fi
IUSE="egl +libinput xcomposite"
DEPEND="
- >=dev-libs/wayland-1.4.0
+ >=dev-libs/wayland-1.6.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}[egl=,libinput?]
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 465542cd55d1b1e8abeae081aab71a70e86a79c1
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jul 23 06:50:09 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jul 23 06:54:54 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=465542cd
dev-qt/qtwayland: fix xcomposite USE flag for 5.9
Package-Manager: Portage-2.3.6, Repoman-2.3.3
dev-qt/qtwayland/qtwayland-5.9.1.ebuild| 8 ++--
dev-qt/qtwayland/qtwayland-5.9..ebuild | 8 ++--
dev-qt/qtwayland/qtwayland-5..ebuild | 8 ++--
3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
index ff3ca8ba..9455cb3b 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.1.ebuild
@@ -33,11 +33,7 @@ src_prepare() {
src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
tests/auto/compositor/compositor/compositor.pro
- qt5-build_src_prepare
-}
+ use xcomposite || rm -r config.tests/xcomposite || die
-src_configure() {
- qt_use_compile_test xcomposite
-
- qt5-build_src_configure
+ qt5-build_src_prepare
}
diff --git a/dev-qt/qtwayland/qtwayland-5.9..ebuild
b/dev-qt/qtwayland/qtwayland-5.9..ebuild
index ff3ca8ba..9455cb3b 100644
--- a/dev-qt/qtwayland/qtwayland-5.9..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9..ebuild
@@ -33,11 +33,7 @@ src_prepare() {
src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
tests/auto/compositor/compositor/compositor.pro
- qt5-build_src_prepare
-}
+ use xcomposite || rm -r config.tests/xcomposite || die
-src_configure() {
- qt_use_compile_test xcomposite
-
- qt5-build_src_configure
+ qt5-build_src_prepare
}
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index ff3ca8ba..9455cb3b 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -33,11 +33,7 @@ src_prepare() {
src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
tests/auto/compositor/compositor/compositor.pro
- qt5-build_src_prepare
-}
+ use xcomposite || rm -r config.tests/xcomposite || die
-src_configure() {
- qt_use_compile_test xcomposite
-
- qt5-build_src_configure
+ qt5-build_src_prepare
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 648d83e691da9a49cd4f76ade3c8466a377ac0b8
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jun 11 13:23:07 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jun 11 13:28:47 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=648d83e6
dev-qt/qtwayland: introduce libinput USE flag
qtwayland has conditionals like qtConfig(xkbcommon-evdev), which is provided by
qtgui[libinput].
Enabling it by default for now, since currently keyboard does not work in
Plasma/Wayland without it.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwayland/metadata.xml | 1 +
dev-qt/qtwayland/qtwayland-5.9.0.ebuild| 14 --
dev-qt/qtwayland/qtwayland-5.9..ebuild | 14 --
dev-qt/qtwayland/qtwayland-5..ebuild | 14 --
4 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 138dabc2..852fb93d 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -7,6 +7,7 @@
Use EGL instead of GLX to manage OpenGL
contexts
+ Enable support for input devices via
dev-libs/libinput
Build QML/QtQuick bindings
Build Qt compositor for
wayland
diff --git a/dev-qt/qtwayland/qtwayland-5.9.0.ebuild
b/dev-qt/qtwayland/qtwayland-5.9.0.ebuild
index 5f9fc27a..ff3ca8ba 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.0.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.0.ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl xcomposite"
+IUSE="egl +libinput xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl=]
+ ~dev-qt/qtgui-${PV}[egl=,libinput?]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
@@ -26,6 +26,16 @@ DEPEND="
"
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 \
+ tests/auto/compositor/compositor/compositor.pro
+
+ qt5-build_src_prepare
+}
+
src_configure() {
qt_use_compile_test xcomposite
diff --git a/dev-qt/qtwayland/qtwayland-5.9..ebuild
b/dev-qt/qtwayland/qtwayland-5.9..ebuild
index 5f9fc27a..ff3ca8ba 100644
--- a/dev-qt/qtwayland/qtwayland-5.9..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9..ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl xcomposite"
+IUSE="egl +libinput xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl=]
+ ~dev-qt/qtgui-${PV}[egl=,libinput?]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
@@ -26,6 +26,16 @@ DEPEND="
"
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 \
+ tests/auto/compositor/compositor/compositor.pro
+
+ qt5-build_src_prepare
+}
+
src_configure() {
qt_use_compile_test xcomposite
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index 5f9fc27a..ff3ca8ba 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -10,13 +10,13 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl xcomposite"
+IUSE="egl +libinput xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
~dev-qt/qtcore-${PV}
~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl=]
+ ~dev-qt/qtgui-${PV}[egl=,libinput?]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
xcomposite? (
@@ -26,6 +26,16 @@ DEPEND="
"
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 \
+ tests/auto/compositor/compositor/compositor.pro
+
+ qt5-build_src_prepare
+}
+
src_configure() {
qt_use_compile_test xcomposite
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 3c8b2eaf72c91d1a70b427741c6c8fc55fa033d4
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Dec 15 10:13:12 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Dec 15 10:13:37 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c8b2eaf
dev-qt/qtwayland: remove wayland-compositor USE flag in 5.7. and later
QtWaylandCompositor is now built unconditionally since qtwayland commit
00fba62ce3e5bd00ba5e8ab6f5b7a71bdb93c6a1.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-qt/qtwayland/qtwayland-5.7..ebuild | 8 ++--
dev-qt/qtwayland/qtwayland-5.8..ebuild | 8 ++--
dev-qt/qtwayland/qtwayland-5..ebuild | 8 ++--
3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.7..ebuild
b/dev-qt/qtwayland/qtwayland-5.7..ebuild
index 026b7a5..7d6f488 100644
--- a/dev-qt/qtwayland/qtwayland-5.7..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.7..ebuild
@@ -11,15 +11,15 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl wayland-compositor xcomposite"
+IUSE="egl xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}[egl=]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
- wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -28,10 +28,6 @@ DEPEND="
RDEPEND="${DEPEND}"
src_configure() {
- if use wayland-compositor; then
- echo "CONFIG += wayland-compositor" >>
"${QT5_BUILD_DIR}"/.qmake.cache
- fi
-
qt_use_compile_test xcomposite
qt5-build_src_configure
diff --git a/dev-qt/qtwayland/qtwayland-5.8..ebuild
b/dev-qt/qtwayland/qtwayland-5.8..ebuild
index 026b7a5..7d6f488 100644
--- a/dev-qt/qtwayland/qtwayland-5.8..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.8..ebuild
@@ -11,15 +11,15 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl wayland-compositor xcomposite"
+IUSE="egl xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}[egl=]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
- wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -28,10 +28,6 @@ DEPEND="
RDEPEND="${DEPEND}"
src_configure() {
- if use wayland-compositor; then
- echo "CONFIG += wayland-compositor" >>
"${QT5_BUILD_DIR}"/.qmake.cache
- fi
-
qt_use_compile_test xcomposite
qt5-build_src_configure
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index 026b7a5..7d6f488 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -11,15 +11,15 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl wayland-compositor xcomposite"
+IUSE="egl xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}[egl=]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
- wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -28,10 +28,6 @@ DEPEND="
RDEPEND="${DEPEND}"
src_configure() {
- if use wayland-compositor; then
- echo "CONFIG += wayland-compositor" >>
"${QT5_BUILD_DIR}"/.qmake.cache
- fi
-
qt_use_compile_test xcomposite
qt5-build_src_configure
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 5326331764a0612870c92ce1310d6a1cb8776322
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Oct 28 11:33:31 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Oct 28 11:33:42 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=53263317
dev-qt/qtwayland: remove qml USE flag from 5.7 and later
Due to an upstream change, qml is effectively mandatory.
Gentoo-bug: 579208
Package-Manager: portage-2.3.2
dev-qt/qtwayland/qtwayland-5.7..ebuild | 7 ++-
dev-qt/qtwayland/qtwayland-5.8..ebuild | 7 ++-
dev-qt/qtwayland/qtwayland-5..ebuild | 7 ++-
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.7..ebuild
b/dev-qt/qtwayland/qtwayland-5.7..ebuild
index e3f382b..026b7a5 100644
--- a/dev-qt/qtwayland/qtwayland-5.7..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.7..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl qml wayland-compositor xcomposite"
+IUSE="egl wayland-compositor xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
@@ -19,9 +19,7 @@ DEPEND="
~dev-qt/qtgui-${PV}[egl=]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
- wayland-compositor? (
- qml? ( ~dev-qt/qtdeclarative-${PV} )
- )
+ wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -35,7 +33,6 @@ src_configure() {
fi
qt_use_compile_test xcomposite
- qt_use_disable_mod qml quick
src/compositor/compositor_api/compositor_api.pri
qt5-build_src_configure
}
diff --git a/dev-qt/qtwayland/qtwayland-5.8..ebuild
b/dev-qt/qtwayland/qtwayland-5.8..ebuild
index e3f382b..026b7a5 100644
--- a/dev-qt/qtwayland/qtwayland-5.8..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.8..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl qml wayland-compositor xcomposite"
+IUSE="egl wayland-compositor xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
@@ -19,9 +19,7 @@ DEPEND="
~dev-qt/qtgui-${PV}[egl=]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
- wayland-compositor? (
- qml? ( ~dev-qt/qtdeclarative-${PV} )
- )
+ wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -35,7 +33,6 @@ src_configure() {
fi
qt_use_compile_test xcomposite
- qt_use_disable_mod qml quick
src/compositor/compositor_api/compositor_api.pri
qt5-build_src_configure
}
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index e3f382b..026b7a5 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
fi
-IUSE="egl qml wayland-compositor xcomposite"
+IUSE="egl wayland-compositor xcomposite"
DEPEND="
>=dev-libs/wayland-1.4.0
@@ -19,9 +19,7 @@ DEPEND="
~dev-qt/qtgui-${PV}[egl=]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
- wayland-compositor? (
- qml? ( ~dev-qt/qtdeclarative-${PV} )
- )
+ wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -35,7 +33,6 @@ src_configure() {
fi
qt_use_compile_test xcomposite
- qt_use_disable_mod qml quick
src/compositor/compositor_api/compositor_api.pri
qt5-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 9b6aeed0d45473bc481cf41f2092e9b41fd8a1de
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Oct 16 17:16:44 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Oct 16 17:17:18 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9b6aeed0
dev-qt/qtwayland: fix automagic dependency
Package-Manager: portage-2.2.20.1
dev-qt/qtwayland/qtwayland-5.5.0.ebuild| 5 -
dev-qt/qtwayland/qtwayland-5.5.1.ebuild| 5 -
dev-qt/qtwayland/qtwayland-5.5..ebuild | 5 -
dev-qt/qtwayland/qtwayland-5.6..ebuild | 5 -
dev-qt/qtwayland/qtwayland-5..ebuild | 5 -
5 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.5.0.ebuild
b/dev-qt/qtwayland/qtwayland-5.5.0.ebuild
index 963447e..42f300b 100644
--- a/dev-qt/qtwayland/qtwayland-5.5.0.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5.0.ebuild
@@ -19,7 +19,9 @@ DEPEND="
>=dev-qt/qtgui-${PV}:5[egl=]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
- qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ wayland-compositor? (
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -33,6 +35,7 @@ src_configure() {
fi
qt_use_compile_test xcomposite
+ qt_use_disable_mod qml quick
src/compositor/compositor_api/compositor_api.pri
qt5-build_src_configure
}
diff --git a/dev-qt/qtwayland/qtwayland-5.5.1.ebuild
b/dev-qt/qtwayland/qtwayland-5.5.1.ebuild
index 963447e..42f300b 100644
--- a/dev-qt/qtwayland/qtwayland-5.5.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5.1.ebuild
@@ -19,7 +19,9 @@ DEPEND="
>=dev-qt/qtgui-${PV}:5[egl=]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
- qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ wayland-compositor? (
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -33,6 +35,7 @@ src_configure() {
fi
qt_use_compile_test xcomposite
+ qt_use_disable_mod qml quick
src/compositor/compositor_api/compositor_api.pri
qt5-build_src_configure
}
diff --git a/dev-qt/qtwayland/qtwayland-5.5..ebuild
b/dev-qt/qtwayland/qtwayland-5.5..ebuild
index 963447e..42f300b 100644
--- a/dev-qt/qtwayland/qtwayland-5.5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5..ebuild
@@ -19,7 +19,9 @@ DEPEND="
>=dev-qt/qtgui-${PV}:5[egl=]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
- qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ wayland-compositor? (
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -33,6 +35,7 @@ src_configure() {
fi
qt_use_compile_test xcomposite
+ qt_use_disable_mod qml quick
src/compositor/compositor_api/compositor_api.pri
qt5-build_src_configure
}
diff --git a/dev-qt/qtwayland/qtwayland-5.6..ebuild
b/dev-qt/qtwayland/qtwayland-5.6..ebuild
index 963447e..42f300b 100644
--- a/dev-qt/qtwayland/qtwayland-5.6..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.6..ebuild
@@ -19,7 +19,9 @@ DEPEND="
>=dev-qt/qtgui-${PV}:5[egl=]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
- qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ wayland-compositor? (
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -33,6 +35,7 @@ src_configure() {
fi
qt_use_compile_test xcomposite
+ qt_use_disable_mod qml quick
src/compositor/compositor_api/compositor_api.pri
qt5-build_src_configure
}
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index 963447e..42f300b 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -19,7 +19,9 @@ DEPEND="
>=dev-qt/qtgui-${PV}:5[egl=]
media-libs/mesa[egl?]
>=x11-libs/libxkbcommon-0.2.0
- qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ wayland-compositor? (
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
+ )
xcomposite? (
x11-libs/libX11
x11-libs/libXcomposite
@@ -33,6 +35,7 @@ src_configure() {
fi
qt_use_compile_test xcomposite
+ qt_use_disable_mod qml quick
src/compositor/compositor_api/compositor_api.pri
qt5-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 0a65aaca6688462854762dfe26fc71f914ab93f5
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sat Jun 27 14:01:10 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sat Jun 27 14:01:10 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0a65aaca
[dev-qt/qtwayland] wayland-1.4 is required now.
Package-Manager: portage-2.2.20
dev-qt/qtwayland/qtwayland-5.5.0_rc.ebuild | 2 +-
dev-qt/qtwayland/qtwayland-5.5..ebuild | 2 +-
dev-qt/qtwayland/qtwayland-5..ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.5.0_rc.ebuild
b/dev-qt/qtwayland/qtwayland-5.5.0_rc.ebuild
index 61832bd..d91681c 100644
--- a/dev-qt/qtwayland/qtwayland-5.5.0_rc.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5.0_rc.ebuild
@@ -14,7 +14,7 @@ fi
IUSE=egl qml wayland-compositor xcomposite
DEPEND=
- =dev-libs/wayland-1.3.0
+ =dev-libs/wayland-1.4.0
=dev-qt/qtcore-${PV}:5
=dev-qt/qtgui-${PV}:5[egl=]
media-libs/mesa[egl?]
diff --git a/dev-qt/qtwayland/qtwayland-5.5..ebuild
b/dev-qt/qtwayland/qtwayland-5.5..ebuild
index 61832bd..d91681c 100644
--- a/dev-qt/qtwayland/qtwayland-5.5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5..ebuild
@@ -14,7 +14,7 @@ fi
IUSE=egl qml wayland-compositor xcomposite
DEPEND=
- =dev-libs/wayland-1.3.0
+ =dev-libs/wayland-1.4.0
=dev-qt/qtcore-${PV}:5
=dev-qt/qtgui-${PV}:5[egl=]
media-libs/mesa[egl?]
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index 61832bd..d91681c 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -14,7 +14,7 @@ fi
IUSE=egl qml wayland-compositor xcomposite
DEPEND=
- =dev-libs/wayland-1.3.0
+ =dev-libs/wayland-1.4.0
=dev-qt/qtcore-${PV}:5
=dev-qt/qtgui-${PV}:5[egl=]
media-libs/mesa[egl?]
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: f35c2e70946aef55e35ace5ae93afc450f33ed8d
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sun Jan 18 01:32:09 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sun Jan 18 01:32:09 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f35c2e70
[dev-qt/qtwayland] Don't redefine HOMEPAGE.
Package-Manager: portage-2.2.15
---
dev-qt/qtwayland/qtwayland-5.4..ebuild | 1 -
dev-qt/qtwayland/qtwayland-5..ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.4..ebuild
b/dev-qt/qtwayland/qtwayland-5.4..ebuild
index 3aa78ca..1c2fb72 100644
--- a/dev-qt/qtwayland/qtwayland-5.4..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.4..ebuild
@@ -7,7 +7,6 @@ EAPI=5
inherit qt5-build
DESCRIPTION=Wayland platform plugin for Qt
-HOMEPAGE=http://qt-project.org/wiki/QtWayland;
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index 3aa78ca..1c2fb72 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -7,7 +7,6 @@ EAPI=5
inherit qt5-build
DESCRIPTION=Wayland platform plugin for Qt
-HOMEPAGE=http://qt-project.org/wiki/QtWayland;
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: fdd80ab3dab285e19174788cf9aa630e38374131
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Fri Sep 12 17:04:55 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Fri Sep 12 17:04:55 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fdd80ab3
[dev-qt/qtwayland] Delete ebuild referring to non-existent branch.
Package-Manager: portage-2.2.12
---
dev-qt/qtwayland/qtwayland-5.3..ebuild | 42 --
1 file changed, 42 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.3..ebuild
b/dev-qt/qtwayland/qtwayland-5.3..ebuild
deleted file mode 100644
index 3aa78ca..000
--- a/dev-qt/qtwayland/qtwayland-5.3..ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit qt5-build
-
-DESCRIPTION=Wayland platform plugin for Qt
-HOMEPAGE=http://qt-project.org/wiki/QtWayland;
-
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
- KEYWORDS=
-else
- KEYWORDS=~amd64 ~x86
-fi
-
-IUSE=egl qml wayland-compositor xcomposite
-
-DEPEND=
- =dev-libs/wayland-1.3.0
- =dev-qt/qtcore-${PV}:5[debug=]
- =dev-qt/qtgui-${PV}:5[debug=,egl=,opengl]
- media-libs/mesa[egl?]
- =x11-libs/libxkbcommon-0.2.0
- qml? ( =dev-qt/qtdeclarative-${PV}:5[debug=] )
- xcomposite? (
- x11-libs/libX11
- x11-libs/libXcomposite
- )
-
-RDEPEND=${DEPEND}
-
-src_configure() {
- if use wayland-compositor; then
- echo CONFIG += wayland-compositor
${QT5_BUILD_DIR}/.qmake.cache
- fi
-
- qt_use_compile_test xcomposite
-
- qt5-build_src_configure
-}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: ec6722593c8d04bfdf0d314dd846446bb8b34e64
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Mon Aug 4 23:15:50 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon Aug 4 23:15:50 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ec672259
[dev-qt/qtwayland:5] Use qt_use_compile_test.
Package-Manager: portage-2.2.11
---
dev-qt/qtwayland/qtwayland-5.3..ebuild | 4 +---
dev-qt/qtwayland/qtwayland-5..ebuild | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwayland/qtwayland-5.3..ebuild
b/dev-qt/qtwayland/qtwayland-5.3..ebuild
index aa5a415..3aa78ca 100644
--- a/dev-qt/qtwayland/qtwayland-5.3..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.3..ebuild
@@ -36,9 +36,7 @@ src_configure() {
echo CONFIG += wayland-compositor
${QT5_BUILD_DIR}/.qmake.cache
fi
- if ! use xcomposite; then
- echo CONFIG += done_config_xcomposite
${QT5_BUILD_DIR}/.qmake.cache
- fi
+ qt_use_compile_test xcomposite
qt5-build_src_configure
}
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index aa5a415..3aa78ca 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -36,9 +36,7 @@ src_configure() {
echo CONFIG += wayland-compositor
${QT5_BUILD_DIR}/.qmake.cache
fi
- if ! use xcomposite; then
- echo CONFIG += done_config_xcomposite
${QT5_BUILD_DIR}/.qmake.cache
- fi
+ qt_use_compile_test xcomposite
qt5-build_src_configure
}
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/
commit: 294785ead65c5debc18335e7f5a381dc4264f25f
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Fri May 16 23:42:16 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Fri May 16 23:42:16 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=294785ea
[dev-qt/qtwayland] Add egl and xcomposite USE flags.
Package-Manager: portage-2.2.10
---
dev-qt/qtwayland/metadata.xml | 1 +
dev-qt/qtwayland/qtwayland-5.3..ebuild | 17 ++---
dev-qt/qtwayland/qtwayland-5..ebuild | 17 ++---
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index f5fa5ab..6596561 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -3,6 +3,7 @@
pkgmetadata
herdqt/herd
use
+ flag name=eglUse EGL instead of GLX to manage OpenGL
contexts/flag
flag name=qmlBuild QML/QtQuick bindings/flag
flag name=wayland-compositorBuild Qt compositor for
wayland/flag
/use
diff --git a/dev-qt/qtwayland/qtwayland-5.3..ebuild
b/dev-qt/qtwayland/qtwayland-5.3..ebuild
index f61b2a6..fae9358 100644
--- a/dev-qt/qtwayland/qtwayland-5.3..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.3..ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit qt5-build
-DESCRIPTION=Wayland plugin for Qt
+DESCRIPTION=Wayland platform plugin for Qt
HOMEPAGE=http://qt-project.org/wiki/QtWayland;
if [[ ${QT5_BUILD_TYPE} == live ]]; then
@@ -15,13 +15,19 @@ else
KEYWORDS=~amd64
fi
-IUSE=qml wayland-compositor
+IUSE=egl qml wayland-compositor xcomposite
DEPEND=
=dev-libs/wayland-1.3.0
=dev-qt/qtcore-${PV}:5[debug=]
- =dev-qt/qtgui-${PV}:5[debug=,opengl]
+ =dev-qt/qtgui-${PV}:5[debug=,egl=,opengl]
+ media-libs/mesa[egl?]
+ =x11-libs/libxkbcommon-0.2.0
qml? ( =dev-qt/qtdeclarative-${PV}:5[debug=] )
+ xcomposite? (
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ )
RDEPEND=${DEPEND}
@@ -29,5 +35,10 @@ src_configure() {
if use wayland-compositor; then
echo CONFIG += wayland-compositor
${QT5_BUILD_DIR}/.qmake.cache
fi
+
+ if ! use xcomposite; then
+ echo CONFIG += done_config_xcomposite
${QT5_BUILD_DIR}/.qmake.cache
+ fi
+
qt5-build_src_configure
}
diff --git a/dev-qt/qtwayland/qtwayland-5..ebuild
b/dev-qt/qtwayland/qtwayland-5..ebuild
index f61b2a6..fae9358 100644
--- a/dev-qt/qtwayland/qtwayland-5..ebuild
+++ b/dev-qt/qtwayland/qtwayland-5..ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit qt5-build
-DESCRIPTION=Wayland plugin for Qt
+DESCRIPTION=Wayland platform plugin for Qt
HOMEPAGE=http://qt-project.org/wiki/QtWayland;
if [[ ${QT5_BUILD_TYPE} == live ]]; then
@@ -15,13 +15,19 @@ else
KEYWORDS=~amd64
fi
-IUSE=qml wayland-compositor
+IUSE=egl qml wayland-compositor xcomposite
DEPEND=
=dev-libs/wayland-1.3.0
=dev-qt/qtcore-${PV}:5[debug=]
- =dev-qt/qtgui-${PV}:5[debug=,opengl]
+ =dev-qt/qtgui-${PV}:5[debug=,egl=,opengl]
+ media-libs/mesa[egl?]
+ =x11-libs/libxkbcommon-0.2.0
qml? ( =dev-qt/qtdeclarative-${PV}:5[debug=] )
+ xcomposite? (
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ )
RDEPEND=${DEPEND}
@@ -29,5 +35,10 @@ src_configure() {
if use wayland-compositor; then
echo CONFIG += wayland-compositor
${QT5_BUILD_DIR}/.qmake.cache
fi
+
+ if ! use xcomposite; then
+ echo CONFIG += done_config_xcomposite
${QT5_BUILD_DIR}/.qmake.cache
+ fi
+
qt5-build_src_configure
}
