Skip to content

Rebase to 3.21 and update ffmpeg dependencies to 6.1.2 #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Rebase to 3.21 and update ffmpeg dependencies to 6.1.2 #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0760873
Rebase to 3.21
upchui Jan 7, 2025
bb4bf98
Rebase to 3.21
upchui Jan 7, 2025
bb7853d
correct blank spaces
upchui Jan 7, 2025
99dabd1
fix argtable2 path
upchui Jan 7, 2025
de8606e
update readme.md file
upchui Jan 7, 2025
82afb00
update readme.md file
upchui Jan 7, 2025
7f29176
update readme-vars
mriedel87 Jun 2, 2025
80e5bd4
upgrade ffmpeg to 6.1.2
mriedel87 Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM ghcr.io/linuxserver/picons-builder as piconsstage


FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
FROM ghcr.io/linuxserver/baseimage-alpine:3.21 as buildstage
############## build stage ##############

# package versions
Expand All @@ -28,7 +28,7 @@ RUN \
bsd-compat-headers \
build-base \
cmake \
ffmpeg4-dev \
ffmpeg-dev \
file \
findutils \
gettext-dev \
Expand Down Expand Up @@ -122,7 +122,7 @@ RUN \
/tmp/argtable --strip-components=1 && \
cp /tmp/patches/config.* /tmp/argtable && \
cd /tmp/argtable && \
./configure \
CFLAGS="-include ctype.h -include string.h" ./configure \
--prefix=/usr && \
make -j 2 && \
make check && \
Expand All @@ -149,7 +149,7 @@ RUN \
/picons

############## runtime stage ##############
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
FROM ghcr.io/linuxserver/baseimage-alpine:3.21

# set version label
ARG BUILD_DATE
Expand All @@ -165,14 +165,14 @@ RUN \
apk add --no-cache \
bsd-compat-headers \
ffmpeg \
ffmpeg4-libavcodec \
ffmpeg4-libavdevice \
ffmpeg4-libavfilter \
ffmpeg4-libavformat \
ffmpeg4-libavutil \
ffmpeg4-libpostproc \
ffmpeg4-libswresample \
ffmpeg4-libswscale \
ffmpeg-libavcodec \
ffmpeg-libavdevice \
ffmpeg-libavfilter \
ffmpeg-libavformat \
ffmpeg-libavutil \
ffmpeg-libpostproc \
ffmpeg-libswresample \
ffmpeg-libswscale \
gnu-libiconv \
libdvbcsa \
libhdhomerun-libs \
Expand Down
24 changes: 12 additions & 12 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM ghcr.io/linuxserver/picons-builder as piconsstage


FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21 as buildstage
############## build stage ##############

# package versions
Expand All @@ -28,7 +28,7 @@ RUN \
bsd-compat-headers \
build-base \
cmake \
ffmpeg4-dev \
ffmpeg-dev \
file \
findutils \
gettext-dev \
Expand Down Expand Up @@ -122,7 +122,7 @@ RUN \
/tmp/argtable --strip-components=1 && \
cp /tmp/patches/config.* /tmp/argtable && \
cd /tmp/argtable && \
./configure \
CFLAGS="-include ctype.h -include string.h" ./configure \
--prefix=/usr && \
make -j 2 && \
make check && \
Expand Down Expand Up @@ -150,7 +150,7 @@ RUN \


############## runtime stage ##############
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21

# set version label
ARG BUILD_DATE
Expand All @@ -166,14 +166,14 @@ RUN \
apk add --no-cache \
bsd-compat-headers \
ffmpeg \
ffmpeg4-libavcodec \
ffmpeg4-libavdevice \
ffmpeg4-libavfilter \
ffmpeg4-libavformat \
ffmpeg4-libavutil \
ffmpeg4-libpostproc \
ffmpeg4-libswresample \
ffmpeg4-libswscale \
ffmpeg-libavcodec \
ffmpeg-libavdevice \
ffmpeg-libavfilter \
ffmpeg-libavformat \
ffmpeg-libavutil \
ffmpeg-libpostproc \
ffmpeg-libswresample \
ffmpeg-libswscale \
gnu-libiconv \
libdvbcsa \
libhdhomerun-libs \
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **07.01.25:** - Rebase to Alpine 3.21.
* **25.06.24:** - Rebase to Alpine 3.20.
* **20.03.24:** - Rebase to Alpine 3.19.
* **16.10.23:** - Add mesa-va-gallium package for AMD transcoding.
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ init_diagram: |
"tvheadend:latest" <- Base Images
# changelog
changelogs:
- {date: "07.01.25:", desc: "Rebase to Alpine 3.21."}
- {date: "25.06.24:", desc: "Rebase to Alpine 3.20."}
- {date: "20.03.24:", desc: "Rebase to Alpine 3.19."}
- {date: "16.10.23:", desc: "Add mesa-va-gallium package for AMD transcoding."}
Expand Down