Add dev-qt from an older version of the gentoo repo
Qt5 has been removed, we restore it since we still use it.
This commit is contained in:
2
dev-qt/qtquick3d/Manifest
Normal file
2
dev-qt/qtquick3d/Manifest
Normal file
@ -0,0 +1,2 @@
|
||||
DIST qtquick3d-everywhere-src-6.10.3.tar.xz 74013568 BLAKE2B 7ca0e0784794e59deb434a27850fc9d7966e023024f9a3f6082b9ed1fc9ce2a23aed5fc72e11c583a7c4211992c894c1eab4d918b2fc86ed945c65ede2bf01ec SHA512 186a2db9430f6dc59b9a25492f924710ac84e1f0a0e1accd5927abdb525c5799e24a3c90d41042868cada1fc653fd533256ad93cac373536b0f0cf16f8876942
|
||||
DIST qtquick3d-everywhere-src-6.11.1.tar.xz 69622816 BLAKE2B bde4e3133af9fdd440b944087c7c767c587dbd3a0f3a8f653e7a6dea9b5fbfe3b1e0e941aa75c61bb2ddf424174e31b0d42649518301c17b3480d6a9c61e022b SHA512 cb86f0c44b57f4ea0a28f6869444b09e56a4a6c82cd25ee56972ae554717c6324218b2b51b091504f5bdc9807e90f138e4b73f8ad75fb1c65e197cf2e81c430e
|
||||
23
dev-qt/qtquick3d/files/qtquick3d-6.6.2-gcc14.patch
Normal file
23
dev-qt/qtquick3d/files/qtquick3d-6.6.2-gcc14.patch
Normal file
@ -0,0 +1,23 @@
|
||||
Qt undefs __AVX__ and others[1] to prevent bundled embree from using
|
||||
AVX/SSE4.2 code paths and result in linking errors, but this appears
|
||||
insufficient with gcc14[2].
|
||||
|
||||
Until Qt improves this, for simplicity pass -mno-* to bundled embree
|
||||
as a workaround which lets the compiler disable these instead and
|
||||
that includes other features which depend on these.
|
||||
|
||||
(note that embree is only used on amd64 and aarch64)
|
||||
|
||||
Ideal would be to unbundle this and let system embree use the full
|
||||
feature set, but there is no machinery to easily allow it.
|
||||
|
||||
[1] https://github.com/qt/qtquick3d/commit/7980cfd0
|
||||
[2] https://bugs.gentoo.org/917407
|
||||
--- a/src/3rdparty/embree/CMakeLists.txt
|
||||
+++ b/src/3rdparty/embree/CMakeLists.txt
|
||||
@@ -64,2 +64,5 @@
|
||||
# Use SSE2 only, ignore AVX/SSE4.2 for now
|
||||
+if (TEST_architecture_arch STREQUAL x86_64)
|
||||
+ qt_internal_extend_target(BundledEmbree COMPILE_OPTIONS -mno-avx -mno-sse4.2)
|
||||
+endif()
|
||||
qt_internal_extend_target(BundledEmbree DEFINES
|
||||
12
dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch
Normal file
12
dev-qt/qtquick3d/files/qtquick3d-6.6.2-x32abi.patch
Normal file
@ -0,0 +1,12 @@
|
||||
https://bugs.gentoo.org/926094
|
||||
https://bugreports.qt.io/browse/QTBUG-122955
|
||||
|
||||
https://bugs.gentoo.org/926093
|
||||
https://github.com/embree/embree/issues/477
|
||||
--- a/src/3rdparty/embree/common/sys/platform.h
|
||||
+++ b/src/3rdparty/embree/common/sys/platform.h
|
||||
@@ -34,3 +34,3 @@
|
||||
/* detect 64 bit platform */
|
||||
-#if defined(__X86_64__) || defined(__aarch64__)
|
||||
+#if (defined(__X86_64__) || defined(__aarch64__)) && ! defined(__ILP32__)
|
||||
#define __64BIT__
|
||||
15
dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
Normal file
15
dev-qt/qtquick3d/files/qtquick3d-6.9.2-assimp6.patch
Normal file
@ -0,0 +1,15 @@
|
||||
Seems that the '5' enforces the major version and it refuses to find
|
||||
system's assimp-6.0.2 (which is perfectly usable given Qt 6.9.2 bundles
|
||||
that version without it).
|
||||
|
||||
We don't package older ones, so drop the check as a quick workaround.
|
||||
|
||||
https://bugreports.qt.io/browse/QTBUG-137996
|
||||
--- a/src/plugins/assetimporters/configure.cmake
|
||||
+++ b/src/plugins/assetimporters/configure.cmake
|
||||
@@ -16 +16 @@
|
||||
-qt_find_package(WrapQuick3DAssimp 5.1.6 PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp MODULE_NAME assetimporters QMAKE_LIB quick3d_assimp)
|
||||
+qt_find_package(WrapQuick3DAssimp PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp MODULE_NAME assetimporters QMAKE_LIB quick3d_assimp)
|
||||
@@ -38 +38 @@
|
||||
- PACKAGES PACKAGE WrapQuick3DAssimp 5.1.6)
|
||||
+ PACKAGES PACKAGE WrapQuick3DAssimp)
|
||||
18
dev-qt/qtquick3d/metadata.xml
Normal file
18
dev-qt/qtquick3d/metadata.xml
Normal file
@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>qt@gentoo.org</email>
|
||||
<name>Gentoo Qt Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<bugs-to>https://qt-project.atlassian.net/</bugs-to>
|
||||
<doc>https://doc.qt.io/</doc>
|
||||
<remote-id type="github">qt/qtquick3d</remote-id>
|
||||
</upstream>
|
||||
<slots>
|
||||
<subslots>
|
||||
Must only be used by packages that are known to use private parts of the Qt API.
|
||||
</subslots>
|
||||
</slots>
|
||||
</pkgmetadata>
|
||||
57
dev-qt/qtquick3d/qtquick3d-6.10.3.ebuild
Normal file
57
dev-qt/qtquick3d/qtquick3d-6.10.3.ebuild
Normal file
@ -0,0 +1,57 @@
|
||||
# Copyright 2021-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
QT6_HAS_STATIC_LIBS=1
|
||||
inherit qt6-build
|
||||
|
||||
DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
|
||||
|
||||
if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
|
||||
elif [[ ${QT6_BUILD_TYPE} == live ]]; then
|
||||
EGIT_SUBMODULES=() # skip qtquick3d-assimp
|
||||
fi
|
||||
|
||||
IUSE="opengl vulkan"
|
||||
|
||||
RDEPEND="
|
||||
~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
|
||||
~dev-qt/qtdeclarative-${PV}:6
|
||||
~dev-qt/qtquicktimeline-${PV}:6
|
||||
~dev-qt/qtshadertools-${PV}:6
|
||||
media-libs/assimp:=
|
||||
virtual/zlib:=
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
test? ( ~dev-qt/qtbase-${PV}:6[network] )
|
||||
vulkan? ( dev-util/vulkan-headers )
|
||||
"
|
||||
BDEPEND="
|
||||
~dev-qt/qtshadertools-${PV}:6
|
||||
"
|
||||
|
||||
CMAKE_SKIP_TESTS=(
|
||||
# needs off-by-default assimp[collada] that is masked on some profiles,
|
||||
# not worth the extra trouble
|
||||
tst_qquick3dassetimport
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
|
||||
"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
|
||||
"${FILESDIR}"/${PN}-6.9.2-assimp6.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
# TODO: if someone wants it, openxr should likely have its own
|
||||
# USE and be packaged rather than use the bundled copy (if use
|
||||
# bundled, note need to setup python-any-r1)
|
||||
-DQT_FEATURE_quick3dxr_openxr=OFF
|
||||
)
|
||||
|
||||
qt6-build_src_configure
|
||||
}
|
||||
56
dev-qt/qtquick3d/qtquick3d-6.11.1.ebuild
Normal file
56
dev-qt/qtquick3d/qtquick3d-6.11.1.ebuild
Normal file
@ -0,0 +1,56 @@
|
||||
# Copyright 2021-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
QT6_HAS_STATIC_LIBS=1
|
||||
inherit qt6-build
|
||||
|
||||
DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
|
||||
|
||||
if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
|
||||
elif [[ ${QT6_BUILD_TYPE} == live ]]; then
|
||||
EGIT_SUBMODULES=() # skip qtquick3d-assimp
|
||||
fi
|
||||
|
||||
IUSE="opengl vulkan"
|
||||
|
||||
RDEPEND="
|
||||
~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
|
||||
~dev-qt/qtdeclarative-${PV}:6
|
||||
~dev-qt/qtquicktimeline-${PV}:6
|
||||
~dev-qt/qtshadertools-${PV}:6
|
||||
media-libs/assimp:=
|
||||
virtual/zlib:=
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
test? ( ~dev-qt/qtbase-${PV}:6[network] )
|
||||
vulkan? ( dev-util/vulkan-headers )
|
||||
"
|
||||
BDEPEND="
|
||||
~dev-qt/qtshadertools-${PV}:6
|
||||
"
|
||||
|
||||
CMAKE_SKIP_TESTS=(
|
||||
# needs off-by-default assimp[collada] that is masked on some profiles,
|
||||
# not worth the extra trouble
|
||||
tst_qquick3dassetimport
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
|
||||
"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
# TODO: if someone wants it, openxr should likely have its own
|
||||
# USE and be packaged rather than use the bundled copy (if use
|
||||
# bundled, note need to setup python-any-r1)
|
||||
-DQT_FEATURE_quick3dxr_openxr=OFF
|
||||
)
|
||||
|
||||
qt6-build_src_configure
|
||||
}
|
||||
56
dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild
Normal file
56
dev-qt/qtquick3d/qtquick3d-6.11.9999.ebuild
Normal file
@ -0,0 +1,56 @@
|
||||
# Copyright 2021-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
QT6_HAS_STATIC_LIBS=1
|
||||
inherit qt6-build
|
||||
|
||||
DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
|
||||
|
||||
if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
|
||||
elif [[ ${QT6_BUILD_TYPE} == live ]]; then
|
||||
EGIT_SUBMODULES=() # skip qtquick3d-assimp
|
||||
fi
|
||||
|
||||
IUSE="opengl vulkan"
|
||||
|
||||
RDEPEND="
|
||||
~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
|
||||
~dev-qt/qtdeclarative-${PV}:6
|
||||
~dev-qt/qtquicktimeline-${PV}:6
|
||||
~dev-qt/qtshadertools-${PV}:6
|
||||
media-libs/assimp:=
|
||||
virtual/zlib:=
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
test? ( ~dev-qt/qtbase-${PV}:6[network] )
|
||||
vulkan? ( dev-util/vulkan-headers )
|
||||
"
|
||||
BDEPEND="
|
||||
~dev-qt/qtshadertools-${PV}:6
|
||||
"
|
||||
|
||||
CMAKE_SKIP_TESTS=(
|
||||
# needs off-by-default assimp[collada] that is masked on some profiles,
|
||||
# not worth the extra trouble
|
||||
tst_qquick3dassetimport
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
|
||||
"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
# TODO: if someone wants it, openxr should likely have its own
|
||||
# USE and be packaged rather than use the bundled copy (if use
|
||||
# bundled, note need to setup python-any-r1)
|
||||
-DQT_FEATURE_quick3dxr_openxr=OFF
|
||||
)
|
||||
|
||||
qt6-build_src_configure
|
||||
}
|
||||
56
dev-qt/qtquick3d/qtquick3d-6.12.9999.ebuild
Normal file
56
dev-qt/qtquick3d/qtquick3d-6.12.9999.ebuild
Normal file
@ -0,0 +1,56 @@
|
||||
# Copyright 2021-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
QT6_HAS_STATIC_LIBS=1
|
||||
inherit qt6-build
|
||||
|
||||
DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
|
||||
|
||||
if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
|
||||
elif [[ ${QT6_BUILD_TYPE} == live ]]; then
|
||||
EGIT_SUBMODULES=() # skip qtquick3d-assimp
|
||||
fi
|
||||
|
||||
IUSE="opengl vulkan"
|
||||
|
||||
RDEPEND="
|
||||
~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
|
||||
~dev-qt/qtdeclarative-${PV}:6
|
||||
~dev-qt/qtquicktimeline-${PV}:6
|
||||
~dev-qt/qtshadertools-${PV}:6
|
||||
media-libs/assimp:=
|
||||
virtual/zlib:=
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
test? ( ~dev-qt/qtbase-${PV}:6[network] )
|
||||
vulkan? ( dev-util/vulkan-headers )
|
||||
"
|
||||
BDEPEND="
|
||||
~dev-qt/qtshadertools-${PV}:6
|
||||
"
|
||||
|
||||
CMAKE_SKIP_TESTS=(
|
||||
# needs off-by-default assimp[collada] that is masked on some profiles,
|
||||
# not worth the extra trouble
|
||||
tst_qquick3dassetimport
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
|
||||
"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
# TODO: if someone wants it, openxr should likely have its own
|
||||
# USE and be packaged rather than use the bundled copy (if use
|
||||
# bundled, note need to setup python-any-r1)
|
||||
-DQT_FEATURE_quick3dxr_openxr=OFF
|
||||
)
|
||||
|
||||
qt6-build_src_configure
|
||||
}
|
||||
56
dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
Normal file
56
dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
Normal file
@ -0,0 +1,56 @@
|
||||
# Copyright 2021-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
QT6_HAS_STATIC_LIBS=1
|
||||
inherit qt6-build
|
||||
|
||||
DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
|
||||
|
||||
if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
|
||||
elif [[ ${QT6_BUILD_TYPE} == live ]]; then
|
||||
EGIT_SUBMODULES=() # skip qtquick3d-assimp
|
||||
fi
|
||||
|
||||
IUSE="opengl vulkan"
|
||||
|
||||
RDEPEND="
|
||||
~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
|
||||
~dev-qt/qtdeclarative-${PV}:6
|
||||
~dev-qt/qtquicktimeline-${PV}:6
|
||||
~dev-qt/qtshadertools-${PV}:6
|
||||
media-libs/assimp:=
|
||||
virtual/zlib:=
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
test? ( ~dev-qt/qtbase-${PV}:6[network] )
|
||||
vulkan? ( dev-util/vulkan-headers )
|
||||
"
|
||||
BDEPEND="
|
||||
~dev-qt/qtshadertools-${PV}:6
|
||||
"
|
||||
|
||||
CMAKE_SKIP_TESTS=(
|
||||
# needs off-by-default assimp[collada] that is masked on some profiles,
|
||||
# not worth the extra trouble
|
||||
tst_qquick3dassetimport
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
|
||||
"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
# TODO: if someone wants it, openxr should likely have its own
|
||||
# USE and be packaged rather than use the bundled copy (if use
|
||||
# bundled, note need to setup python-any-r1)
|
||||
-DQT_FEATURE_quick3dxr_openxr=OFF
|
||||
)
|
||||
|
||||
qt6-build_src_configure
|
||||
}
|
||||
Reference in New Issue
Block a user