Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions cmake/Package.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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(
Expand All @@ -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}
Expand Down
95 changes: 33 additions & 62 deletions cmake/SuperBuild/BuildFFmpeg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -196,30 +184,23 @@ 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
--enable-encoder=v408
--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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -379,42 +350,42 @@ 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()

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}
Expand Down
12 changes: 6 additions & 6 deletions cmake/SuperBuild/BuildFreetype.cmake
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildImath.cmake
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildJPEG.cmake
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildOpenColorIO.cmake
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildOpenEXR.cmake
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildOpenImageIO.cmake
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildOpenTimelineIO.cmake
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
2 changes: 1 addition & 1 deletion cmake/SuperBuild/BuildPNG.cmake
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 0 additions & 3 deletions cmake/SuperBuild/Buildfeather-tk.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
21 changes: 0 additions & 21 deletions cmake/SuperBuild/Buildglfw3.cmake

This file was deleted.

Loading
Loading