Skip to content

Commit dc2f5b7

Browse files
bumpwader
authored andcommitted
Update alpine to 3.22.2 from 3.20.3
Release notes https://alpinelinux.org/posts/Alpine-3.22.2-released.html
1 parent c2c18de commit dc2f5b7

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

Dockerfile

Lines changed: 20 additions & 10 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.22.2
44
FROM $ALPINE_VERSION AS builder
55

66
# Alpine Package Keeper options
@@ -525,18 +525,26 @@ RUN \
525525
.. && \
526526
make -j$(nproc) install
527527

528+
# TODO: disable rav1e for now as linking with two rust crate type staticlib
529+
# libraries in static-pie mode seems to be unstable
530+
# see https://gitlab.gnome.org/GNOME/librsvg/-/issues/1144
531+
# rsvg is ther other rust library but i disable rav1e as we use other av1
532+
# encoders like svtav1. hopefully we can enable rav1e again in the future.
533+
#
528534
# bump: rav1e /RAV1E_VERSION=([\d.]+)/ https://github.com/xiph/rav1e.git|/\d+\./|*
529535
# bump: rav1e after ./hashupdate Dockerfile RAV1E $LATEST
530536
# bump: rav1e link "Release notes" https://github.com/xiph/rav1e/releases/tag/v$LATEST
531-
ARG RAV1E_VERSION=0.7.1
532-
ARG RAV1E_URL="https://github.com/xiph/rav1e/archive/v$RAV1E_VERSION.tar.gz"
533-
ARG RAV1E_SHA256=da7ae0df2b608e539de5d443c096e109442cdfa6c5e9b4014361211cf61d030c
534-
RUN \
535-
wget $WGET_OPTS -O rav1e.tar.gz "$RAV1E_URL" && \
536-
echo "$RAV1E_SHA256 rav1e.tar.gz" | sha256sum -c - && \
537-
tar $TAR_OPTS rav1e.tar.gz && cd rav1e-* && \
538-
RUSTFLAGS="-C target-feature=+crt-static" \
539-
cargo cinstall --release
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+
# RUSTFLAGS="-C target-feature=+crt-static" \
545+
# cargo cinstall \
546+
# --library-type staticlib \
547+
# --profile release-no-lto
540548

541549
# bump: librtmp /LIBRTMP_COMMIT=([[:xdigit:]]+)/ gitrefs:https://git.ffmpeg.org/rtmpdump.git|re:#^refs/heads/master$#|@commit
542550
# bump: librtmp after ./hashupdate Dockerfile LIBRTMP $LATEST
@@ -898,6 +906,8 @@ RUN \
898906
wget $WGET_OPTS -O xavs2.tar.gz "$XAVS2_URL" && \
899907
echo "$XAVS2_SHA256 xavs2.tar.gz" | sha256sum -c - && \
900908
tar $TAR_OPTS xavs2.tar.gz && cd xavs2-*/build/linux && \
909+
# new gcc not happy with some of the code
910+
CFLAGS="-Wno-incompatible-pointer-types -Wno-unused-function" \
901911
./configure \
902912
--disable-asm \
903913
--enable-pic \

README.md

Lines changed: 1 addition & 1 deletion
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)~~ (temp disabled, see Dockerfile comment for details)
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)