diff options
| author | Ionen Wolkens <ionen@gentoo.org> | 2023-08-24 14:42:26 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2023-09-05 09:01:07 -0400 |
| commit | db89af8df318a200922ea665040c53b1c27eef0f (patch) | |
| tree | 484cb046cae1566623deb97c2f288e478d57e772 /dev-qt | |
| parent | 9a89344d82b830aba97bbd088b13a1f12d5d756b (diff) | |
| download | gentoo-db89af8df318a200922ea665040c53b1c27eef0f.tar.gz gentoo-db89af8df318a200922ea665040c53b1c27eef0f.tar.bz2 gentoo-db89af8df318a200922ea665040c53b1c27eef0f.zip | |
dev-qt/qtdeclarative: match vulkan, move shader to bdep, adjust sql
Automagic happening with QT_CONFIG(vulkan), and libQt6Quick.so breaks
if vulkan is disabled on qtbase.
For shadertools this only use the "qsb" tool (thus why it checks for it
separately in CMakeLists), and such it would need to be BDEPEND. Odds
are a lot of fixing is needed to get cross right with qt6 still though
(i.e. some qtbase in BDEPENDs, maybe need QT_HOST_PATH).
Don't believe sql needs =, sql? should be enough.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild (renamed from dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild) | 8 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild | 8 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild | 8 |
3 files changed, 9 insertions, 15 deletions
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild index 4a434bb19102..3df3e3da609d 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.2-r1.ebuild @@ -11,17 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="opengl +sql +widgets" +IUSE="opengl +sql vulkan +widgets" # behaves very badly when qtdeclarative is not already installed, also # other more minor issues (installs junk, sandbox/offscreen issues) RESTRICT="test" -RDEPEND=" - =dev-qt/qtbase-${PV}*:6[network,opengl=,sql=,widgets=] - =dev-qt/qtshadertools-${PV}*:6 -" +RDEPEND="=dev-qt/qtbase-${PV}*:6[network,opengl=,sql?,vulkan=,widgets=]" DEPEND="${RDEPEND}" +BDEPEND="=dev-qt/qtshadertools-${PV}*:6" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild index 4a434bb19102..3df3e3da609d 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild @@ -11,17 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="opengl +sql +widgets" +IUSE="opengl +sql vulkan +widgets" # behaves very badly when qtdeclarative is not already installed, also # other more minor issues (installs junk, sandbox/offscreen issues) RESTRICT="test" -RDEPEND=" - =dev-qt/qtbase-${PV}*:6[network,opengl=,sql=,widgets=] - =dev-qt/qtshadertools-${PV}*:6 -" +RDEPEND="=dev-qt/qtbase-${PV}*:6[network,opengl=,sql?,vulkan=,widgets=]" DEPEND="${RDEPEND}" +BDEPEND="=dev-qt/qtshadertools-${PV}*:6" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index 4a434bb19102..3df3e3da609d 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -11,17 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="opengl +sql +widgets" +IUSE="opengl +sql vulkan +widgets" # behaves very badly when qtdeclarative is not already installed, also # other more minor issues (installs junk, sandbox/offscreen issues) RESTRICT="test" -RDEPEND=" - =dev-qt/qtbase-${PV}*:6[network,opengl=,sql=,widgets=] - =dev-qt/qtshadertools-${PV}*:6 -" +RDEPEND="=dev-qt/qtbase-${PV}*:6[network,opengl=,sql?,vulkan=,widgets=]" DEPEND="${RDEPEND}" +BDEPEND="=dev-qt/qtshadertools-${PV}*:6" src_configure() { local mycmakeargs=( |