|
1 | 1 | # bump: alpine /ALPINE_VERSION=alpine:([\d.]+)/ docker:alpine|^3 |
2 | 2 | # 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 |
4 | 4 | FROM $ALPINE_VERSION AS builder |
5 | 5 |
|
6 | 6 | # Alpine Package Keeper options |
@@ -535,15 +535,15 @@ RUN \ |
535 | 535 | wget $WGET_OPTS -O rav1e.tar.gz "$RAV1E_URL" && \ |
536 | 536 | echo "$RAV1E_SHA256 rav1e.tar.gz" | sha256sum -c - && \ |
537 | 537 | tar $TAR_OPTS rav1e.tar.gz && cd rav1e-* && \ |
538 | | - # workaround weird cargo problem when on aws (?) weirdly alpine edge seems to work |
539 | | - CARGO_REGISTRIES_CRATES_IO_PROTOCOL="sparse" \ |
540 | 538 | RUSTFLAGS="-C target-feature=+crt-static" \ |
541 | | - cargo cinstall --release |
| 539 | + cargo cinstall \ |
| 540 | + --library-type staticlib \ |
| 541 | + --release |
542 | 542 |
|
543 | 543 | # bump: librtmp /LIBRTMP_COMMIT=([[:xdigit:]]+)/ gitrefs:https://git.ffmpeg.org/rtmpdump.git|re:#^refs/heads/master$#|@commit |
544 | 544 | # bump: librtmp after ./hashupdate Dockerfile LIBRTMP $LATEST |
545 | 545 | # bump: librtmp link "Commit diff $CURRENT..$LATEST" https://git.ffmpeg.org/gitweb/rtmpdump.git/commitdiff/$LATEST?ds=sidebyside |
546 | | -ARG LIBRTMP_URL="https://git.ffmpeg.org/rtmpdump.git" |
| 546 | +ARG LIBRTMP_URL="git://git.ffmpeg.org/rtmpdump" |
547 | 547 | ARG LIBRTMP_COMMIT=6f6bb1353fc84f4cc37138baa99f586750028a01 |
548 | 548 | RUN \ |
549 | 549 | git clone "$LIBRTMP_URL" && cd rtmpdump && \ |
@@ -900,6 +900,8 @@ RUN \ |
900 | 900 | wget $WGET_OPTS -O xavs2.tar.gz "$XAVS2_URL" && \ |
901 | 901 | echo "$XAVS2_SHA256 xavs2.tar.gz" | sha256sum -c - && \ |
902 | 902 | tar $TAR_OPTS xavs2.tar.gz && cd xavs2-*/build/linux && \ |
| 903 | + # new gcc not happy with some of the code |
| 904 | + CFLAGS="-Wno-incompatible-pointer-types -Wno-unused-function" \ |
903 | 905 | ./configure \ |
904 | 906 | --disable-asm \ |
905 | 907 | --enable-pic \ |
|
0 commit comments