Skip to content

Commit 55e5a5b

Browse files
bumpwader
bump
authored andcommitted
Update alpine to 3.21.0 from 3.20.3
Release notes https://alpinelinux.org/posts/Alpine-3.21.0-released.html Fix build issue with xavs2 Disable rav1e for now as it conflcits with librsvg (was choose as there is libsvtav1)
1 parent 50a9e75 commit 55e5a5b

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

Dockerfile

+16-14
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.21.0
44
FROM $ALPINE_VERSION AS builder
55

66
# Alpine Package Keeper options
@@ -531,20 +531,22 @@ RUN \
531531
.. && \
532532
make -j$(nproc) install
533533

534+
# TODO: disabled for now until multipl rust staticlib linking is possible
535+
# see https://github.com/rust-lang/rust/issues/104707 etc
534536
# bump: rav1e /RAV1E_VERSION=([\d.]+)/ https://github.com/xiph/rav1e.git|/\d+\./|*
535537
# bump: rav1e after ./hashupdate Dockerfile RAV1E $LATEST
536538
# bump: rav1e link "Release notes" https://github.com/xiph/rav1e/releases/tag/v$LATEST
537-
ARG RAV1E_VERSION=0.7.1
538-
ARG RAV1E_URL="https://github.com/xiph/rav1e/archive/v$RAV1E_VERSION.tar.gz"
539-
ARG RAV1E_SHA256=da7ae0df2b608e539de5d443c096e109442cdfa6c5e9b4014361211cf61d030c
540-
RUN \
541-
wget $WGET_OPTS -O rav1e.tar.gz "$RAV1E_URL" && \
542-
echo "$RAV1E_SHA256 rav1e.tar.gz" | sha256sum -c - && \
543-
tar $TAR_OPTS rav1e.tar.gz && cd rav1e-* && \
544-
# workaround weird cargo problem when on aws (?) weirdly alpine edge seems to work
545-
CARGO_REGISTRIES_CRATES_IO_PROTOCOL="sparse" \
546-
RUSTFLAGS="-C target-feature=+crt-static" \
547-
cargo cinstall --release
539+
# ARG RAV1E_VERSION=0.7.1
540+
# ARG RAV1E_URL="https://github.com/xiph/rav1e/archive/v$RAV1E_VERSION.tar.gz"
541+
# ARG RAV1E_SHA256=da7ae0df2b608e539de5d443c096e109442cdfa6c5e9b4014361211cf61d030c
542+
# RUN \
543+
# wget $WGET_OPTS -O rav1e.tar.gz "$RAV1E_URL" && \
544+
# echo "$RAV1E_SHA256 rav1e.tar.gz" | sha256sum -c - && \
545+
# tar $TAR_OPTS rav1e.tar.gz && cd rav1e-* && \
546+
# # workaround weird cargo problem when on aws (?) weirdly alpine edge seems to work
547+
# CARGO_REGISTRIES_CRATES_IO_PROTOCOL="sparse" \
548+
# RUSTFLAGS="-C target-feature=+crt-static" \
549+
# cargo cinstall --release
548550

549551
# bump: librtmp /LIBRTMP_COMMIT=([[:xdigit:]]+)/ gitrefs:https://git.ffmpeg.org/rtmpdump.git|re:#^refs/heads/master$#|@commit
550552
# bump: librtmp after ./hashupdate Dockerfile LIBRTMP $LATEST
@@ -906,6 +908,8 @@ RUN \
906908
wget $WGET_OPTS -O xavs2.tar.gz "$XAVS2_URL" && \
907909
echo "$XAVS2_SHA256 xavs2.tar.gz" | sha256sum -c - && \
908910
tar $TAR_OPTS xavs2.tar.gz && cd xavs2-*/build/linux && \
911+
# https://github.com/pkuvcl/xavs2/issues/33
912+
CFLAGS="$CFLAGS -Wno-incompatible-pointer-types" \
909913
./configure \
910914
--disable-asm \
911915
--enable-pic \
@@ -1169,7 +1173,6 @@ RUN \
11691173
--enable-libopenjpeg \
11701174
--enable-libopus \
11711175
--enable-librabbitmq \
1172-
--enable-librav1e \
11731176
--enable-librsvg \
11741177
--enable-librtmp \
11751178
--enable-librubberband \
@@ -1245,7 +1248,6 @@ RUN \
12451248
libopenjpeg: env.OPENJPEG_VERSION, \
12461249
libopus: env.OPUS_VERSION, \
12471250
librabbitmq: env.LIBRABBITMQ_VERSION, \
1248-
librav1e: env.RAV1E_VERSION, \
12491251
librsvg: env.LIBRSVG_VERSION, \
12501252
librtmp: env.LIBRTMP_COMMIT, \
12511253
librubberband: env.RUBBERBAND_VERSION, \

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ alias ffprobe='docker run -i --rm -u $UID:$GROUPS -v "$PWD:$PWD" -w "$PWD" --ent
5959
- [libopenjpeg](https://www.openjpeg.org)
6060
- [libopus](https://opus-codec.org)
6161
- [librabbitmq](https://github.com/alanxz/rabbitmq-c)
62-
- [librav1e](https://github.com/xiph/rav1e)
62+
- [librav1e](https://github.com/xiph/rav1e) (disabled for now as it conflicts with librsvg)
6363
- [librsvg](https://gitlab.gnome.org/GNOME/librsvg)
6464
- [librtmp](https://rtmpdump.mplayerhq.hu/)
6565
- [librubberband](https://breakfastquay.com/rubberband/)

0 commit comments

Comments
 (0)