From 166f7b88302799b099290891ef8979ee980c6c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Fri, 12 Apr 2024 11:14:21 -0300 Subject: [PATCH 1/3] Updated to latest glfw3. --- bin/runme_minimal.sh | 4 ++-- tlRender | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/runme_minimal.sh b/bin/runme_minimal.sh index ff675c2ea..a51cc4490 100644 --- a/bin/runme_minimal.sh +++ b/bin/runme_minimal.sh @@ -27,7 +27,7 @@ params=$* # . etc/build_dir.sh -export BUILD_DIR=$BUILD_DIR-minimal +export BUILD_DIR=BUILD-$KERNEL-$ARCH-minimal/${CMAKE_BUILD_TYPE} mkdir -p $BUILD_DIR @@ -44,7 +44,7 @@ echo "Saving compile log to $BUILD_DIR/compile.log ..." # # These are some of the expensive mrv2 options # -export BUILD_PYTHON=ON +export BUILD_PYTHON=OFF export MRV2_PYFLTK=OFF export MRV2_PYBIND11=OFF export MRV2_NETWORK=OFF diff --git a/tlRender b/tlRender index ac98981e3..db9cdd135 160000 --- a/tlRender +++ b/tlRender @@ -1 +1 @@ -Subproject commit ac98981e343a89cf0c3b9de52a0d932476980ffb +Subproject commit db9cdd135b48912bfc3237ca022f29a5abaeacbb From 64bd106905dd3f121322c7247db8d636511a5305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Fri, 12 Apr 2024 12:30:34 -0300 Subject: [PATCH 2/3] Changed to have FLTK use system libdecor. --- cmake/Modules/BuildFLTK.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake index 9efef9309..f555f3346 100644 --- a/cmake/Modules/BuildFLTK.cmake +++ b/cmake/Modules/BuildFLTK.cmake @@ -68,6 +68,7 @@ ExternalProject_Add( -DFLTK_BUILD_HTML_DOCS=OFF -DFLTK_BUILD_TEST=OFF -DFLTK_BUILD_SHARED_LIBS=${FLTK_BUILD_SHARED_LIBS} + -DFLTK_USE_SYSTEM_LIBDECOR=1 -DFLTK_USE_SYSTEM_ZLIB=1 -DFLTK_USE_SYSTEM_LIBJPEG=1 -DFLTK_USE_SYSTEM_LIBPNG=1 From 218812fa9101d821c26cc58b867de4305fafe6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Fri, 12 Apr 2024 12:58:31 -0300 Subject: [PATCH 3/3] Updated docs. --- mrv2/docs/HISTORY.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md index dfcc9c302..121a01abe 100644 --- a/mrv2/docs/HISTORY.md +++ b/mrv2/docs/HISTORY.md @@ -22,6 +22,9 @@ v1.1.2 it. - Updated mrv2 to Python 3.11. - Python 3.11 on Windows is now built with optimizations on. +- Updated mrv2's glfw3 to 3.4. +- Updated mrv2's FLTK build to use the system libdecor + (needs v0.2.2 at least). v1.1.1