Skip to content

Commit 55cd834

Browse files
bumpwader
authored andcommitted
Update alpine to 3.21.3 from 3.20.3
Release notes https://alpinelinux.org/posts/Alpine-3.21.3-released.html Remove xavs2 for now as it seems unmaintained and has problems with newer gcc version default -Wall. If someone wants it i guess we could figure out how to fix or disable the errors.
1 parent 7129351 commit 55cd834

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

Dockerfile

Lines changed: 1 addition & 20 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.21.3
44
FROM $ALPINE_VERSION AS builder
55

66
# Alpine Package Keeper options
@@ -894,24 +894,6 @@ RUN \
894894
./multilib.sh && \
895895
make -C 8bit -j$(nproc) install
896896

897-
# bump: xavs2 /XAVS2_VERSION=([\d.]+)/ https://github.com/pkuvcl/xavs2.git|^1
898-
# bump: xavs2 after ./hashupdate Dockerfile XAVS2 $LATEST
899-
# bump: xavs2 link "Release" https://github.com/pkuvcl/xavs2/releases/tag/$LATEST
900-
# bump: xavs2 link "Source diff $CURRENT..$LATEST" https://github.com/pkuvcl/xavs2/compare/v$CURRENT..v$LATEST
901-
ARG XAVS2_VERSION=1.4
902-
ARG XAVS2_URL="https://github.com/pkuvcl/xavs2/archive/refs/tags/$XAVS2_VERSION.tar.gz"
903-
ARG XAVS2_SHA256=1e6d731cd64cb2a8940a0a3fd24f9c2ac3bb39357d802432a47bc20bad52c6ce
904-
# TODO: seems to be issues with asm on musl
905-
RUN \
906-
wget $WGET_OPTS -O xavs2.tar.gz "$XAVS2_URL" && \
907-
echo "$XAVS2_SHA256 xavs2.tar.gz" | sha256sum -c - && \
908-
tar $TAR_OPTS xavs2.tar.gz && cd xavs2-*/build/linux && \
909-
./configure \
910-
--disable-asm \
911-
--enable-pic \
912-
--disable-cli && \
913-
make -j$(nproc) install
914-
915897
# http://websvn.xvid.org/cvs/viewvc.cgi/trunk/xvidcore/build/generic/configure.in?revision=2146&view=markup
916898
# bump: xvid /XVID_VERSION=([\d.]+)/ svn:https://anonymous:@svn.xvid.org|/^release-(.*)$/|/_/./|^1
917899
# bump: xvid after ./hashupdate Dockerfile XVID $LATEST
@@ -1193,7 +1175,6 @@ RUN \
11931175
--enable-libwebp \
11941176
--enable-libx264 \
11951177
--enable-libx265 \
1196-
--enable-libxavs2 \
11971178
--enable-libxevd \
11981179
--enable-libxeve \
11991180
--enable-libxml2 \

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ alias ffprobe='docker run -i --rm -u $UID:$GROUPS -v "$PWD:$PWD" -w "$PWD" --ent
8484
- [libwebp](https://chromium.googlesource.com/webm/libwebp)
8585
- [libx264](https://www.videolan.org/developers/x264.html)
8686
- [libx265](https://www.videolan.org/developers/x265.html) (multilib with support for 10 and 12 bits)
87-
- [libxavs2](https://github.com/pkuvcl/xavs2)
8887
- [libxevd](https://github.com/mpeg5/xevd)
8988
- [libxeve](https://github.com/mpeg5/xeve)
9089
- [libxml2](https://gitlab.gnome.org/GNOME/libxml2)

0 commit comments

Comments
 (0)