|
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.21.0 |
4 | 4 | FROM $ALPINE_VERSION AS builder
|
5 | 5 |
|
6 | 6 | # Alpine Package Keeper options
|
@@ -531,20 +531,22 @@ RUN \
|
531 | 531 | .. && \
|
532 | 532 | make -j$(nproc) install
|
533 | 533 |
|
| 534 | +# TODO: disabled for now until multipl rust staticlib linking is possible |
| 535 | +# see https://github.com/rust-lang/rust/issues/104707 etc |
534 | 536 | # bump: rav1e /RAV1E_VERSION=([\d.]+)/ https://github.com/xiph/rav1e.git|/\d+\./|*
|
535 | 537 | # bump: rav1e after ./hashupdate Dockerfile RAV1E $LATEST
|
536 | 538 | # 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 |
548 | 550 |
|
549 | 551 | # bump: librtmp /LIBRTMP_COMMIT=([[:xdigit:]]+)/ gitrefs:https://git.ffmpeg.org/rtmpdump.git|re:#^refs/heads/master$#|@commit
|
550 | 552 | # bump: librtmp after ./hashupdate Dockerfile LIBRTMP $LATEST
|
@@ -906,6 +908,8 @@ RUN \
|
906 | 908 | wget $WGET_OPTS -O xavs2.tar.gz "$XAVS2_URL" && \
|
907 | 909 | echo "$XAVS2_SHA256 xavs2.tar.gz" | sha256sum -c - && \
|
908 | 910 | 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" \ |
909 | 913 | ./configure \
|
910 | 914 | --disable-asm \
|
911 | 915 | --enable-pic \
|
@@ -1169,7 +1173,6 @@ RUN \
|
1169 | 1173 | --enable-libopenjpeg \
|
1170 | 1174 | --enable-libopus \
|
1171 | 1175 | --enable-librabbitmq \
|
1172 |
| - --enable-librav1e \ |
1173 | 1176 | --enable-librsvg \
|
1174 | 1177 | --enable-librtmp \
|
1175 | 1178 | --enable-librubberband \
|
@@ -1245,7 +1248,6 @@ RUN \
|
1245 | 1248 | libopenjpeg: env.OPENJPEG_VERSION, \
|
1246 | 1249 | libopus: env.OPUS_VERSION, \
|
1247 | 1250 | librabbitmq: env.LIBRABBITMQ_VERSION, \
|
1248 |
| - librav1e: env.RAV1E_VERSION, \ |
1249 | 1251 | librsvg: env.LIBRSVG_VERSION, \
|
1250 | 1252 | librtmp: env.LIBRTMP_COMMIT, \
|
1251 | 1253 | librubberband: env.RUBBERBAND_VERSION, \
|
|
0 commit comments