diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -163,12 +163,14 @@ # this list must be dependency-ordered if (ENABLE_PYTHON_DEPS OR NOT MINGW) - add_subdirectory( ext_python ) + #add_subdirectory( ext_python ) endif () if (MINGW) add_subdirectory( ext_patch ) add_subdirectory( ext_png2ico ) endif () +add_subdirectory( ext_de265 ) +add_subdirectory( ext_heif ) add_subdirectory( ext_lzma ) add_subdirectory( ext_iconv ) add_subdirectory( ext_gettext ) diff --git a/3rdparty/ext_de265/CMakeLists.txt b/3rdparty/ext_de265/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/3rdparty/ext_de265/CMakeLists.txt @@ -0,0 +1,14 @@ +SET(PREFIX_ext_de265 "${EXTPREFIX}" ) +ExternalProject_Add( ext_de265 + DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} + URL https://github.com/strukturag/libde265/releases/download/v1.0.3/libde265-1.0.3.tar.gz + + INSTALL_DIR ${PREFIX_ext_de265} + + PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/libde265.diff + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_de265} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DBUILD_utils=OFF + + + UPDATE_COMMAND "" + BUILD_IN_SOURCE 1 +) diff --git a/3rdparty/ext_de265/libde265.diff b/3rdparty/ext_de265/libde265.diff new file mode 100644 --- /dev/null +++ b/3rdparty/ext_de265/libde265.diff @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index af2001d7..b06c2a9e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -67,6 +67,16 @@ else() + set(LIBDE265_LIBRARY_NAME libde265) + endif() + ++# Generate pkg-config file ++set(prefix "${CMAKE_INSTALL_PREFIX}") ++set(exec_prefix "${CMAKE_INSTALL_PREFIX}") ++set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") ++set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libde265.pc.in ++ ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc ++ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") ++ + add_subdirectory (libde265) + add_subdirectory (dec265) + add_subdirectory (enc265) diff --git a/3rdparty/ext_heif/CMakeLists.txt b/3rdparty/ext_heif/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/3rdparty/ext_heif/CMakeLists.txt @@ -0,0 +1,15 @@ +SET(PREFIX_ext_heif "${EXTPREFIX}" ) +ExternalProject_Add( ext_heif + DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} + URL https://github.com/strukturag/libheif/releases/download/v1.4.0/libheif-1.4.0.tar.gz + + INSTALL_DIR ${PREFIX_ext_heif} + + PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/libheif.diff + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_heif} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DBUILD_utils=OFF + + + UPDATE_COMMAND "" + + DEPENDS ext_de265 +) diff --git a/3rdparty/ext_heif/libheif.diff b/3rdparty/ext_heif/libheif.diff new file mode 100644 --- /dev/null +++ b/3rdparty/ext_heif/libheif.diff @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f5c49c..d74b23c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -61,6 +61,16 @@ else() + set(LIBHEIF_LIBRARY_NAME libheif) + endif() + ++# Generate pkg-config file ++set(prefix "${CMAKE_INSTALL_PREFIX}") ++set(exec_prefix "${CMAKE_INSTALL_PREFIX}") ++set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") ++set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") ++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libheif.pc.in ++ ${CMAKE_CURRENT_BINARY_DIR}/libheif.pc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libheif.pc ++ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") ++ + add_subdirectory (examples) + add_subdirectory (libheif) + add_subdirectory (gdk-pixbuf)