diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 4577e12..bb3cd9e 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -5,12 +5,12 @@ if(WIN32) set(CPACK_GENERATOR ZIP) set(INSTALL_DLLS - ${CMAKE_INSTALL_PREFIX}/bin/avcodec-61.dll - ${CMAKE_INSTALL_PREFIX}/bin/avdevice-61.dll - ${CMAKE_INSTALL_PREFIX}/bin/avformat-61.dll - ${CMAKE_INSTALL_PREFIX}/bin/avutil-59.dll - ${CMAKE_INSTALL_PREFIX}/bin/swresample-5.dll - ${CMAKE_INSTALL_PREFIX}/bin/swscale-8.dll) + ${CMAKE_INSTALL_PREFIX}/bin/avcodec-62.dll + ${CMAKE_INSTALL_PREFIX}/bin/avdevice-62.dll + ${CMAKE_INSTALL_PREFIX}/bin/avformat-62.dll + ${CMAKE_INSTALL_PREFIX}/bin/avutil-60.dll + ${CMAKE_INSTALL_PREFIX}/bin/swresample-6.dll + ${CMAKE_INSTALL_PREFIX}/bin/swscale-9.dll) install( FILES ${INSTALL_DLLS} @@ -25,23 +25,23 @@ elseif(APPLE) #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(INSTALL_DYLIBS - ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.61.19.100.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.61.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.11.100.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.61.3.100.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.61.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.62.1.100.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.62.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libavformat.61.7.100.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libavformat.61.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.3.100.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavformat.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libavutil.59.39.100.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libavutil.59.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.8.100.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavutil.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libswresample.5.3.100.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libswresample.5.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.1.100.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.dylib ${CMAKE_INSTALL_PREFIX}/lib/libswresample.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libswscale.8.3.100.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libswscale.8.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.1.100.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.dylib ${CMAKE_INSTALL_PREFIX}/lib/libswscale.dylib) install( @@ -54,23 +54,23 @@ else() set(INSTALL_LIBS ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.so - ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.so.61 - ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.so.61.19.100 + ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.so.62 + ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.so.62.11.100 ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.so - ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.so.61 - ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.so.61.3.100 + ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.so.62 + ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.so.62.1.100 ${CMAKE_INSTALL_PREFIX}/lib/libavformat.so - ${CMAKE_INSTALL_PREFIX}/lib/libavformat.so.61 - ${CMAKE_INSTALL_PREFIX}/lib/libavformat.so.61.7.100 + ${CMAKE_INSTALL_PREFIX}/lib/libavformat.so.62 + ${CMAKE_INSTALL_PREFIX}/lib/libavformat.so.62.3.100 ${CMAKE_INSTALL_PREFIX}/lib/libavutil.so - ${CMAKE_INSTALL_PREFIX}/lib/libavutil.so.59 - ${CMAKE_INSTALL_PREFIX}/lib/libavutil.so.59.39.100 + ${CMAKE_INSTALL_PREFIX}/lib/libavutil.so.60 + ${CMAKE_INSTALL_PREFIX}/lib/libavutil.so.60.8.100 ${CMAKE_INSTALL_PREFIX}/lib/libswresample.so - ${CMAKE_INSTALL_PREFIX}/lib/libswresample.so.5 - ${CMAKE_INSTALL_PREFIX}/lib/libswresample.so.5.3.100 + ${CMAKE_INSTALL_PREFIX}/lib/libswresample.so.6 + ${CMAKE_INSTALL_PREFIX}/lib/libswresample.so.6.1.100 ${CMAKE_INSTALL_PREFIX}/lib/libswscale.so - ${CMAKE_INSTALL_PREFIX}/lib/libswscale.so.8 - ${CMAKE_INSTALL_PREFIX}/lib/libswscale.so.8.3.100) + ${CMAKE_INSTALL_PREFIX}/lib/libswscale.so.9 + ${CMAKE_INSTALL_PREFIX}/lib/libswscale.so.9.1.100) install( FILES ${INSTALL_LIBS} diff --git a/cmake/SuperBuild/BuildFFmpeg.cmake b/cmake/SuperBuild/BuildFFmpeg.cmake index d0c66bc..955d90e 100644 --- a/cmake/SuperBuild/BuildFFmpeg.cmake +++ b/cmake/SuperBuild/BuildFFmpeg.cmake @@ -98,15 +98,9 @@ set(FFmpeg_CONFIGURE_ARGS if(toucan_FFmpeg_MINIMAL) list(APPEND FFmpeg_CONFIGURE_ARGS --disable-decoders - --enable-decoder=aac - --enable-decoder=ac3 + --enable-decoder=apv --enable-decoder=av1 - --enable-decoder=dca - --enable-decoder=dnxhd - --enable-decoder=eac3 --enable-decoder=flac - --enable-decoder=h264 - --enable-decoder=hevc --enable-decoder=mjpeg --enable-decoder=mp3 --enable-decoder=mpeg2video @@ -146,22 +140,16 @@ if(toucan_FFmpeg_MINIMAL) --enable-decoder=pcm_u32le --enable-decoder=pcm_u8 --enable-decoder=pcm_vidc - --enable-decoder=prores --enable-decoder=rawvideo --enable-decoder=v210 --enable-decoder=v210x --enable-decoder=v308 --enable-decoder=v408 --enable-decoder=v410 - --enable-decoder=vc1 --enable-decoder=vp9 --enable-decoder=yuv4 --disable-encoders - --enable-encoder=aac - --enable-encoder=ac3 - --enable-encoder=dnxhd - --enable-encoder=eac3 - --enable-encoder=libsvtav1 + --enable-encoder=flac --enable-encoder=mjpeg --enable-encoder=mpeg2video --enable-encoder=mpeg4 @@ -196,7 +184,6 @@ if(toucan_FFmpeg_MINIMAL) --enable-encoder=pcm_u32le --enable-encoder=pcm_u8 --enable-encoder=pcm_vidc - --enable-encoder=prores --enable-encoder=rawvideo --enable-encoder=v210 --enable-encoder=v308 @@ -204,22 +191,16 @@ if(toucan_FFmpeg_MINIMAL) --enable-encoder=v410 --enable-encoder=yuv4 --disable-demuxers - --enable-demuxer=aac - --enable-demuxer=ac3 --enable-demuxer=aiff + --enable-demuxer=apv --enable-demuxer=av1 - --enable-demuxer=dnxhd - --enable-demuxer=dts - --enable-demuxer=dtshd - --enable-demuxer=eac3 --enable-demuxer=flac - --enable-demuxer=h264 - --enable-demuxer=hevc - --enable-demuxer=imf --enable-demuxer=m4v + --enable-demuxer=matroska --enable-demuxer=mjpeg --enable-demuxer=mov --enable-demuxer=mp3 + --enable-demuxer=mp4 --enable-demuxer=mxf --enable-demuxer=pcm_alaw --enable-demuxer=pcm_f32be @@ -248,14 +229,9 @@ if(toucan_FFmpeg_MINIMAL) --enable-demuxer=wav --enable-demuxer=yuv4mpegpipe --disable-muxers - --enable-muxer=ac3 --enable-muxer=aiff - --enable-muxer=dnxhd - --enable-muxer=dts - --enable-muxer=eac3 + --enable-muxer=apv --enable-muxer=flac - --enable-muxer=h264 - --enable-muxer=hevc --enable-muxer=m4v --enable-muxer=mjpeg --enable-muxer=mov @@ -287,14 +263,9 @@ if(toucan_FFmpeg_MINIMAL) --enable-muxer=wav --enable-muxer=yuv4mpegpipe --disable-parsers - --enable-parser=aac - --enable-parser=ac3 + --enable-parser=apv --enable-parser=av1 - --enable-parser=dnxhd - --enable-parser=dolby_e --enable-parser=flac - --enable-parser=h264 - --enable-parser=hevc --enable-parser=mjpeg --enable-parser=mpeg4video --enable-parser=mpegaudio @@ -308,9 +279,9 @@ if(toucan_FFmpeg_MINIMAL) --enable-protocol=httpproxy --enable-protocol=https --enable-protocol=md5 - --enable-protocol=pipe + --enable-protocol=tcp --enable-protocol=tls - --disable-filters) + --enable-protocol=udp) endif() if(NOT WIN32) list(APPEND FFmpeg_CONFIGURE_ARGS @@ -379,34 +350,34 @@ else() set(FFmpeg_INSTALL make install) if(APPLE) list(APPEND FFmpeg_INSTALL - COMMAND install_name_tool -id @rpath/libavcodec.61.19.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.61.dylib - COMMAND install_name_tool -id @rpath/libavdevice.61.3.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.61.dylib - COMMAND install_name_tool -id @rpath/libavformat.61.7.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavformat.61.dylib - COMMAND install_name_tool -id @rpath/libavutil.59.39.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavutil.59.dylib - COMMAND install_name_tool -id @rpath/libswresample.5.3.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libswresample.5.dylib - COMMAND install_name_tool -id @rpath/libswscale.8.3.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libswscale.8.dylib + COMMAND install_name_tool -id @rpath/libavcodec.62.11.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.dylib + COMMAND install_name_tool -id @rpath/libavdevice.62.1.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.62.dylib + COMMAND install_name_tool -id @rpath/libavformat.62.3.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.dylib + COMMAND install_name_tool -id @rpath/libavutil.60.8.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib + COMMAND install_name_tool -id @rpath/libswresample.6.1.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.dylib + COMMAND install_name_tool -id @rpath/libswscale.9.1.100.dylib ${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.dylib COMMAND install_name_tool - -change ${CMAKE_INSTALL_PREFIX}/lib/libswresample.5.dylib @rpath/libswresample.5.dylib - -change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.59.dylib @rpath/libavutil.59.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.61.19.100.dylib + -change ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.dylib @rpath/libswresample.6.dylib + -change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib @rpath/libavutil.60.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.11.100.dylib COMMAND install_name_tool - -change ${CMAKE_INSTALL_PREFIX}/lib/libswscale.8.dylib @rpath/libswscale.8.dylib - -change ${CMAKE_INSTALL_PREFIX}/lib/libavformat.61.dylib @rpath/libavformat.61.dylib - -change ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.61.dylib @rpath/libavcodec.61.dylib - -change ${CMAKE_INSTALL_PREFIX}/lib/libswresample.5.dylib @rpath/libswresample.5.dylib - -change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.59.dylib @rpath/libavutil.59.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.61.3.100.dylib + -change ${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.dylib @rpath/libswscale.9.dylib + -change ${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.dylib @rpath/libavformat.62.dylib + -change ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.dylib @rpath/libavcodec.62.dylib + -change ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.dylib @rpath/libswresample.6.dylib + -change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib @rpath/libavutil.60.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libavdevice.62.1.100.dylib COMMAND install_name_tool - -change ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.61.dylib @rpath/libavcodec.61.dylib - -change ${CMAKE_INSTALL_PREFIX}/lib/libswresample.5.dylib @rpath/libswresample.5.dylib - -change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.59.dylib @rpath/libavutil.59.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libavformat.61.7.100.dylib + -change ${CMAKE_INSTALL_PREFIX}/lib/libavcodec.62.dylib @rpath/libavcodec.62.dylib + -change ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.dylib @rpath/libswresample.6.dylib + -change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib @rpath/libavutil.60.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libavformat.62.3.100.dylib COMMAND install_name_tool - -change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.59.dylib @rpath/libavutil.59.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libswresample.5.3.100.dylib + -change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib @rpath/libavutil.60.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libswresample.6.1.100.dylib COMMAND install_name_tool - -change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.59.dylib @rpath/libavutil.59.dylib - ${CMAKE_INSTALL_PREFIX}/lib/libswscale.8.3.100.dylib) + -change ${CMAKE_INSTALL_PREFIX}/lib/libavutil.60.dylib @rpath/libavutil.60.dylib + ${CMAKE_INSTALL_PREFIX}/lib/libswscale.9.1.100.dylib) endif() endif() @@ -414,7 +385,7 @@ ExternalProject_Add( FFmpeg PREFIX ${CMAKE_CURRENT_BINARY_DIR}/FFmpeg DEPENDS ${FFmpeg_DEPS} - URL https://ffmpeg.org/releases/ffmpeg-7.1.tar.bz2 + URL https://ffmpeg.org/releases/ffmpeg-8.0.tar.bz2 CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${CMAKE_INSTALL_PREFIX}/lib/pkgconfig ${FFmpeg_CONFIGURE} BUILD_COMMAND ${FFmpeg_BUILD} INSTALL_COMMAND ${FFmpeg_INSTALL} diff --git a/cmake/SuperBuild/BuildFreetype.cmake b/cmake/SuperBuild/BuildFreetype.cmake index f4c56df..fad1b2c 100644 --- a/cmake/SuperBuild/BuildFreetype.cmake +++ b/cmake/SuperBuild/BuildFreetype.cmake @@ -1,16 +1,16 @@ include(ExternalProject) set(Freetype_GIT_REPOSITORY "https://github.com/freetype/freetype.git") -set(Freetype_GIT_TAG "VER-2-13-0") +set(Freetype_GIT_TAG "VER-2-13-3") set(Freetype_ARGS ${toucan_EXTERNAL_PROJECT_ARGS} -DCMAKE_INSTALL_LIBDIR=lib - -DFT_WITH_ZLIB=ON - -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_PNG=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE) + -DFT_REQUIRE_ZLIB=ON + -DFT_DISABLE_BZIP2=ON + -DFT_DISABLE_PNG=ON + -DFT_DISABLE_HARFBUZZ=ON + -DFT_DISABLE_BROTLI=ON) ExternalProject_Add( Freetype diff --git a/cmake/SuperBuild/BuildImath.cmake b/cmake/SuperBuild/BuildImath.cmake index 3eb4bae..fc8486a 100644 --- a/cmake/SuperBuild/BuildImath.cmake +++ b/cmake/SuperBuild/BuildImath.cmake @@ -1,7 +1,7 @@ include(ExternalProject) set(Imath_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/Imath.git") -set(Imath_GIT_TAG "v3.1.9") +set(Imath_GIT_TAG "v3.1.12") set(Imath_ARGS ${toucan_EXTERNAL_PROJECT_ARGS} diff --git a/cmake/SuperBuild/BuildJPEG.cmake b/cmake/SuperBuild/BuildJPEG.cmake index f37d6a0..461a621 100644 --- a/cmake/SuperBuild/BuildJPEG.cmake +++ b/cmake/SuperBuild/BuildJPEG.cmake @@ -1,7 +1,7 @@ include(ExternalProject) set(libjpeg-turbo_GIT_REPOSITORY "https://github.com/libjpeg-turbo/libjpeg-turbo.git") -set(libjpeg-turbo_GIT_TAG "3.0.0") +set(libjpeg-turbo_GIT_TAG "3.1.1") set(libjpeg-turbo_DEPS ZLIB) if(NOT WIN32) diff --git a/cmake/SuperBuild/BuildOpenColorIO.cmake b/cmake/SuperBuild/BuildOpenColorIO.cmake index 3b3b25e..cb6da3e 100644 --- a/cmake/SuperBuild/BuildOpenColorIO.cmake +++ b/cmake/SuperBuild/BuildOpenColorIO.cmake @@ -1,7 +1,7 @@ include(ExternalProject) set(OpenColorIO_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/OpenColorIO.git") -set(OpenColorIO_GIT_TAG "v2.3.2") +set(OpenColorIO_GIT_TAG "v2.4.2") set(OpenColorIO_ARGS ${toucan_EXTERNAL_PROJECT_ARGS} diff --git a/cmake/SuperBuild/BuildOpenEXR.cmake b/cmake/SuperBuild/BuildOpenEXR.cmake index f3ea12d..0b34e3f 100644 --- a/cmake/SuperBuild/BuildOpenEXR.cmake +++ b/cmake/SuperBuild/BuildOpenEXR.cmake @@ -1,7 +1,7 @@ include(ExternalProject) set(OpenEXR_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/openexr.git") -set(OpenEXR_GIT_TAG "v3.2.0") +set(OpenEXR_GIT_TAG "v3.3.5") set(OpenEXR_ARGS ${toucan_EXTERNAL_PROJECT_ARGS} diff --git a/cmake/SuperBuild/BuildOpenImageIO.cmake b/cmake/SuperBuild/BuildOpenImageIO.cmake index 142b83e..d6df8bc 100644 --- a/cmake/SuperBuild/BuildOpenImageIO.cmake +++ b/cmake/SuperBuild/BuildOpenImageIO.cmake @@ -1,7 +1,7 @@ include(ExternalProject) set(OpenImageIO_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/OpenImageIO.git") -set(OpenImageIO_GIT_TAG "v3.0.0.3") +set(OpenImageIO_GIT_TAG "v3.0.9.1") set(OpenImageIO_DEPS) if(toucan_PNG) diff --git a/cmake/SuperBuild/BuildOpenTimelineIO.cmake b/cmake/SuperBuild/BuildOpenTimelineIO.cmake index 1d5ffeb..de7a6ab 100644 --- a/cmake/SuperBuild/BuildOpenTimelineIO.cmake +++ b/cmake/SuperBuild/BuildOpenTimelineIO.cmake @@ -1,7 +1,7 @@ include(ExternalProject) set(OpenTimelineIO_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/OpenTimelineIO.git") -set(OpenTimelineIO_GIT_TAG "7c58de1a19d7cdb16f08019bd504105bec4a5aa5") +set(OpenTimelineIO_GIT_TAG "d3ca19d802f3c0ea750ab722aa90448a5fdff11f") set(OpenTimelineIO_ARGS ${toucan_EXTERNAL_PROJECT_ARGS} diff --git a/cmake/SuperBuild/BuildPNG.cmake b/cmake/SuperBuild/BuildPNG.cmake index 0f24b42..2ff507a 100644 --- a/cmake/SuperBuild/BuildPNG.cmake +++ b/cmake/SuperBuild/BuildPNG.cmake @@ -1,7 +1,7 @@ include(ExternalProject) set(PNG_GIT_REPOSITORY "https://github.com/glennrp/libpng.git") -set(PNG_GIT_TAG "v1.6.48") +set(PNG_GIT_TAG "v1.6.50") set(PNG_SHARED_LIBS ON) set(PNG_STATIC_LIBS OFF) diff --git a/cmake/SuperBuild/Buildfeather-tk.cmake b/cmake/SuperBuild/Buildfeather-tk.cmake index 56d63b0..159358e 100644 --- a/cmake/SuperBuild/Buildfeather-tk.cmake +++ b/cmake/SuperBuild/Buildfeather-tk.cmake @@ -4,9 +4,6 @@ set(ftk_GIT_REPOSITORY "https://github.com/darbyjohnston/feather-tk.git") set(ftk_GIT_TAG "038196681ad5825c431f7da22ff4d873c82b3acd") set(ftk_DEPS ZLIB nlohmann_json PNG Freetype lunasvg) -if(toucan_nfd) - list(APPEND ftk_DEPS nfd) -endif() set(ftk_sbuild_ARGS ${toucan_EXTERNAL_PROJECT_ARGS} diff --git a/cmake/SuperBuild/Buildglfw3.cmake b/cmake/SuperBuild/Buildglfw3.cmake deleted file mode 100644 index a9a9c87..0000000 --- a/cmake/SuperBuild/Buildglfw3.cmake +++ /dev/null @@ -1,21 +0,0 @@ -include(ExternalProject) - -set(glfw3_GIT_REPOSITORY "https://github.com/glfw/glfw.git") -set(glfw3_GIT_TAG "3.4") - -set(glfw3_ARGS - ${toucan_EXTERNAL_PROJECT_ARGS} - -DCMAKE_INSTALL_LIBDIR=lib - -DGLFW_SHARED_LIBS=${BUILD_SHARED_LIBS} - -DGLFW_BUILD_EXAMPLES=FALSE - -DGLFW_BUILD_TESTS=FALSE - -DGLFW_BUILD_DOCS=FALSE - -DGLFW_BUILD_WAYLAND=OFF) - -ExternalProject_Add( - glfw3 - PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glfw3 - GIT_REPOSITORY ${glfw3_GIT_REPOSITORY} - GIT_TAG ${glfw3_GIT_TAG} - LIST_SEPARATOR | - CMAKE_ARGS ${glfw3_ARGS}) diff --git a/cmake/SuperBuild/Buildlunasvg.cmake b/cmake/SuperBuild/Buildlunasvg.cmake index 111aac7..2af04bf 100644 --- a/cmake/SuperBuild/Buildlunasvg.cmake +++ b/cmake/SuperBuild/Buildlunasvg.cmake @@ -2,7 +2,7 @@ include(ExternalProject) include(ExternalProject) set(lunasvg_GIT_REPOSITORY "https://github.com/sammycage/lunasvg.git") -set(lunasvg_GIT_TAG "v3.2.1") +set(lunasvg_GIT_TAG "v3.4.0") set(lunasvg_ARGS ${toucan_EXTERNAL_PROJECT_ARGS} diff --git a/cmake/SuperBuild/Buildnlohmann_json.cmake b/cmake/SuperBuild/Buildnlohmann_json.cmake index 47b19e9..26a5d71 100644 --- a/cmake/SuperBuild/Buildnlohmann_json.cmake +++ b/cmake/SuperBuild/Buildnlohmann_json.cmake @@ -1,7 +1,7 @@ include(ExternalProject) set(nlohmann_json_GIT_REPOSITORY "https://github.com/nlohmann/json.git") -set(nlohmann_json_GIT_TAG "v3.11.3") +set(nlohmann_json_GIT_TAG "v3.12.0") set(nlohmann_json_ARGS ${toucan_EXTERNAL_PROJECT_ARGS}) list(APPEND nlohmann_json_ARGS -DJSON_BuildTests=OFF) diff --git a/cmake/SuperBuild/CMakeLists.txt b/cmake/SuperBuild/CMakeLists.txt index f44f0d4..8320c03 100644 --- a/cmake/SuperBuild/CMakeLists.txt +++ b/cmake/SuperBuild/CMakeLists.txt @@ -25,12 +25,6 @@ set(toucan_OpenColorIO ON CACHE BOOL "Build OpenColorIO") set(toucan_OpenImageIO ON CACHE BOOL "Build OpenImageIO") set(toucan_OpenTimelineIO ON CACHE BOOL "Build OpenTimelineIO") set(toucan_OpenFX ON CACHE BOOL "Build OpenFX") -set(toucan_glfw3 ON CACHE BOOL "Build glfw3") -set(toucan_nfd_default OFF) -if(WIN32 OR APPLE) - set(toucan_nfd_default ON) -endif() -set(toucan_nfd ${toucan_nfd_default} CACHE BOOL "Build native file dialog") set(toucan_feather-tk ON CACHE BOOL "Build feather-tk") list(PREPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) @@ -125,12 +119,6 @@ endif() if(toucan_OpenFX) include(BuildOpenFX) endif() -if(toucan_glfw3) - include(Buildglfw3) -endif() -if(toucan_nfd) - include(Buildnfd) -endif() if(toucan_feather-tk) include(Buildfeather-tk) endif() diff --git a/lib/toucanRender/FFmpegRead.cpp b/lib/toucanRender/FFmpegRead.cpp index 5efa089..32e1034 100644 --- a/lib/toucanRender/FFmpegRead.cpp +++ b/lib/toucanRender/FFmpegRead.cpp @@ -410,7 +410,6 @@ namespace toucan } for (auto i : _avCodecContext) { - avcodec_close(i.second); avcodec_free_context(&i.second); } for (auto i : _avCodecParameters)