Skip to content

Commit 93e1673

Browse files
bumpwader
authored andcommitted
Update alpine to 3.23.0 from 3.20.3
Release notes https://alpinelinux.org/posts/Alpine-3.23.0-released.html
1 parent 40ea9a0 commit 93e1673

File tree

1 file changed

+43
-32
lines changed

1 file changed

+43
-32
lines changed

Dockerfile

Lines changed: 43 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# bump: alpine /ALPINE_VERSION=alpine:([\d.]+)/ docker:alpine|^3
22
# bump: alpine link "Release notes" https://alpinelinux.org/posts/Alpine-$LATEST-released.html
3-
ARG ALPINE_VERSION=alpine:3.20.3
3+
ARG ALPINE_VERSION=alpine:3.23.0
44
FROM $ALPINE_VERSION AS builder
55

66
# Alpine Package Keeper options
@@ -41,7 +41,7 @@ RUN apk add --no-cache $APK_OPTS \
4141
tcl \
4242
numactl-dev \
4343
cunit cunit-dev \
44-
fftw-dev \
44+
fftw-dev fftw-static \
4545
libsamplerate-dev libsamplerate-static \
4646
vo-amrwbenc-dev vo-amrwbenc-static \
4747
snappy snappy-dev snappy-static \
@@ -166,28 +166,28 @@ RUN \
166166
-Dgtk_doc=false && \
167167
ninja -j$(nproc) -vC build install
168168

169-
# bump: librsvg /LIBRSVG_VERSION=([\d.]+)/ https://gitlab.gnome.org/GNOME/librsvg.git|^2
170-
# bump: librsvg after ./hashupdate Dockerfile LIBRSVG $LATEST
171-
# bump: librsvg link "NEWS" https://gitlab.gnome.org/GNOME/librsvg/-/blob/master/NEWS
172-
ARG LIBRSVG_VERSION=2.60.0
173-
ARG LIBRSVG_URL="https://download.gnome.org/sources/librsvg/2.60/librsvg-$LIBRSVG_VERSION.tar.xz"
174-
ARG LIBRSVG_SHA256=0b6ffccdf6e70afc9876882f5d2ce9ffcf2c713cbaaf1ad90170daa752e1eec3
175-
RUN \
176-
wget $WGET_OPTS -O librsvg.tar.xz "$LIBRSVG_URL" && \
177-
echo "$LIBRSVG_SHA256 librsvg.tar.xz" | sha256sum --status -c - && \
178-
tar $TAR_OPTS librsvg.tar.xz && cd librsvg-* && \
179-
# workaround for https://gitlab.gnome.org/GNOME/librsvg/-/issues/1158
180-
sed -i "/^if host_system in \['windows'/s/, 'linux'//" meson.build && \
181-
meson setup build \
182-
-Dbuildtype=release \
183-
-Ddefault_library=static \
184-
-Ddocs=disabled \
185-
-Dintrospection=disabled \
186-
-Dpixbuf=disabled \
187-
-Dpixbuf-loader=disabled \
188-
-Dvala=disabled \
189-
-Dtests=false && \
190-
ninja -j$(nproc) -vC build install
169+
# # bump: librsvg /LIBRSVG_VERSION=([\d.]+)/ https://gitlab.gnome.org/GNOME/librsvg.git|^2
170+
# # bump: librsvg after ./hashupdate Dockerfile LIBRSVG $LATEST
171+
# # bump: librsvg link "NEWS" https://gitlab.gnome.org/GNOME/librsvg/-/blob/master/NEWS
172+
# ARG LIBRSVG_VERSION=2.60.0
173+
# ARG LIBRSVG_URL="https://download.gnome.org/sources/librsvg/2.60/librsvg-$LIBRSVG_VERSION.tar.xz"
174+
# ARG LIBRSVG_SHA256=0b6ffccdf6e70afc9876882f5d2ce9ffcf2c713cbaaf1ad90170daa752e1eec3
175+
# RUN \
176+
# wget $WGET_OPTS -O librsvg.tar.xz "$LIBRSVG_URL" && \
177+
# echo "$LIBRSVG_SHA256 librsvg.tar.xz" | sha256sum --status -c - && \
178+
# tar $TAR_OPTS librsvg.tar.xz && cd librsvg-* && \
179+
# # workaround for https://gitlab.gnome.org/GNOME/librsvg/-/issues/1158
180+
# sed -i "/^if host_system in \['windows'/s/, 'linux'//" meson.build && \
181+
# meson setup build \
182+
# -Dbuildtype=release \
183+
# -Ddefault_library=static \
184+
# -Ddocs=disabled \
185+
# -Dintrospection=disabled \
186+
# -Dpixbuf=disabled \
187+
# -Dpixbuf-loader=disabled \
188+
# -Dvala=disabled \
189+
# -Dtests=false && \
190+
# ninja -j$(nproc) -vC build install
191191

192192
# build after libvmaf
193193
# bump: aom /AOM_VERSION=([\d.]+)/ git:https://aomedia.googlesource.com/aom|*
@@ -536,7 +536,7 @@ RUN \
536536
echo "$RAV1E_SHA256 rav1e.tar.gz" | sha256sum -c - && \
537537
tar $TAR_OPTS rav1e.tar.gz && cd rav1e-* && \
538538
RUSTFLAGS="-C target-feature=+crt-static" \
539-
cargo cinstall --release
539+
cargo cinstall --library-type staticlib --release
540540

541541
# bump: librtmp /LIBRTMP_COMMIT=([[:xdigit:]]+)/ gitrefs:https://git.ffmpeg.org/rtmpdump.git|re:#^refs/heads/master$#|@commit
542542
# bump: librtmp after ./hashupdate Dockerfile LIBRTMP $LATEST
@@ -575,8 +575,10 @@ ARG LIBSHINE_URL="https://github.com/toots/shine/releases/download/$LIBSHINE_VER
575575
ARG LIBSHINE_SHA256=58e61e70128cf73f88635db495bfc17f0dde3ce9c9ac070d505a0cd75b93d384
576576
RUN \
577577
wget $WGET_OPTS -O libshine.tar.gz "$LIBSHINE_URL" && \
578+
# https://github.com/toots/shine/commit/098b9aaa6770a41bdf3f9c049307c1398f04d2d3
578579
echo "$LIBSHINE_SHA256 libshine.tar.gz" | sha256sum -c - && \
579580
tar $TAR_OPTS libshine.tar.gz && cd shine* && \
581+
sed -i 's/shine_mdct_initialise()/shine_mdct_initialise(shine_global_config *config)/' src/lib/l3mdct.h && \
580582
./configure \
581583
--with-pic \
582584
--enable-static \
@@ -612,7 +614,7 @@ RUN \
612614
echo "$SRT_SHA256 libsrt.tar.gz" | sha256sum -c - && \
613615
tar $TAR_OPTS libsrt.tar.gz && cd srt-* && \
614616
mkdir build && cd build && \
615-
cmake \
617+
cmake3.5 \
616618
-G"Unix Makefiles" \
617619
-DCMAKE_VERBOSE_MAKEFILE=ON \
618620
-DCMAKE_BUILD_TYPE=Release \
@@ -754,7 +756,7 @@ RUN \
754756
git clone "$UAVS3D_URL" && cd uavs3d && \
755757
git checkout --recurse-submodules $UAVS3D_COMMIT && \
756758
mkdir build/linux && cd build/linux && \
757-
cmake \
759+
cmake3.5 \
758760
-G"Unix Makefiles" \
759761
-DCMAKE_VERBOSE_MAKEFILE=ON \
760762
-DCMAKE_BUILD_TYPE=Release \
@@ -776,7 +778,7 @@ RUN \
776778
# This line workarounds the issue that happens when the image builds in emulated (buildx) arm64 environment.
777779
# Since in emulated container the /proc is mounted from the host, the cmake not able to detect CPU features correctly.
778780
sed -i 's/include (FindSSE)/if(CMAKE_SYSTEM_ARCH MATCHES "amd64")\ninclude (FindSSE)\nendif()/' ../CMakeLists.txt && \
779-
cmake \
781+
cmake3.5 \
780782
-G"Unix Makefiles" \
781783
-DCMAKE_VERBOSE_MAKEFILE=ON \
782784
-DCMAKE_SYSTEM_ARCH=$(arch) \
@@ -881,6 +883,11 @@ RUN \
881883
tar $TAR_OPTS x265_git.tar.bz2 && cd x265_*/build/linux && \
882884
sed -i '/^cmake / s/$/ -G "Unix Makefiles" ${CMAKEFLAGS}/' ./multilib.sh && \
883885
sed -i 's/ -DENABLE_SHARED=OFF//g' ./multilib.sh && \
886+
# https://bitbucket.org/multicoreware/x265_git/commits/b354c009a60bcd6d7fc04014e200a1ee9c45c167
887+
sed -i 's/cmake_policy(SET CMP0025 OLD)/cmake_policy(SET CMP0025 NEW)/g' ../../source/CMakeLists.txt && \
888+
sed -i 's/cmake_policy(SET CMP0054 OLD)/cmake_policy(SET CMP0054 NEW)/g' ../../source/CMakeLists.txt && \
889+
# https://bitbucket.org/multicoreware/x265_git/issues/1008/build-fails-with-cmake-4
890+
sed -i 's/cmake/cmake3.5/g' ./multilib.sh && \
884891
MAKEFLAGS="-j$(nproc)" \
885892
CMAKEFLAGS="-DENABLE_SHARED=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_AGGRESSIVE_CHECKS=ON -DENABLE_NASM=ON -DCMAKE_BUILD_TYPE=Release" \
886893
./multilib.sh && \
@@ -898,6 +905,8 @@ RUN \
898905
wget $WGET_OPTS -O xavs2.tar.gz "$XAVS2_URL" && \
899906
echo "$XAVS2_SHA256 xavs2.tar.gz" | sha256sum -c - && \
900907
tar $TAR_OPTS xavs2.tar.gz && cd xavs2-*/build/linux && \
908+
# new gcc not happy with some of the code
909+
CFLAGS="-Wno-incompatible-pointer-types -Wno-unused-function" \
901910
./configure \
902911
--disable-asm \
903912
--enable-pic \
@@ -915,7 +924,8 @@ RUN \
915924
wget $WGET_OPTS -O libxvid.tar.gz "$XVID_URL" && \
916925
echo "$XVID_SHA256 libxvid.tar.gz" | sha256sum -c - && \
917926
tar $TAR_OPTS libxvid.tar.gz && cd xvidcore/build/generic && \
918-
CFLAGS="$CFLAGS -fstrength-reduce -ffast-math" ./configure && \
927+
# gnu18 to fix issue type own bool typedef
928+
CFLAGS="$CFLAGS -std=gnu18 -fstrength-reduce -ffast-math" ./configure && \
919929
make -j$(nproc) && make install
920930

921931
# bump: xeve /XEVE_VERSION=([\d.]+)/ https://github.com/mpeg5/xeve.git|*
@@ -957,6 +967,7 @@ RUN \
957967
echo v$XEVD_VERSION > version.txt && \
958968
sed -i 's/mc_filter_bilin/xevdm_mc_filter_bilin/' src_main/sse/xevdm_mc_sse.c && \
959969
mkdir build && cd build && \
970+
CFLAGS="-Wno-error=header-guard" \
960971
cmake \
961972
-G"Unix Makefiles" \
962973
-DARM="$(if [ $(uname -m) == aarch64 ]; then echo TRUE; else echo FALSE; fi)" \
@@ -1162,7 +1173,7 @@ RUN \
11621173
--enable-libopus \
11631174
--enable-librabbitmq \
11641175
--enable-librav1e \
1165-
--enable-librsvg \
1176+
# --enable-librsvg \
11661177
--enable-librtmp \
11671178
--enable-librubberband \
11681179
--enable-libshine \
@@ -1238,7 +1249,7 @@ RUN \
12381249
libopus: env.OPUS_VERSION, \
12391250
librabbitmq: env.LIBRABBITMQ_VERSION, \
12401251
librav1e: env.RAV1E_VERSION, \
1241-
librsvg: env.LIBRSVG_VERSION, \
1252+
# librsvg: env.LIBRSVG_VERSION, \
12421253
librtmp: env.LIBRTMP_COMMIT, \
12431254
librubberband: env.RUBBERBAND_VERSION, \
12441255
libsamplerate: env.LIBSAMPLERATE_VERSION, \
@@ -1308,7 +1319,7 @@ RUN ["/ffprobe", "-i", "https://github.com/favicon.ico"]
13081319
# tls/https certs
13091320
RUN ["/ffprobe", "-tls_verify", "1", "-ca_file", "/etc/ssl/cert.pem", "-i", "https://github.com/favicon.ico"]
13101321
# svg
1311-
RUN ["/ffprobe", "-i", "https://github.githubassets.com/favicons/favicon.svg"]
1322+
# RUN ["/ffprobe", "-i", "https://github.githubassets.com/favicons/favicon.svg"]
13121323
# vvenc
13131324
RUN ["/ffmpeg", "-f", "lavfi", "-i", "testsrc", "-c:v", "libvvenc", "-t", "100ms", "-f", "null", "-"]
13141325
# x265 regression

0 commit comments

Comments
 (0)