Skip to content

Commit ab5fede

Browse files
authored
Merge pull request #120 from linuxserver/2026-01-06
Remove mpp due to upstream dmca, bump libs
2 parents 79cbc25 + c52f067 commit ab5fede

File tree

4 files changed

+18
-34
lines changed

4 files changed

+18
-34
lines changed

Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,40 @@ ENV \
2222
FREETYPE=2.14.1 \
2323
FRIBIDI=1.0.16 \
2424
GMMLIB=22.8.2 \
25-
HARFBUZZ=12.2.0 \
25+
HARFBUZZ=12.3.0 \
2626
IHD=25.3.4 \
2727
KVAZAAR=2.3.2 \
2828
LAME=3.100 \
2929
LIBASS=0.17.4 \
30-
LIBDAV1D=1.5.2 \
30+
LIBDAV1D=1.5.3 \
3131
LIBDOVI=2.3.1 \
32-
LIBDRM=2.4.129 \
32+
LIBDRM=2.4.131 \
3333
LIBGL=1.7.0 \
3434
LIBLC3=1.1.3 \
3535
LIBMFX=22.5.4 \
3636
LIBPLACEBO=7.351.0 \
37-
LIBPNG=1.6.50 \
38-
LIBVA=2.22.0 \
37+
LIBPNG=1.6.53 \
38+
LIBVA=2.23.0 \
3939
LIBVDPAU=1.5 \
4040
LIBVIDSTAB=1.1.1 \
4141
LIBVMAF=3.0.0 \
42-
LIBVPL=2.15.0 \
43-
MESA=25.3.0 \
42+
LIBVPL=2.16.0 \
43+
MESA=25.3.3 \
4444
NVCODEC=n13.0.19.0 \
4545
OGG=1.3.6 \
4646
OPENCOREAMR=0.1.6 \
4747
OPENJPEG=2.5.4 \
48-
OPUS=1.5.2 \
48+
OPUS=1.6 \
4949
RAV1E=0.8.1 \
5050
RIST=0.2.11 \
51-
SHADERC=v2025.4 \
51+
SHADERC=v2025.5 \
5252
SRT=1.5.4 \
5353
SVTAV1=3.1.2 \
5454
THEORA=1.2.0 \
5555
VORBIS=1.3.7 \
5656
VPLGPURT=25.3.4 \
5757
VPX=1.15.2 \
58-
VULKANSDK=vulkan-sdk-1.4.328.1 \
58+
VULKANSDK=vulkan-sdk-1.4.335.0 \
5959
VVENC=1.13.1 \
6060
WEBP=1.6.0 \
6161
X265=4.1 \

Dockerfile.aarch64

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,23 @@ ENV \
2121
FONTCONFIG=2.16.0 \
2222
FREETYPE=2.14.1 \
2323
FRIBIDI=1.0.16 \
24-
HARFBUZZ=12.2.0 \
24+
HARFBUZZ=12.3.0 \
2525
KVAZAAR=2.3.2 \
2626
LAME=3.100 \
2727
LIBASS=0.17.4 \
28-
LIBDAV1D=1.5.2 \
29-
LIBDRM=2.4.129 \
28+
LIBDAV1D=1.5.3 \
29+
LIBDRM=2.4.131 \
3030
LIBLC3=1.1.3 \
31-
LIBPNG=1.6.50 \
32-
LIBVA=2.22.0 \
31+
LIBPNG=1.6.53 \
32+
LIBVA=2.23.0 \
3333
LIBVDPAU=1.5 \
3434
LIBVIDSTAB=1.1.1 \
3535
LIBVMAF=3.0.0 \
36-
MPP=1.0.11 \
3736
NVCODEC=n13.0.19.0 \
3837
OGG=1.3.6 \
3938
OPENCOREAMR=0.1.6 \
4039
OPENJPEG=2.5.4 \
41-
OPUS=1.5.2 \
40+
OPUS=1.6 \
4241
RAV1E=0.8.1 \
4342
RIST=0.2.11 \
4443
SRT=1.5.4 \
@@ -323,22 +322,6 @@ RUN \
323322
build && \
324323
ninja -vC build && \
325324
ninja -vC build install
326-
RUN \
327-
echo "**** grabbing mpp ****" && \
328-
mkdir -p /tmp/mpp && \
329-
curl -Lf \
330-
https://github.com/rockchip-linux/mpp/archive/refs/tags/${MPP}.tar.gz | \
331-
tar -zx --strip-components=1 -C /tmp/mpp
332-
RUN \
333-
echo "**** compiling mpp ****" && \
334-
cd /tmp/mpp && \
335-
cmake \
336-
-DCMAKE_BUILD_TYPE=Release \
337-
-DTOOLCHAIN=aarch64-linux-gnu- \
338-
-G "Unix Makefiles" \
339-
. && \
340-
cmake --build . -j && \
341-
make install
342325
RUN \
343326
echo "**** grabbing ogg ****" && \
344327
mkdir -p /tmp/ogg && \
@@ -690,7 +673,6 @@ RUN \
690673
--enable-nvdec \
691674
--enable-nvenc \
692675
--enable-openssl \
693-
--enable-rkmpp \
694676
--enable-stripping \
695677
--enable-version3 \
696678
&& \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
183183

184184
## Versions
185185

186+
* **06.01.26:** - Remove mpp from aarch64 build due to upstream DMCA removal. Bump harfbuzz, libdav1d, libdrm, libpng, libva, libvpl, mesa, opus, shaderc and vulkan-sdk.
186187
* **01.12.25:** - Bump ffmpeg to 8.0.1.
187188
* **19.11.25:** - Bump aom, freetype, harfbuzz, Intel drivers and libs, kvazaar, libdav1d, libdrm, mesa, mpp, openjpeg, shaderc, svt-av1 and vulkan-sdk.
188189
* **23.08.25:** - Bump ffmpeg to 8.0. Bump harfbuzz, Intel drivers and libs, libdovi, libdrm, libpng, mesa, ogg, rav1e, shaderc, svt-av1, vulkan-sdk, webp and zimg.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ full_custom_readme: |
190190
191191
## Versions
192192
193+
* **06.01.26:** - Remove mpp from aarch64 build due to upstream DMCA removal. Bump harfbuzz, libdav1d, libdrm, libpng, libva, libvpl, mesa, opus, shaderc and vulkan-sdk.
193194
* **01.12.25:** - Bump ffmpeg to 8.0.1.
194195
* **19.11.25:** - Bump aom, freetype, harfbuzz, Intel drivers and libs, kvazaar, libdav1d, libdrm, mesa, mpp, openjpeg, shaderc, svt-av1 and vulkan-sdk.
195196
* **23.08.25:** - Bump ffmpeg to 8.0. Bump harfbuzz, Intel drivers and libs, libdovi, libdrm, libpng, mesa, ogg, rav1e, shaderc, svt-av1, vulkan-sdk, webp and zimg.

0 commit comments

Comments
 (0)