From 0aaefc6e519ebf8668c605e2b631805087f847de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Mon, 8 Apr 2024 14:29:36 -0300 Subject: [PATCH 01/10] Listing of library locations. --- cmake/Modules/BuildFLTK.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake index 54a79beed..9efef9309 100644 --- a/cmake/Modules/BuildFLTK.cmake +++ b/cmake/Modules/BuildFLTK.cmake @@ -6,7 +6,7 @@ include( ExternalProject ) #set( FLTK_GIT_TAG master ) #set(FLTK_GIT_TAG 26f5b38a0113be817d13193387913580b5996d77) # Previous stable TAG -set(FLTK_GIT_TAG 31170c47314a8b71331dd7d63c898478edc98c84) +set(FLTK_GIT_TAG 265e5cd77b30581e7701927930d8fa887e0361df) # has paths to libs set( FLTK_BUILD_SHARED_LIBS ON ) # We no longer compile static. From 29823db6ce5448c9a03ee6aba7a7f7079298cce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Mon, 8 Apr 2024 15:48:56 -0300 Subject: [PATCH 02/10] Updated macos12 workflow. --- .github/workflows/full_macos12.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/full_macos12.yml b/.github/workflows/full_macos12.yml index 97519f62d..08abcf4b1 100644 --- a/.github/workflows/full_macos12.yml +++ b/.github/workflows/full_macos12.yml @@ -55,7 +55,7 @@ jobs: - name: Build mrv2 run: | - ./runme_nolog.sh -t package + ./runme_nolog.sh -j 3 -t package - name: Upload binaries run: | From 8e7e9bd2fb49982d7ed27050d926bc778c33752a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Mon, 8 Apr 2024 16:42:12 -0300 Subject: [PATCH 03/10] One file at a time compile. --- .github/workflows/full_macos12.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/full_macos12.yml b/.github/workflows/full_macos12.yml index 08abcf4b1..db4bf701d 100644 --- a/.github/workflows/full_macos12.yml +++ b/.github/workflows/full_macos12.yml @@ -55,7 +55,7 @@ jobs: - name: Build mrv2 run: | - ./runme_nolog.sh -j 3 -t package + ./runme_nolog.sh -j 1 -t package - name: Upload binaries run: | From 0d856697b80fca1268028647aaeaa87c0a27f15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Tue, 9 Apr 2024 14:35:45 -0300 Subject: [PATCH 04/10] Updated to latest tlRender. --- tlRender | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tlRender b/tlRender index bf0a1af0f..394b8eeb8 160000 --- a/tlRender +++ b/tlRender @@ -1 +1 @@ -Subproject commit bf0a1af0f9e4e09b8f225c4aa2c78b95136b5d94 +Subproject commit 394b8eeb81dc208b769933c9c3ef176504e1e709 From d22320a066f1134122571e8c97ac1b4bcdae3b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Tue, 9 Apr 2024 22:15:02 -0300 Subject: [PATCH 05/10] Reverted one cpu run. --- .github/workflows/full_macos12.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/full_macos12.yml b/.github/workflows/full_macos12.yml index db4bf701d..97519f62d 100644 --- a/.github/workflows/full_macos12.yml +++ b/.github/workflows/full_macos12.yml @@ -55,7 +55,7 @@ jobs: - name: Build mrv2 run: | - ./runme_nolog.sh -j 1 -t package + ./runme_nolog.sh -t package - name: Upload binaries run: | From b991c260052f3bd6adb93dd0048591caeaa9e1bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Tue, 9 Apr 2024 23:09:27 -0300 Subject: [PATCH 06/10] Reverting to cmake 3.29. --- .github/workflows/full_macos12.yml | 6 ++++++ .github/workflows/full_macos14.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/full_macos12.yml b/.github/workflows/full_macos12.yml index 97519f62d..0d3c9c99e 100644 --- a/.github/workflows/full_macos12.yml +++ b/.github/workflows/full_macos12.yml @@ -20,6 +20,12 @@ jobs: - name: Get machine name run: | echo "Machine name: $RUNNER_NAME" + + - name: Remove cmake 3.29.1 + run: | + brew remove cmake + brew install cmake@3.29 + brew link cmake@3.29 --force - name: Install ninja-build run: brew install ninja diff --git a/.github/workflows/full_macos14.yml b/.github/workflows/full_macos14.yml index 4d27654e6..39a119cb4 100644 --- a/.github/workflows/full_macos14.yml +++ b/.github/workflows/full_macos14.yml @@ -24,6 +24,12 @@ jobs: run: | echo "Machine name: $RUNNER_NAME" + - name: Remove cmake 3.29.1 + run: | + brew remove cmake + brew install cmake@3.29 + brew link cmake@3.29 --force + - name: Install ninja-build run: brew install ninja From 59e0d4bcd246acd9abaca24c2215dba91ba1fdfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Tue, 9 Apr 2024 23:20:43 -0300 Subject: [PATCH 07/10] reverted cmake@3.29. --- .github/workflows/full_macos12.yml | 6 ------ .github/workflows/full_macos14.yml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/.github/workflows/full_macos12.yml b/.github/workflows/full_macos12.yml index 0d3c9c99e..97519f62d 100644 --- a/.github/workflows/full_macos12.yml +++ b/.github/workflows/full_macos12.yml @@ -20,12 +20,6 @@ jobs: - name: Get machine name run: | echo "Machine name: $RUNNER_NAME" - - - name: Remove cmake 3.29.1 - run: | - brew remove cmake - brew install cmake@3.29 - brew link cmake@3.29 --force - name: Install ninja-build run: brew install ninja diff --git a/.github/workflows/full_macos14.yml b/.github/workflows/full_macos14.yml index 39a119cb4..4ce55280e 100644 --- a/.github/workflows/full_macos14.yml +++ b/.github/workflows/full_macos14.yml @@ -23,12 +23,6 @@ jobs: - name: Get machine name run: | echo "Machine name: $RUNNER_NAME" - - - name: Remove cmake 3.29.1 - run: | - brew remove cmake - brew install cmake@3.29 - brew link cmake@3.29 --force - name: Install ninja-build run: brew install ninja From 5626579e970d7bb9db466660ff8231fe8395cfdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Thu, 11 Apr 2024 17:09:17 -0300 Subject: [PATCH 08/10] Updated HISTORY. --- mrv2/docs/HISTORY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md index dfcc9c302..78247b18f 100644 --- a/mrv2/docs/HISTORY.md +++ b/mrv2/docs/HISTORY.md @@ -20,7 +20,7 @@ v1.1.2 - Fixed refreshing of image sequences when there were missing frames and later they were added. It used to work in v1.0.0 but a change in tlRender broke it. -- Updated mrv2 to Python 3.11. +- Updated mrv2 to Python 3.11 to conform to the VFX 2024 Platform. - Python 3.11 on Windows is now built with optimizations on. From d4b56a2bee532d68e3b046e648d0419744b40aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Thu, 11 Apr 2024 17:09:48 -0300 Subject: [PATCH 09/10] =?UTF-8?q?commit=204acab631397443ea788958ba696d0429?= =?UTF-8?q?685d1993=20Author:=20Gonzalo=20Garramu=C3=B1o=20=20Date:=20=20=20Wed=20Apr=2010=2015:15:27=202024=20-0300?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated OpenColorIO. commit ec955039fdfdbe2bee5f3a225bc8823d23243193 Author: Gonzalo Garramuño Date: Wed Apr 10 14:59:00 2024 -0300 Updated tlRender. commit 7c7ec3b4eeffc30e54489cd6f03af9c96b4297b2 Author: Gonzalo Garramuño Date: Wed Apr 10 14:42:19 2024 -0300 Updated pybind11. commit 06f4f2e8ebb4465b2f5f4c5c9a09981b4f9ca799 Author: Gonzalo Garramuño Date: Wed Apr 10 14:36:41 2024 -0300 Build Python 3.11.9. commit 4b6adab66a34e1805d76f43cd56bc3822aeb14de Author: Gonzalo Garramuño Date: Wed Apr 10 13:59:21 2024 -0300 Fixed refreshing of image sequences. commit cefe3a27417ff009811098902fc98df063873ca3 Author: Gonzalo Garramuño Date: Tue Apr 9 23:27:55 2024 -0300 Updated to latest tlRender. Listing of library locations in FLTK (temporary). --- .github/workflows/full_linux.yml | 6 ++++- .github/workflows/full_macos12.yml | 6 ++++- .github/workflows/full_macos14.yml | 4 ++++ .github/workflows/full_win64.yml | 6 ++++- .github/workflows/python.yml | 18 ++++++++++++++- CMakeLists.txt | 5 ---- Doxyfile | 1 + bin/runme_minimal.sh | 2 +- cmake/Modules/BuildPython.cmake | 10 ++++---- cmake/Modules/Buildpybind11.cmake | 2 +- cmake/build_python_windows.cmake | 4 ++-- etc/build_dir.sh | 10 ++++---- etc/configure-macos-python.sh | 1 - etc/install_cmake.sh | 37 +++++++++++++++++++++++------- mrv2/docs/HISTORY.md | 5 ++++ mrv2/lib/mrvFl/mrvCallbacks.cpp | 9 ++++++++ mrv2/lib/mrvFl/mrvCallbacks.h | 3 ++- tlRender | 2 +- 18 files changed, 97 insertions(+), 34 deletions(-) diff --git a/.github/workflows/full_linux.yml b/.github/workflows/full_linux.yml index 195fdbc77..971eaa417 100644 --- a/.github/workflows/full_linux.yml +++ b/.github/workflows/full_linux.yml @@ -74,7 +74,11 @@ jobs: - name: Set executable permissions run: | chmod +x ./*.sh ./bin/*.sh ./etc/*.sh - + + - name: Install cmake + run: | + ./etc/install_cmake.sh + - name: Build mrv2 run: | ./runme_nolog.sh -t package diff --git a/.github/workflows/full_macos12.yml b/.github/workflows/full_macos12.yml index 97519f62d..6e7c7ffc0 100644 --- a/.github/workflows/full_macos12.yml +++ b/.github/workflows/full_macos12.yml @@ -53,9 +53,13 @@ jobs: run: | chmod +x ./*.sh ./bin/*.sh ./etc/*.sh + - name: Install cmake + run: | + ./etc/install_cmake.sh + - name: Build mrv2 run: | - ./runme_nolog.sh -t package + ./runme_nolog.sh -j 3 -t package - name: Upload binaries run: | diff --git a/.github/workflows/full_macos14.yml b/.github/workflows/full_macos14.yml index 4ce55280e..f71878ba7 100644 --- a/.github/workflows/full_macos14.yml +++ b/.github/workflows/full_macos14.yml @@ -59,6 +59,10 @@ jobs: run: | chmod +x ./*.sh ./bin/*.sh ./etc/*.sh + - name: Install cmake + run: | + ./etc/install_cmake.sh + - name: Build mrv2 run: | ./runme_nolog.sh -t package diff --git a/.github/workflows/full_win64.yml b/.github/workflows/full_win64.yml index 27481167c..92c83376d 100644 --- a/.github/workflows/full_win64.yml +++ b/.github/workflows/full_win64.yml @@ -57,7 +57,11 @@ jobs: - name: Set executable permissions run: | chmod +x ./*.sh ./bin/*.sh ./etc/*.sh - + + - name: Install cmake + run: | + ./etc/install_cmake.sh + - name: Build mrv2 run: | ./runme_nolog.sh -t package -D TLRENDER_USD=OFF diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index d5dc2f65a..486dfb167 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -59,6 +59,10 @@ jobs: run: | chmod +x ./*.sh ./bin/*.sh ./etc/*.sh + - name: Install cmake + run: | + ./etc/install_cmake.sh + - name: Build mrv2 run: | ./runme_nolog.sh -D TLRENDER_USD=OFF -D TLRENDER_FFMPEG=OFF -D MRV2_PDF=OFF -D MRV2_NETWORK=OFF -D MRV2_PYBIND11=ON -D BUILD_PYTHON=ON -D TLRENDER_EXR=OFF -D TLRENDER_RAW=OFF -D TLRENDER_TIFF=OFF -D TLRENDER_NET=OFF @@ -102,6 +106,10 @@ jobs: run: | icacls "ssh\id_rsa" /inheritance:r /grant:r "%USERNAME%:R" + - name: Install cmake + run: | + ./etc/install_cmake.sh + - name: Build mrv2 run: | ./runme_nolog.sh -D TLRENDER_USD=OFF -D TLRENDER_FFMPEG=OFF -D MRV2_PDF=OFF -D MRV2_NETWORK=OFF -D MRV2_PYBIND11=ON -D BUILD_PYTHON=ON -D TLRENDER_EXR=OFF -D TLRENDER_RAW=OFF -D TLRENDER_TIFF=OFF -D TLRENDER_NET=OFF @@ -112,7 +120,7 @@ jobs: macos-python-build: - runs-on: macos-11 + runs-on: macos-12 steps: @@ -152,6 +160,10 @@ jobs: run: | chmod +x ./*.sh ./bin/*.sh ./etc/*.sh + - name: Install cmake + run: | + ./etc/install_cmake.sh + - name: Build mrv2 shell: bash run: @@ -199,6 +211,10 @@ jobs: - name: Set executable permissions run: | chmod +x ./*.sh ./bin/*.sh ./etc/*.sh + + - name: Install cmake + run: | + ./etc/install_cmake.sh - name: Build mrv2 shell: bash diff --git a/CMakeLists.txt b/CMakeLists.txt index 36b616eec..ff2c1acb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,11 +67,6 @@ if(NOT DEFINED CMAKE_INSTALL_MESSAGE) set(CMAKE_INSTALL_MESSAGE "LAZY") endif() - -if(NOT MRV2_PYBIND11 AND BUILD_PYTHON) - set(BUILD_PYTHON OFF) -endif() - # # Python cannot be built with asan dependencies # diff --git a/Doxyfile b/Doxyfile index fda1c480f..eb403ee75 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,4 +1,5 @@ # Doxyfile 1.9.3 +# # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. diff --git a/bin/runme_minimal.sh b/bin/runme_minimal.sh index d5d33a123..ff675c2ea 100644 --- a/bin/runme_minimal.sh +++ b/bin/runme_minimal.sh @@ -44,7 +44,7 @@ echo "Saving compile log to $BUILD_DIR/compile.log ..." # # These are some of the expensive mrv2 options # -export BUILD_PYTHON=OFF +export BUILD_PYTHON=ON export MRV2_PYFLTK=OFF export MRV2_PYBIND11=OFF export MRV2_NETWORK=OFF diff --git a/cmake/Modules/BuildPython.cmake b/cmake/Modules/BuildPython.cmake index 795303c4c..5dcfa4373 100644 --- a/cmake/Modules/BuildPython.cmake +++ b/cmake/Modules/BuildPython.cmake @@ -9,7 +9,7 @@ include(ProcessorCount) ProcessorCount(NPROCS) -set( Python_VERSION 3.10 ) +set( Python_VERSION 3.11 ) set( Python_TINY 9 ) set( Python_URL https://www.python.org/ftp/python/${Python_VERSION}.${Python_TINY}/Python-${Python_VERSION}.${Python_TINY}.tar.xz ) @@ -29,8 +29,8 @@ if(APPLE) set( Python_CONFIGURE ${CMAKE_COMMAND} -E env "CFLAGS=${Python_C_FLAGS}" "CPPFLAGS=${Python_C_FLAGS}" "CXXFLAGS=${Python_CXX_FLAGS}" "LDFLAGS=${Python_LD_FLAGS}" -- ${CMAKE_CURRENT_BINARY_DIR}/configure-macos-python.sh --prefix=${CMAKE_INSTALL_PREFIX} ) - set( Python_BUILD ) - set( Python_INSTALL make -j ${NPROCS} altinstall ) + set( Python_BUILD make -j ${NPROCS} ) + set( Python_INSTALL make -j ${NPROCS} install ) elseif(UNIX) @@ -43,8 +43,8 @@ elseif(UNIX) --enable-shared --prefix=${CMAKE_INSTALL_PREFIX} ) - set( Python_BUILD ) - set( Python_INSTALL make -j ${NPROCS} altinstall ) + set( Python_BUILD make -j ${NPROCS} ) + set( Python_INSTALL make -j ${NPROCS} install ) else() set( platform x64 ) diff --git a/cmake/Modules/Buildpybind11.cmake b/cmake/Modules/Buildpybind11.cmake index ee65f6e30..5b6e0f57b 100644 --- a/cmake/Modules/Buildpybind11.cmake +++ b/cmake/Modules/Buildpybind11.cmake @@ -4,7 +4,7 @@ include( ExternalProject ) -set(pybind11_GIT_TAG v2.10.3) +set(pybind11_GIT_TAG v2.12.0) ExternalProject_Add( pybind11 diff --git a/cmake/build_python_windows.cmake b/cmake/build_python_windows.cmake index 5322d126e..0de2ca349 100644 --- a/cmake/build_python_windows.cmake +++ b/cmake/build_python_windows.cmake @@ -14,9 +14,9 @@ message(STATUS "PATH ENV 2=$ENV{PATH}") set(ROOT_DIR ${CMAKE_INSTALL_PREFIX}/../Python-prefix/src/Python) if (Python_COMMAND STREQUAL "build") - set(CMD cmd /C PCbuild\\build.bat -e -q -p ${Python_PLATFORM}) + set(CMD PCbuild\\build.bat -q -p ${Python_PLATFORM} --pgo ) elseif(Python_COMMAND STREQUAL "install") - set(CMD cmd /C python.bat PC\\layout --precompile --preset-default --copy "${CMAKE_INSTALL_PREFIX}/bin/") + set(CMD python.bat PC\\layout --precompile --preset-default --copy "${CMAKE_INSTALL_PREFIX}/bin/") else() message(FATAL_ERROR "Unknown Python_COMMAND ${Python_COMMAND}!") endif() diff --git a/etc/build_dir.sh b/etc/build_dir.sh index b8606fb54..180ccf5c0 100755 --- a/etc/build_dir.sh +++ b/etc/build_dir.sh @@ -25,11 +25,6 @@ extract_version # extract_python_version -# -# Extract cmake version -# -get_cmake_version - # # Determine OS Kernel, OS CPU architecture # @@ -99,6 +94,11 @@ fi export PATH="$PWD/${BUILD_DIR}/install/bin:$PWD/$BUILD_DIR/install/bin/Scripts:${PATH}" +# +# Extract cmake version +# +get_cmake_version + # # We set both lib64 and lib to handle differences in Linux RH and Ubuntu # diff --git a/etc/configure-macos-python.sh b/etc/configure-macos-python.sh index 905c65895..94162fb63 100755 --- a/etc/configure-macos-python.sh +++ b/etc/configure-macos-python.sh @@ -8,7 +8,6 @@ echo "Running Python macOS configure" #./configure --enable-optimizations --with-openssl=$(brew --prefix openssl) --with-system-ffi --with-ensurepip=install $* ./configure \ - --enable-optimizations \ --enable-optimizations \ --enable-shared \ --with-openssl=$(brew --prefix openssl) \ diff --git a/etc/install_cmake.sh b/etc/install_cmake.sh index 2b177c4f8..00a998e99 100755 --- a/etc/install_cmake.sh +++ b/etc/install_cmake.sh @@ -3,26 +3,47 @@ # mrv2 # Copyright Contributors to the mrv2 Project. All rights reserved. -echo "Getting latest release of cmake" +CMAKE_RELEASE=3.29.0 +CMAKE_PLATFORM=macos-universal +CMAKE_EXT=tar.gz +echo "Getting latest release of cmake" . ./etc/build_dir.sh echo "Will install it in $PWD/$BUILD_DIR/install.." +if [[ $KERNEL == *Linux* ]]; then + CMAKE_PLATFORM=linux-x86_64 + CMAKE_EXT=tar.gz +elif [[ $KERNEL == *Msys* ]]; then + CMAKE_PLATFORM=windows-x86_64 + CMAKE_EXT=zip +fi echo "Downloading cmake..." -wget -c -q https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.tar.gz +wget -c -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_RELEASE}/cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}.${CMAKE_EXT} -echo "Decompressing archive..." -tar -xf cmake-3.26.3-linux-x86_64.tar.gz - -echo "Installing..." +echo "Creating install dir..." if [[ ! -d $PWD/$BUILD_DIR/install/ ]]; then mkdir -p $PWD/$BUILD_DIR/install/ fi -mv -f cmake-3.26.3-linux-x86_64/* $PWD/$BUILD_DIR/install/ + +echo "Decompressing archive..." +if [[ $KERNEL != *Msys* ]]; then + tar -xf cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}.${CMAKE_EXT} +else + unzip cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}.${CMAKE_EXT} +fi + +if [[ $KERNEL != *Darwin* ]]; then + mv -f cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}/* $PWD/$BUILD_DIR/install/ +elif [[ $KERNEL == *Darwin* ]]; then + mv -f cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}/CMake.app/Contents/* $PWD/$BUILD_DIR/install/ +fi + echo "Cleaning up..." -rm -rf cmake-3.26.3-linux-x86_64* +rm -rf cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}* + echo "Checking executable is there:" ls $BUILD_DIR/install/bin diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md index f86d4ca49..78247b18f 100644 --- a/mrv2/docs/HISTORY.md +++ b/mrv2/docs/HISTORY.md @@ -17,6 +17,11 @@ v1.1.2 clip due to a following clip being dragged to the same place as the annotation. - Improved performance of timeline drawing when annotations are present. +- Fixed refreshing of image sequences when there were missing frames and later + they were added. It used to work in v1.0.0 but a change in tlRender broke + it. +- Updated mrv2 to Python 3.11 to conform to the VFX 2024 Platform. +- Python 3.11 on Windows is now built with optimizations on. v1.1.1 diff --git a/mrv2/lib/mrvFl/mrvCallbacks.cpp b/mrv2/lib/mrvFl/mrvCallbacks.cpp index 54acb127a..b6369f58b 100644 --- a/mrv2/lib/mrvFl/mrvCallbacks.cpp +++ b/mrv2/lib/mrvFl/mrvCallbacks.cpp @@ -6,6 +6,8 @@ #include #include +#include + #include #include // for fl_open_uri() @@ -2232,6 +2234,13 @@ namespace mrv auto player = ui->uiView->getTimelinePlayer(); if (!player) return; + + auto app = App::app; + + // Update the I/O cache. + auto ioSystem = app->getContext()->getSystem(); + ioSystem->getCache()->clear(); + player->clearCache(); } diff --git a/mrv2/lib/mrvFl/mrvCallbacks.h b/mrv2/lib/mrvFl/mrvCallbacks.h index 48553f5f5..e716232cc 100644 --- a/mrv2/lib/mrvFl/mrvCallbacks.h +++ b/mrv2/lib/mrvFl/mrvCallbacks.h @@ -66,7 +66,7 @@ namespace mrv void mirror_x_cb(Fl_Menu_* m, ViewerUI* ui); void mirror_y_cb(Fl_Menu_* m, ViewerUI* ui); - + void rotate_plus_90_cb(Fl_Menu_* m, ViewerUI* ui); void rotate_minus_90_cb(Fl_Menu_* m, ViewerUI* ui); @@ -218,6 +218,7 @@ namespace mrv void edit_text_shape_cb(ViewerUI* ui); // Panel callbacks + void refresh_file_cache_cb(Fl_Menu_* m, void* d); void clone_file_cb(Fl_Menu_* m, void* d); void refresh_media_cb(Fl_Menu_* m, void* d); void set_stereo_cb(Fl_Menu_* m, void* d); diff --git a/tlRender b/tlRender index 394b8eeb8..ac98981e3 160000 --- a/tlRender +++ b/tlRender @@ -1 +1 @@ -Subproject commit 394b8eeb81dc208b769933c9c3ef176504e1e709 +Subproject commit ac98981e343a89cf0c3b9de52a0d932476980ffb From 94493ab9013e4f474a587256cb055ed26629f2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Thu, 11 Apr 2024 17:17:19 -0300 Subject: [PATCH 10/10] Updated HISTORY.md. --- mrv2/docs/HISTORY.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md index 78247b18f..701150d9c 100644 --- a/mrv2/docs/HISTORY.md +++ b/mrv2/docs/HISTORY.md @@ -17,9 +17,10 @@ v1.1.2 clip due to a following clip being dragged to the same place as the annotation. - Improved performance of timeline drawing when annotations are present. -- Fixed refreshing of image sequences when there were missing frames and later - they were added. It used to work in v1.0.0 but a change in tlRender broke - it. +- Fixed refreshing of image sequences + (ie. Files Panel->Select Image->RMB->File/Refresh Cache) when there were + missing frames and later they were added. It used to work in v1.0.0 but a + change in tlRender broke it. - Updated mrv2 to Python 3.11 to conform to the VFX 2024 Platform. - Python 3.11 on Windows is now built with optimizations on.