From d49345764d8313bf2d3971aea4451d06e741f910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?=
 <52529860+novomesk@users.noreply.github.com>
Date: Thu, 17 Dec 2020 22:23:50 +0100
Subject: Fix build scripts for kimageformats (#4864)

---
 projects/kimageformats/Dockerfile | 1 -
 projects/kimageformats/build.sh   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'projects/kimageformats')

diff --git a/projects/kimageformats/Dockerfile b/projects/kimageformats/Dockerfile
index 3c3be1958..e3e04567c 100644
--- a/projects/kimageformats/Dockerfile
+++ b/projects/kimageformats/Dockerfile
@@ -22,7 +22,6 @@ RUN git clone --depth 1 https://invent.kde.org/frameworks/extra-cmake-modules.gi
 RUN git clone --depth 1 --branch=5.15 git://code.qt.io/qt/qtbase.git
 RUN git clone --depth 1 https://invent.kde.org/frameworks/karchive.git
 RUN git clone --depth 1 https://invent.kde.org/frameworks/kimageformats.git
-RUN apt-get install --yes yasm
 RUN git clone --depth 1 -b v2.0.1 https://aomedia.googlesource.com/aom
 RUN git clone --depth 1 -b v0.8.4 https://github.com/AOMediaCodec/libavif.git
 COPY build.sh $SRC
diff --git a/projects/kimageformats/build.sh b/projects/kimageformats/build.sh
index d650c9855..ce1ee7185 100644
--- a/projects/kimageformats/build.sh
+++ b/projects/kimageformats/build.sh
@@ -53,7 +53,7 @@ cd $SRC
 cd aom
 mkdir build.libavif
 cd build.libavif
-cmake -DBUILD_SHARED_LIBS=0 -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DCONFIG_PIC=1 ..
+cmake -DBUILD_SHARED_LIBS=0 -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DCONFIG_PIC=1 -DAOM_TARGET_CPU=generic ..
 make -j$(nproc)
 
 cd $SRC
@@ -61,7 +61,7 @@ ln -s "$SRC/aom" "$SRC/libavif/ext/"
 cd libavif
 mkdir build
 cd build
-CFLAGS="-fPIC" cmake -DBUILD_SHARED_LIBS=OFF -DAVIF_ENABLE_WERROR=OFF -DAVIF_CODEC_AOM=ON -DAVIF_LOCAL_AOM=ON ..
+CFLAGS="$CFLAGS -fPIC" cmake -DBUILD_SHARED_LIBS=OFF -DAVIF_ENABLE_WERROR=OFF -DAVIF_CODEC_AOM=ON -DAVIF_LOCAL_AOM=ON ..
 make -j$(nproc)
 
 cd $SRC
-- 
cgit v1.2.3