Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quick3d ver. bump

Browse Source
This commit is contained in:
Rmys
2025-07-29 12:24:50 +03:00
parent f174349e96
commit b2253183c0
3 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt6/qt6-quick3d/actions.py
+13 -13
View File
@@ -10,26 +10,26 @@ from pisi.actionsapi import get, cmaketools
def setup():
shelltools.export("CC", "clang")
shelltools.export("CXX", "clang++")
cmaketools.configure("-B build \
-D-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
-DCMAKE_BUILD_TYPE=Release")
# shelltools.export("CC", "clang")
# shelltools.export("CXX", "clang++")
# cmaketools.configure("-B build \
# -D-DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
# -DCMAKE_BUILD_TYPE=Release")
# qt6.configure()
qt6.configure()
def build():
cmaketools.make("-C build")
shelltools.system("cmake --build build")
# qt6.make()
# cmaketools.make("-C build")
# shelltools.system("cmake --build build")
qt6.make()
def install():
shelltools.cd("build")
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
# qt6.install()
# shelltools.cd("build")
# cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
qt6.install()
#I hope qtchooser will manage this issue
for bin in shelltools.ls("%s/usr/lib/qt6/bin" % get.installDIR()):
pisitools.dosym("/usr/lib/qt6/bin/%s" % bin, "/usr/bin/%s-qt6" % bin)
pisitools.dodoc("../LICENSES/*")
pisitools.dodoc("LICENSES/*")
desktop/toolkit/qt6/qt6-quick3d/files/assimp6.patch
+22
View File
@@ -0,0 +1,22 @@
diff --git a/src/plugins/assetimporters/configure.cmake b/src/plugins/assetimporters/configure.cmake
index 35fb2890e..745a44513 100644
--- a/src/plugins/assetimporters/configure.cmake
+++ b/src/plugins/assetimporters/configure.cmake
@@ -13,7 +13,7 @@ set_property(CACHE INPUT_quick3d_assimp PROPERTY STRINGS undefined no qt system)
#### Libraries
-qt_find_package(WrapQuick3DAssimp 5.1.6 PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp MODULE_NAME assetimporters QMAKE_LIB quick3d_assimp)
+qt_find_package(WrapQuick3DAssimp 6 PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp MODULE_NAME assetimporters QMAKE_LIB quick3d_assimp)
# Work around QTBUG-115064
# Assimp depends on draco_X, but only one of the two targets gets promoted by qt_find_package
@@ -35,7 +35,7 @@ qt_config_compile_test("quick3d_assimp"
LABEL "Assimp"
PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../config.tests/quick3d_assimp"
LIBRARIES WrapQuick3DAssimp::WrapQuick3DAssimp
- PACKAGES PACKAGE WrapQuick3DAssimp 5.1.6)
+ PACKAGES PACKAGE WrapQuick3DAssimp 6)
#### Tests
desktop/toolkit/qt6/qt6-quick3d/pspec.xml
+9 -2
View File
@@ -22,14 +22,14 @@
<Dependency>cmake</Dependency>
<Dependency>vulkan-headers</Dependency>
<Dependency>llvm-clang-devel</Dependency>
<Dependency versionFrom="3.3.1">assimp-devel</Dependency>
<Dependency versionFrom="6.0.2">assimp-devel</Dependency>
<Dependency versionFrom="6.9.1">qt6-base-devel</Dependency>
<Dependency versionFrom="6.9.1">qt6-declarative-devel</Dependency>
<Dependency versionFrom="6.9.1">qt6-shadertools-devel</Dependency>
<Dependency versionFrom="6.9.1">qt6-quicktimeline-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">qtquick3d-fix-build-with-gcc11.patch</Patch> -->
<Patch level="1">assimp6.patch</Patch>
</Patches>
</Source>
<Package>
@@ -70,6 +70,13 @@
</Files>
</Package>
<History>
<Update release="17">
<Date>2025-07-28</Date>
<Version>6.9.1</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="16">
<Date>2025-06-09</Date>
<Version>6.9.1</Version>