From d39c930d5b4d477ac47f5eb4a5cf1fb293438414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <52529860+novomesk@users.noreply.github.com> Date: Fri, 17 Feb 2023 14:52:30 +0100 Subject: [PATCH] kimageformats: upgrade libaom, tweak libheif build flags (#9735) --- projects/kimageformats/Dockerfile | 2 +- projects/kimageformats/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/kimageformats/Dockerfile b/projects/kimageformats/Dockerfile index e88cb0b74..50a720094 100644 --- a/projects/kimageformats/Dockerfile +++ b/projects/kimageformats/Dockerfile @@ -22,7 +22,7 @@ RUN git clone --depth 1 -b kf5 https://invent.kde.org/frameworks/extra-cmake-mod RUN git clone --depth 1 --branch=5.15 git://code.qt.io/qt/qtbase.git RUN git clone --depth 1 -b kf5 https://invent.kde.org/frameworks/karchive.git RUN git clone --depth 1 -b kf5 https://invent.kde.org/frameworks/kimageformats.git -RUN git clone --depth 1 -b v3.5.0 https://aomedia.googlesource.com/aom +RUN git clone --depth 1 -b v3.6.0 https://aomedia.googlesource.com/aom RUN git clone --depth 1 -b v0.11.1 https://github.com/AOMediaCodec/libavif.git RUN git clone --depth 1 https://github.com/strukturag/libde265.git RUN git clone --depth 1 https://github.com/strukturag/libheif.git diff --git a/projects/kimageformats/build.sh b/projects/kimageformats/build.sh index 943caf333..1ae362b31 100644 --- a/projects/kimageformats/build.sh +++ b/projects/kimageformats/build.sh @@ -95,7 +95,7 @@ sed -i "s/static const int MAX_IMAGE_WIDTH = 32768;/static const int MAX_IMAGE_W sed -i "s/static const int MAX_IMAGE_HEIGHT = 32768;/static const int MAX_IMAGE_HEIGHT = 8192;/g" libheif/heif_limits.h mkdir build cd build -cmake -DBUILD_SHARED_LIBS=OFF -DWITH_AOM=ON -DWITH_DAV1D=OFF -DWITH_EXAMPLES=OFF -DWITH_LIBDE265=ON -DWITH_RAV1E=OFF -DWITH_X265=OFF .. +cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_PLUGIN_LOADING=OFF -DWITH_DAV1D=OFF -DWITH_EXAMPLES=OFF -DWITH_LIBDE265=ON -DWITH_RAV1E=OFF -DWITH_RAV1E_PLUGIN=OFF -DWITH_SvtEnc=OFF -DWITH_SvtEnc_PLUGIN=OFF -DWITH_X265=OFF .. make -j$(nproc) make install -j$(nproc)