[qtquick3d] devendor meshoptimizer (#41708)

This commit is contained in:
Matthias Kuhn 2024-11-28 02:09:50 +01:00 committed by GitHub
parent 852e42db9f
commit 802aa3063a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 74 additions and 1 deletions

View File

@ -0,0 +1,64 @@
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index 78ad8af..bee1ca6 100644
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -7,6 +7,8 @@
## Quick3DUtils Module:
#####################################################################
+qt_find_package(meshoptimizer PROVIDED_TARGETS meshoptimizer::meshoptimizer)
+
qt_internal_add_module(Quick3DUtils
SOURCES
qqsbcollection.cpp qqsbcollection_p.h
@@ -26,49 +28,17 @@ qt_internal_add_module(Quick3DUtils
qquick3dprofiler_p.h
../3rdparty/xatlas/xatlas.cpp ../3rdparty/xatlas/xatlas.h
qssglightmapuvgenerator.cpp qssglightmapuvgenerator_p.h
- ../3rdparty/meshoptimizer/src/allocator.cpp
- ../3rdparty/meshoptimizer/src/clusterizer.cpp
- ../3rdparty/meshoptimizer/src/indexcodec.cpp
- ../3rdparty/meshoptimizer/src/indexgenerator.cpp
- ../3rdparty/meshoptimizer/src/meshoptimizer.h
- ../3rdparty/meshoptimizer/src/overdrawanalyzer.cpp
- ../3rdparty/meshoptimizer/src/overdrawoptimizer.cpp
- ../3rdparty/meshoptimizer/src/simplifier.cpp
- ../3rdparty/meshoptimizer/src/spatialorder.cpp
- ../3rdparty/meshoptimizer/src/stripifier.cpp
- ../3rdparty/meshoptimizer/src/vcacheanalyzer.cpp
- ../3rdparty/meshoptimizer/src/vcacheoptimizer.cpp
- ../3rdparty/meshoptimizer/src/vertexcodec.cpp
- ../3rdparty/meshoptimizer/src/vertexfilter.cpp
- ../3rdparty/meshoptimizer/src/vfetchanalyzer.cpp
- ../3rdparty/meshoptimizer/src/vfetchoptimizer.cpp
NO_UNITY_BUILD_SOURCES
../3rdparty/xatlas/xatlas.cpp ../3rdparty/xatlas/xatlas.h
- ../3rdparty/meshoptimizer/src/allocator.cpp
- ../3rdparty/meshoptimizer/src/clusterizer.cpp
- ../3rdparty/meshoptimizer/src/indexcodec.cpp
- ../3rdparty/meshoptimizer/src/indexgenerator.cpp
- ../3rdparty/meshoptimizer/src/meshoptimizer.h
- ../3rdparty/meshoptimizer/src/overdrawanalyzer.cpp
- ../3rdparty/meshoptimizer/src/overdrawoptimizer.cpp
- ../3rdparty/meshoptimizer/src/simplifier.cpp
- ../3rdparty/meshoptimizer/src/spatialorder.cpp
- ../3rdparty/meshoptimizer/src/stripifier.cpp
- ../3rdparty/meshoptimizer/src/vcacheanalyzer.cpp
- ../3rdparty/meshoptimizer/src/vcacheoptimizer.cpp
- ../3rdparty/meshoptimizer/src/vertexcodec.cpp
- ../3rdparty/meshoptimizer/src/vertexfilter.cpp
- ../3rdparty/meshoptimizer/src/vfetchanalyzer.cpp
- ../3rdparty/meshoptimizer/src/vfetchoptimizer.cpp
DEFINES
QT_BUILD_QUICK3DUTILS_LIB
INCLUDE_DIRECTORIES
../3rdparty/xatlas
- ../3rdparty/meshoptimizer/src/
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
Qt::QuickPrivate
+ meshoptimizer::meshoptimizer
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui

View File

@ -1,4 +1,6 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
set(${PORT}_PATCHES 0001-devendor-meshoptimizer.patch)
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
# General features:

View File

@ -1,10 +1,12 @@
{
"name": "qtquick3d",
"version": "6.8.0",
"port-version": 1,
"description": "Qt Quick 3D provides a high-level API for creating 3D content and 3D user interfaces based on Qt Quick.",
"homepage": "https://www.qt.io/",
"license": null,
"dependencies": [
"meshoptimizer",
{
"name": "qtbase",
"default-features": false,

View File

@ -7646,7 +7646,7 @@
},
"qtquick3d": {
"baseline": "6.8.0",
"port-version": 0
"port-version": 1
},
"qtquick3dphysics": {
"baseline": "6.8.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fa68693ed85805d15372607e762b2fd23050ad38",
"version": "6.8.0",
"port-version": 1
},
{
"git-tree": "19262762b2f6187cff88f9ddd04879de79227a93",
"version": "6.8.0",