diff --git a/pkg.info b/pkg.info index 873a646..09ba51c 100644 --- a/pkg.info +++ b/pkg.info @@ -1,6 +1,6 @@ name: qt6-quick3d description: Qt module and API for defining 3D content in Qt Quick -version: 6.10.2 +version: 6.11.0 revision: 1 url: https://www.qt.io/ license: GPL3-only,LGPL3-only,LicenseRef-Qt-Commercial,Qt-GPL-exception-1.0 @@ -28,4 +28,4 @@ downloads: type: git clone_to: ${BPM_SOURCE} git_branch: v${BPM_PKG_VERSION} - checksum: ecd08b6626c6940c5e94a7245d2c95a33ac5db3e + checksum: fefd81716eaf4d7cd274b9a6c8770f2ae40d3dda diff --git a/source-files/assimp-6.patch b/source-files/assimp-6.patch index 71cbc29..5b2157f 100644 --- a/source-files/assimp-6.patch +++ b/source-files/assimp-6.patch @@ -6,11 +6,11 @@ index 35fb2890e..745a44513 100644 #### 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 +-qt_find_package(WrapQuick3DAssimp 5.1.6 PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp ++qt_find_package(WrapQuick3DAssimp 6 PROVIDED_TARGETS WrapQuick3DAssimp::WrapQuick3DAssimp + MODULE_NAME assetimporters + QMAKE_LIB quick3d_assimp + VCPKG_PORT assimp @@ -35,7 +35,7 @@ qt_config_compile_test("quick3d_assimp" LABEL "Assimp" PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../config.tests/quick3d_assimp"