diff options
| author |   Eli Schwartz <eschwartz93@gmail.com> | 2023-11-19 16:34:22 -0500 |
|---|---|---|
| committer |   Ionen Wolkens <ionen@gentoo.org> | 2023-11-19 21:02:40 -0500 |
| commit | 8751700cca4cc4a92768639396b1cb5daef9675c (patch) | |
| tree | 7587fa25b768dfa3187d11fd2e62a5b53a881ad0 /dev-qt/qtdeclarative | |
| parent | net-im/slack: drop 4.34.121 (diff) | |
| download | gentoo-8751700cca4cc4a92768639396b1cb5daef9675c.tar.gz gentoo-8751700cca4cc4a92768639396b1cb5daef9675c.tar.bz2 gentoo-8751700cca4cc4a92768639396b1cb5daef9675c.zip | |
dev-qt/qtdeclarative: add missing build dependency for vulkan
When vulkan is enabled, qtbase has to be built with vulkan support, and
a bunch of private qt headers are poked at. Those headers privately make
use of the bdep which qtbase itself has (USE-conditional on vulkan), but
since it is only a build time dependency it is not necessarily
guaranteed to be installed when building qtdeclarative.
Often it will be installed, since qtbase does after all drag it in. But
e.g. when building qtdeclarative from source, but getting qtbase via a
binpkg, no bdeps for qtbase are available.
Since this is private headers stuff, it makes a certain amount of sense
that qtdeclarative should be independently responsible for adding the
same bdep on its own, rather than forcing qtbase to runtime depend on
it.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtdeclarative')
4 files changed, 16 insertions, 4 deletions
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.3.ebuild index fd07eb1554d5..6c27a0af036e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.5.3.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.3.ebuild @@ -18,7 +18,10 @@ IUSE="opengl +sql vulkan +widgets" RESTRICT="test" RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" BDEPEND="~dev-qt/qtshadertools-${PV}:6" src_configure() { diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild index 09d9a70c9d08..2b2d23cdc5a7 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild @@ -18,7 +18,10 @@ IUSE="opengl +sql vulkan +widgets" RESTRICT="test" RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" BDEPEND="~dev-qt/qtshadertools-${PV}:6" src_configure() { diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild index 09d9a70c9d08..2b2d23cdc5a7 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild @@ -18,7 +18,10 @@ IUSE="opengl +sql vulkan +widgets" RESTRICT="test" RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" BDEPEND="~dev-qt/qtshadertools-${PV}:6" src_configure() { diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index 09d9a70c9d08..2b2d23cdc5a7 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -18,7 +18,10 @@ IUSE="opengl +sql vulkan +widgets" RESTRICT="test" RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" BDEPEND="~dev-qt/qtshadertools-${PV}:6" src_configure() { |