Skip to content

Commit 747699d

Browse files
authored
linux-armv6: install newer CMake from buster-backports (lovell#306)
1 parent f53f660 commit 747699d

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

build/posix.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ fi
127127
mkdir ${DEPS}/zlib-ng
128128
$CURL https://github.com/zlib-ng/zlib-ng/archive/${VERSION_ZLIB_NG}.tar.gz | tar xzC ${DEPS}/zlib-ng --strip-components=1
129129
cd ${DEPS}/zlib-ng
130-
# Downgrade minimum required CMake version to 3.13 - https://github.com/zlib-ng/zlib-ng/pull/2001
131-
sed -i'.bak' "/^cmake_minimum_required/s/3.14/3.13/" CMakeLists.txt
132130
CFLAGS="${CFLAGS} -O3" cmake -G"Unix Makefiles" \
133131
-DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release \
134132
-DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=FALSE -DZLIB_COMPAT=TRUE -DWITH_ARMV6=FALSE
@@ -176,8 +174,6 @@ meson install -C _build --tag devel
176174
mkdir ${DEPS}/aom
177175
$CURL https://storage.googleapis.com/aom-releases/libaom-${VERSION_AOM}.tar.gz | tar xzC ${DEPS}/aom --strip-components=1
178176
cd ${DEPS}/aom
179-
# Downgrade minimum required CMake version to 3.13 - https://aomedia.googlesource.com/aom/+/597a35fbc9837e33366a1108631d9c72ee7a49e7
180-
find . -name 'CMakeLists.txt' -o -name '*.cmake' | xargs sed -i'.bak' "/^cmake_minimum_required/s/3.16/3.13/"
181177
# [PATCH] cmake: fix nasm detection w/3.0
182178
$CURL https://github.com/m-ab-s/aom/commit/6d2b7f71b98bfa28e372b1f2d85f137280bdb3de.patch | patch -p1
183179
mkdir aom_build
@@ -193,8 +189,6 @@ make install/strip
193189
mkdir ${DEPS}/heif
194190
$CURL https://github.com/strukturag/libheif/releases/download/v${VERSION_HEIF}/libheif-${VERSION_HEIF}.tar.gz | tar xzC ${DEPS}/heif --strip-components=1
195191
cd ${DEPS}/heif
196-
# Downgrade minimum required CMake version to 3.13 - https://github.com/strukturag/libheif/issues/975
197-
sed -i'.bak' "/^cmake_minimum_required/s/3.16.3/3.13/" CMakeLists.txt
198192
CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" cmake -G"Unix Makefiles" \
199193
-DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release \
200194
-DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=0 -DENABLE_PLUGIN_LOADING=0 -DWITH_EXAMPLES=0 -DWITH_LIBDE265=0 -DWITH_X265=0

platforms/linux-armv6/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ ENV \
1111

1212
# Build dependencies
1313
RUN \
14+
echo "deb http://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list.d/backports.list && \
1415
apt-get update && \
1516
apt-get install -y curl && \
1617
dpkg --add-architecture armhf && \
1718
apt-get update && \
1819
apt-get install -y \
1920
autoconf \
2021
autopoint \
21-
cmake \
2222
gettext \
2323
git \
2424
gperf \
@@ -29,6 +29,7 @@ RUN \
2929
pkg-config \
3030
python3-pip \
3131
&& \
32+
apt-get install -y -t buster-backports cmake && \
3233
mkdir /root/tools && \
3334
curl -Ls https://github.com/rvagg/rpi-newer-crosstools/archive/master.tar.gz | tar xzC /root/tools --strip-components=1 && \
3435
curl https://sh.rustup.rs -sSf | sh -s -- -y \

0 commit comments

Comments
 (0)