<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/403d859adfb222263430a354f79fc64152cdf361">https://github.com/macports/macports-ports/commit/403d859adfb222263430a354f79fc64152cdf361</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 403d859adfb222263430a354f79fc64152cdf361
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Fri Jan 3 12:14:17 2025 +0100
<span style='display:block; white-space:pre;color:#404040;'> tinygltf: update to 2.9.4
</span>---
graphics/tinygltf/Portfile | 8 ++++----
graphics/tinygltf/files/01_patch-cmake.diff | 23 ++++++++++++++--------
graphics/tinygltf/files/03_patch-enable-ctest.diff | 10 +++++-----
3 files changed, 24 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tinygltf/Portfile b/graphics/tinygltf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f8936836f9d..a115981d45d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/tinygltf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tinygltf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup syoyo tinygltf 2.9.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup syoyo tinygltf 2.9.4 v
</span> revision 0
github.tarball_from archive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,9 +14,9 @@ maintainers nomaintainer
</span> description Header only C++11 tiny glTF 2.0 library
long_description {*}${description}.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3bbe367bf57553804569a3dc4f9e45114fcd556b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f5f282508609a0098048c8ff25d72f4ef0995bc1d46bc7a5d740e559d80023d2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5904632
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 53e8ddc74d64acc1aaf5fb42d960dac6f49cd76b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 16cd37cdfecd5d8204cdbc37d0affbcadf970dbd33da8d8a0feba5028124f946 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5905137
</span>
compiler.cxx_standard 2011
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tinygltf/files/01_patch-cmake.diff b/graphics/tinygltf/files/01_patch-cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 278a5db882d..a298ffa9375 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/tinygltf/files/01_patch-cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tinygltf/files/01_patch-cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@ https://sources.debian.org/src/tinygltf/2.8.15%2Bdfsg-2/debian/patches/0001-Fix-
</span>
Enables use of the ports 'nlohmann-json' and 'stb', instead of using the embedded versions.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2024-12-30 14:11:09
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2025-01-03 11:54:59
</span> @@ -1,14 +1,18 @@
cmake_minimum_required(VERSION 3.6)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ Enables use of the ports 'nlohmann-json' and 'stb', instead of using the embedde
</span>
option(TINYGLTF_BUILD_LOADER_EXAMPLE "Build loader_example(load glTF and dump infos)" ON)
option(TINYGLTF_BUILD_GL_EXAMPLES "Build GL exampels(requires glfw, OpenGL, etc)" OFF)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,44 +40,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,51 +41,28 @@
</span> add_subdirectory ( examples/build-gltf )
endif (TINYGLTF_BUILD_BUILDER_EXAMPLE)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,21 +70,28 @@ Enables use of the ports 'nlohmann-json' and 'stb', instead of using the embedde
</span> -
-if (TINYGLTF_INSTALL)
- install(TARGETS tinygltf EXPORT tinygltfTargets)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(EXPORT tinygltfTargets NAMESPACE tinygltf:: FILE TinyGLTFTargets.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(EXPORT tinygltfTargets NAMESPACE tinygltf:: FILE TinyGLTFTargets.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tinygltf)
</span> - configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/TinyGLTFConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/TinyGLTFConfig.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TinyGLTFConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TinyGLTFConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tinygltf)
</span> - # Do not install .lib even if !TINYGLTF_HEADER_ONLY
-
- INSTALL ( FILES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- json.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stb_image.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stb_image_write.h
</span> - tiny_gltf.h
- ${TINYGLTF_EXTRA_SOUECES}
- DESTINATION
- include
- )
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(TINYGLTF_INSTALL_VENDOR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL ( FILES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- json.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- stb_image.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- stb_image_write.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -endif(TINYGLTF_INSTALL)
+install(
+ TARGETS ${PROJECT_NAME}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tinygltf/files/03_patch-enable-ctest.diff b/graphics/tinygltf/files/03_patch-enable-ctest.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f1f6a008252..4b06f406fb2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/tinygltf/files/03_patch-enable-ctest.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tinygltf/files/03_patch-enable-ctest.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,17 +12,17 @@
</span> +endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(TINYGLTF_BUILD_BUILDER_EXAMPLE "Build glTF builder example" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2025-01-03 11:56:36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2025-01-03 12:05:10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,7 @@
</span> option(TINYGLTF_HEADER_ONLY "On: header-only mode. Off: create tinygltf library(No TINYGLTF_IMPLEMENTATION required in your project)" OFF)
option(TINYGLTF_INSTALL "Install tinygltf files during install step. Usually set to OFF if you include tinygltf through add_subdirectory()" ON)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(TINYGLTF_INSTALL_VENDOR "Install vendored nlohmann/json and nothings/stb headers" ON)
</span> +option(TINYGLTF_BUILD_TESTS "Build tests" OFF)
if (TINYGLTF_BUILD_LOADER_EXAMPLE)
add_executable(loader_example
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,3 +66,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,3 +67,8 @@
</span> NAMESPACE ${PROJECT_NAME}::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
install(FILES tiny_gltf.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
</pre><pre style='margin:0'>
</pre>