Add support for AVIF, HEIF and JPEG XL (only on Linux yet)
This commit is contained in:
parent
b9f1b60363
commit
c79563ea34
4 changed files with 77 additions and 2 deletions
1
external/CMakeLists.txt
vendored
1
external/CMakeLists.txt
vendored
|
|
@ -42,6 +42,7 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC)
|
||||||
endif()
|
endif()
|
||||||
add_checked_subdirectory(jpeg)
|
add_checked_subdirectory(jpeg)
|
||||||
add_checked_subdirectory(kcoreaddons)
|
add_checked_subdirectory(kcoreaddons)
|
||||||
|
add_checked_subdirectory(kimageformats)
|
||||||
add_checked_subdirectory(lz4)
|
add_checked_subdirectory(lz4)
|
||||||
add_checked_subdirectory(minizip)
|
add_checked_subdirectory(minizip)
|
||||||
if (LINUX)
|
if (LINUX)
|
||||||
|
|
|
||||||
69
external/kimageformats/CMakeLists.txt
vendored
Normal file
69
external/kimageformats/CMakeLists.txt
vendored
Normal file
|
|
@ -0,0 +1,69 @@
|
||||||
|
# This file is part of Desktop App Toolkit,
|
||||||
|
# a set of libraries for developing nice desktop applications.
|
||||||
|
#
|
||||||
|
# For license and copyright information please follow this link:
|
||||||
|
# https://github.com/desktop-app/legal/blob/master/LEGAL
|
||||||
|
|
||||||
|
if ((DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) OR NOT LINUX) # should work on non-Linux, but cmake rules aren't implemented yet
|
||||||
|
add_library(external_kimageformats INTERFACE IMPORTED GLOBAL)
|
||||||
|
add_library(desktop-app::external_kimageformats ALIAS external_kimageformats)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_library(external_kimageformats STATIC)
|
||||||
|
add_library(desktop-app::external_kimageformats ALIAS external_kimageformats)
|
||||||
|
init_target(external_kimageformats "(external)")
|
||||||
|
|
||||||
|
set(kimageformats_loc ${third_party_loc}/kimageformats)
|
||||||
|
set(kimageformats_src ${kimageformats_loc}/src/imageformats)
|
||||||
|
|
||||||
|
set_target_properties(external_kimageformats PROPERTIES AUTOMOC ON)
|
||||||
|
|
||||||
|
nice_target_sources(external_kimageformats ${kimageformats_src}
|
||||||
|
PRIVATE
|
||||||
|
avif.cpp
|
||||||
|
heif.cpp
|
||||||
|
jxl.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
target_compile_definitions(external_kimageformats
|
||||||
|
PRIVATE
|
||||||
|
QT_STATICPLUGIN
|
||||||
|
KIMG_JXL_API_VERSION=70
|
||||||
|
)
|
||||||
|
|
||||||
|
target_link_libraries(external_kimageformats
|
||||||
|
PRIVATE
|
||||||
|
desktop-app::external_qt
|
||||||
|
)
|
||||||
|
|
||||||
|
if (DESKTOP_APP_USE_PACKAGED)
|
||||||
|
find_package(libavif REQUIRED)
|
||||||
|
find_package(PkgConfig REQUIRED)
|
||||||
|
pkg_check_modules(LIBHEIF REQUIRED IMPORTED_TARGET libheif)
|
||||||
|
pkg_check_modules(LIBJXL REQUIRED IMPORTED_TARGET libjxl)
|
||||||
|
pkg_check_modules(LIBJXL_THREADS REQUIRED IMPORTED_TARGET libjxl_threads)
|
||||||
|
|
||||||
|
target_link_libraries(external_kimageformats
|
||||||
|
PRIVATE
|
||||||
|
avif
|
||||||
|
PkgConfig::LIBHEIF
|
||||||
|
PkgConfig::LIBJXL
|
||||||
|
PkgConfig::LIBJXL_THREADS
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
target_link_static_libraries(external_kimageformats
|
||||||
|
PRIVATE
|
||||||
|
avif
|
||||||
|
heif
|
||||||
|
jxl
|
||||||
|
jxl_threads
|
||||||
|
dav1d
|
||||||
|
libde265
|
||||||
|
brotlicommon-static
|
||||||
|
brotlidec-static
|
||||||
|
brotlienc-static
|
||||||
|
hwy
|
||||||
|
lcms2
|
||||||
|
)
|
||||||
|
endif()
|
||||||
1
external/qt/qt_static_plugins/CMakeLists.txt
vendored
1
external/qt/qt_static_plugins/CMakeLists.txt
vendored
|
|
@ -16,6 +16,7 @@ PRIVATE
|
||||||
target_link_libraries(external_qt_static_plugins
|
target_link_libraries(external_qt_static_plugins
|
||||||
PUBLIC
|
PUBLIC
|
||||||
desktop-app::external_qt
|
desktop-app::external_qt
|
||||||
|
desktop-app::external_kimageformats
|
||||||
)
|
)
|
||||||
|
|
||||||
if (LINUX)
|
if (LINUX)
|
||||||
|
|
|
||||||
|
|
@ -54,8 +54,12 @@ Q_IMPORT_PLUGIN(QGtk3ThemePlugin)
|
||||||
#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_UNIX
|
#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_UNIX
|
||||||
#endif // !DESKTOP_APP_USE_PACKAGED
|
#endif // !DESKTOP_APP_USE_PACKAGED
|
||||||
|
|
||||||
#if defined Q_OS_UNIX && !defined Q_OS_MAC
|
|
||||||
#if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY
|
#if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY
|
||||||
|
#if defined Q_OS_UNIX && !defined Q_OS_MAC
|
||||||
|
Q_IMPORT_PLUGIN(QAVIFPlugin)
|
||||||
|
Q_IMPORT_PLUGIN(HEIFPlugin)
|
||||||
|
Q_IMPORT_PLUGIN(QJpegXLPlugin)
|
||||||
|
|
||||||
Q_IMPORT_PLUGIN(NimfInputContextPlugin)
|
Q_IMPORT_PLUGIN(NimfInputContextPlugin)
|
||||||
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
|
||||||
Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
|
Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
|
||||||
|
|
@ -66,5 +70,5 @@ Q_IMPORT_PLUGIN(QFcitx5PlatformInputContextPlugin)
|
||||||
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
|
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
|
||||||
Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
|
Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
|
||||||
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
|
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
|
||||||
#endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY
|
|
||||||
#endif // Q_OS_UNIX && !Q_OS_MAC
|
#endif // Q_OS_UNIX && !Q_OS_MAC
|
||||||
|
#endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue