From 0c36669fef7b0c029edd49c1ab35052fb70fd260 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 27 Jul 2024 15:10:30 -0500 Subject: [PATCH] updated build system --- docker/aarch64/alpine | 4 +++- docker/x86_64/alpine | 2 +- docker/x86_64/mingw64 | 2 +- scripts/make_unix.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/aarch64/alpine b/docker/aarch64/alpine index 62031086..77a39393 100644 --- a/docker/aarch64/alpine +++ b/docker/aarch64/alpine @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.20.1 +FROM arm64v8/alpine:3.20.2 MAINTAINER Scott E. Graves CMD bash @@ -28,6 +28,7 @@ RUN apk add \ gflags \ gflags-dev \ git \ + gtkmm3-dev \ icu-dev \ icu-libs \ icu-static \ @@ -63,6 +64,7 @@ RUN apk add \ perl \ pkgconfig \ rsync \ + vlc-dev \ wget \ xz \ xz-dev \ diff --git a/docker/x86_64/alpine b/docker/x86_64/alpine index f3c65738..82efe4f1 100644 --- a/docker/x86_64/alpine +++ b/docker/x86_64/alpine @@ -1,4 +1,4 @@ -FROM alpine:3.20.1 +FROM alpine:3.20.2 MAINTAINER Scott E. Graves CMD bash diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64 index 1105eecf..c9a0da2f 100644 --- a/docker/x86_64/mingw64 +++ b/docker/x86_64/mingw64 @@ -1,5 +1,5 @@ # comment -FROM alpine:3.20.1 +FROM alpine:3.20.2 RUN apk update RUN apk upgrade diff --git a/scripts/make_unix.sh b/scripts/make_unix.sh index c9efac71..a2789c3d 100755 --- a/scripts/make_unix.sh +++ b/scripts/make_unix.sh @@ -9,7 +9,7 @@ if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then rm ${PROJECT_SCRIPTS_DIR}/cleanup.* fi -if [ "${PROJECT_REQUIRE_ALPINE}" == "ON" ]; then +if [ "${PROJECT_REQUIRE_ALPINE}" == "ON" ] || [ "${PROJECT_IS_ARM64}" == "1" ]; then DOCKER_NAME=alpine DOCKER_CONTAINER=${PROJECT_NAME}_${DOCKER_NAME}_${PROJECT_BUILD_ARCH} DOCKER_TAG=${PROJECT_NAME}:${DOCKER_NAME}