From 8e78590ad7a3c7318c2d1013f77892c59babf1e2 Mon Sep 17 00:00:00 2001 From: Eviral Date: Thu, 19 Dec 2024 22:14:06 +0100 Subject: [PATCH] [openfbx] Miniz dep was removed in latest version and replaced by libdeflate (#42694) Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/openfbx/CMakeLists.txt | 5 +++-- ports/openfbx/unofficial-openfbxConfig.cmake.in | 4 ++-- ports/openfbx/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/o-/openfbx.json | 5 +++++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ports/openfbx/CMakeLists.txt b/ports/openfbx/CMakeLists.txt index 820b4442c2..9339b26d0c 100644 --- a/ports/openfbx/CMakeLists.txt +++ b/ports/openfbx/CMakeLists.txt @@ -6,10 +6,11 @@ set(CMAKE_CXX_STANDARD 11) include(GNUInstallDirs) -find_package(miniz REQUIRED) +find_package(libdeflate REQUIRED) add_library(openfbx src/ofbx.cpp) -target_link_libraries(openfbx PRIVATE miniz::miniz) +target_link_libraries(openfbx PRIVATE $,libdeflate::libdeflate_shared,libdeflate::libdeflate_static>) + target_include_directories(openfbx PUBLIC diff --git a/ports/openfbx/unofficial-openfbxConfig.cmake.in b/ports/openfbx/unofficial-openfbxConfig.cmake.in index 421787837f..88e675917e 100644 --- a/ports/openfbx/unofficial-openfbxConfig.cmake.in +++ b/ports/openfbx/unofficial-openfbxConfig.cmake.in @@ -1,8 +1,8 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(miniz) +find_dependency(libdeflate) include("${CMAKE_CURRENT_LIST_DIR}/unofficial-openfbxTargets.cmake") -check_required_components(miniz) +check_required_components(libdeflate) diff --git a/ports/openfbx/vcpkg.json b/ports/openfbx/vcpkg.json index 28f8685267..a75946b391 100644 --- a/ports/openfbx/vcpkg.json +++ b/ports/openfbx/vcpkg.json @@ -1,11 +1,12 @@ { "name": "openfbx", "version-date": "2024-05-08", + "port-version": 1, "description": "Lightweight open source FBX importer", "homepage": "https://github.com/nem0/OpenFBX", "license": "MIT", "dependencies": [ - "miniz", + "libdeflate", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 055b2c9c48..9c5f074ab9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6694,7 +6694,7 @@ }, "openfbx": { "baseline": "2024-05-08", - "port-version": 0 + "port-version": 1 }, "openfx": { "baseline": "1.4", diff --git a/versions/o-/openfbx.json b/versions/o-/openfbx.json index 14e817bfdc..47eba811c0 100644 --- a/versions/o-/openfbx.json +++ b/versions/o-/openfbx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91f58df63150443bd8e644f319361162031b88c7", + "version-date": "2024-05-08", + "port-version": 1 + }, { "git-tree": "a8cefcba9bae878776bff95c9f078ffa58d5f15a", "version-date": "2024-05-08",