Skip to content

Commit fa38df7

Browse files
authored
Merge pull request #122 from linuxserver/2026-03-06
Add support for SoX resampler, bump libs
2 parents 6683164 + 1295547 commit fa38df7

File tree

4 files changed

+65
-23
lines changed

4 files changed

+65
-23
lines changed

Dockerfile

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ ENV \
1919
FDKAAC=2.0.3 \
2020
FFMPEG_HARD=8.0.1 \
2121
FONTCONFIG=2.16.0 \
22-
FREETYPE=2.14.1 \
22+
FREETYPE=2.14.2 \
2323
FRIBIDI=1.0.16 \
24-
GMMLIB=22.8.2 \
25-
HARFBUZZ=12.3.0 \
26-
IHD=25.3.4 \
24+
GMMLIB=22.9.0 \
25+
HARFBUZZ=13.0.0 \
26+
IHD=25.4.6 \
2727
KVAZAAR=2.3.2 \
2828
LAME=3.100 \
2929
LIBASS=0.17.4 \
@@ -33,30 +33,31 @@ ENV \
3333
LIBGL=1.7.0 \
3434
LIBLC3=1.1.3 \
3535
LIBMFX=22.5.4 \
36-
LIBPLACEBO=7.351.0 \
37-
LIBPNG=1.6.53 \
36+
LIBPLACEBO=7.360.0 \
37+
LIBPNG=1.6.55 \
3838
LIBVA=2.23.0 \
3939
LIBVDPAU=1.5 \
4040
LIBVIDSTAB=1.1.1 \
4141
LIBVMAF=3.0.0 \
4242
LIBVPL=2.16.0 \
43-
MESA=25.3.3 \
43+
MESA=26.0.1 \
4444
NVCODEC=n13.0.19.0 \
4545
OGG=1.3.6 \
4646
OPENCOREAMR=0.1.6 \
4747
OPENJPEG=2.5.4 \
4848
OPUS=1.6 \
4949
RAV1E=0.8.1 \
5050
RIST=0.2.11 \
51-
SHADERC=v2025.5 \
51+
SHADERC=v2026.1 \
52+
SOXR=0.1.3 \
5253
SRT=1.5.4 \
53-
SVTAV1=3.1.2 \
54+
SVTAV1=4.0.1 \
5455
THEORA=1.2.0 \
5556
VORBIS=1.3.7 \
56-
VPLGPURT=25.3.4 \
57-
VPX=1.15.2 \
58-
VULKANSDK=vulkan-sdk-1.4.335.0 \
59-
VVENC=1.13.1 \
57+
VPLGPURT=25.4.6 \
58+
VPX=1.16.0 \
59+
VULKANSDK=vulkan-sdk-1.4.341.0 \
60+
VVENC=1.14.0 \
6061
WEBP=1.6.0 \
6162
X265=4.1 \
6263
XVID=1.3.7 \
@@ -653,6 +654,23 @@ RUN \
653654
ninja && \
654655
ninja install && \
655656
strip -d /usr/local/lib/librist.so
657+
RUN \
658+
echo "**** grabbing soxr ****" && \
659+
mkdir -p /tmp/soxr && \
660+
curl -Lf \
661+
https://sourceforge.net/projects/soxr/files/soxr-${SOXR}-Source.tar.xz/download | \
662+
tar -xJ --strip-components=1 -C /tmp/soxr
663+
RUN \
664+
echo "**** compiling soxr ****" && \
665+
cd /tmp/soxr && \
666+
mkdir -p build && \
667+
cd build && \
668+
cmake \
669+
-Wno-dev \
670+
-DCMAKE_BUILD_TYPE=Release .. && \
671+
make && \
672+
make install && \
673+
strip -d /usr/local/lib/libsoxr.so
656674
RUN \
657675
echo "**** grabbing srt ****" && \
658676
mkdir -p /tmp/srt && \
@@ -893,6 +911,7 @@ RUN \
893911
RUN \
894912
echo "**** compiling ffmpeg ****" && \
895913
cd /tmp/ffmpeg && \
914+
curl -fSsL https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21567.patch | patch -p1 && \
896915
./configure \
897916
--disable-debug \
898917
--disable-doc \
@@ -921,6 +940,7 @@ RUN \
921940
--enable-librav1e \
922941
--enable-librist \
923942
--enable-libshaderc \
943+
--enable-libsoxr \
924944
--enable-libsrt \
925945
--enable-libsvtav1 \
926946
--enable-libtheora \

Dockerfile.aarch64

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ ENV \
1919
FDKAAC=2.0.3 \
2020
FFMPEG_HARD=8.0.1 \
2121
FONTCONFIG=2.16.0 \
22-
FREETYPE=2.14.1 \
22+
FREETYPE=2.14.2 \
2323
FRIBIDI=1.0.16 \
24-
HARFBUZZ=12.3.0 \
24+
HARFBUZZ=13.0.0 \
2525
KVAZAAR=2.3.2 \
2626
LAME=3.100 \
2727
LIBASS=0.17.4 \
2828
LIBDAV1D=1.5.3 \
2929
LIBDRM=2.4.131 \
3030
LIBLC3=1.1.3 \
31-
LIBPNG=1.6.53 \
31+
LIBPNG=1.6.55 \
3232
LIBVA=2.23.0 \
3333
LIBVDPAU=1.5 \
3434
LIBVIDSTAB=1.1.1 \
@@ -40,12 +40,13 @@ ENV \
4040
OPUS=1.6 \
4141
RAV1E=0.8.1 \
4242
RIST=0.2.11 \
43+
SOXR=0.1.3 \
4344
SRT=1.5.4 \
44-
SVTAV1=3.1.2 \
45+
SVTAV1=4.0.1 \
4546
THEORA=1.2.0 \
4647
VORBIS=1.3.7 \
47-
VPX=1.15.2 \
48-
VVENC=1.13.1 \
48+
VPX=1.16.0 \
49+
VVENC=1.14.0 \
4950
WEBP=1.6.0 \
5051
X265=4.1 \
5152
XVID=1.3.7 \
@@ -416,6 +417,23 @@ RUN \
416417
ninja && \
417418
ninja install && \
418419
strip -d /usr/local/lib/librist.so
420+
RUN \
421+
echo "**** grabbing soxr ****" && \
422+
mkdir -p /tmp/soxr && \
423+
curl -Lf \
424+
https://sourceforge.net/projects/soxr/files/soxr-${SOXR}-Source.tar.xz/download | \
425+
tar -xJ --strip-components=1 -C /tmp/soxr
426+
RUN \
427+
echo "**** compiling soxr ****" && \
428+
cd /tmp/soxr && \
429+
mkdir -p build && \
430+
cd build && \
431+
cmake \
432+
-Wno-dev \
433+
-DCMAKE_BUILD_TYPE=Release .. && \
434+
make && \
435+
make install && \
436+
strip -d /usr/local/lib/libsoxr.so
419437
RUN \
420438
echo "**** grabbing srt ****" && \
421439
mkdir -p /tmp/srt && \
@@ -624,10 +642,11 @@ RUN \
624642
https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2 | \
625643
tar -jx --strip-components=1 -C /tmp/ffmpeg
626644

627-
RUN \
628-
echo "**** compiling ffmpeg ****" && \
629-
cd /tmp/ffmpeg && \
630-
./configure \
645+
RUN \
646+
echo "**** compiling ffmpeg ****" && \
647+
cd /tmp/ffmpeg && \
648+
curl -fSsL https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21567.patch | patch -p1 && \
649+
./configure \
631650
--disable-debug \
632651
--disable-doc \
633652
--disable-ffplay \
@@ -653,6 +672,7 @@ RUN \
653672
--enable-libopus \
654673
--enable-librav1e \
655674
--enable-librist \
675+
--enable-libsoxr \
656676
--enable-libsrt \
657677
--enable-libsvtav1 \
658678
--enable-libtheora \

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.03.26:** - Add support for SoX Resampler. Bump freetype, harfbuzz, Intel drivers and libs, libplacebo, libpng, mesa, shaderc, svtav1, vpx, vulkan-sdk and vvenc.
186187
* **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.
187188
* **01.12.25:** - Bump ffmpeg to 8.0.1.
188189
* **19.11.25:** - Bump aom, freetype, harfbuzz, Intel drivers and libs, kvazaar, libdav1d, libdrm, mesa, mpp, openjpeg, shaderc, svt-av1 and vulkan-sdk.

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.03.26:** - Add support for SoX Resampler. Bump freetype, harfbuzz, Intel drivers and libs, libplacebo, libpng, mesa, shaderc, svtav1, vpx, vulkan-sdk and vvenc.
193194
* **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.
194195
* **01.12.25:** - Bump ffmpeg to 8.0.1.
195196
* **19.11.25:** - Bump aom, freetype, harfbuzz, Intel drivers and libs, kvazaar, libdav1d, libdrm, mesa, mpp, openjpeg, shaderc, svt-av1 and vulkan-sdk.

0 commit comments

Comments
 (0)