From 076087397e7250fab2db378f9ae11a9e695b92ed Mon Sep 17 00:00:00 2001
From: theALHU <huthanslhd@gmail.com>
Date: Tue, 7 Jan 2025 04:49:33 +0100
Subject: [PATCH 1/8] Rebase to 3.21

---
 Dockerfile         | 18 +++++++++---------
 Dockerfile.aarch64 | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 17d37be0..fa68d89f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
@@ -109,21 +109,21 @@ RUN \
   make -j 2 && \
   make DESTDIR=/tmp/tvheadend-build install
 
-RUN \
+  RUN \
   echo "**** compile argtable2 ****" && \
   ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
   mkdir -p \
-    /tmp/argtable && \
+     /tmp/argtable && \
   curl -s -o \
   /tmp/argtable-src.tar.gz -L \
-    "https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
+     "https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
   tar xf \
   /tmp/argtable-src.tar.gz -C \
-    /tmp/argtable --strip-components=1 && \
-  cp /tmp/patches/config.* /tmp/argtable && \
+     /tmp/argtable --strip-components=1 && \
+  cp /tmp/patches/argtable/config.* /tmp/argtable && \
   cd /tmp/argtable && \
-  ./configure \
-    --prefix=/usr && \
+  CFLAGS="-include ctype.h -include string.h" ./configure \
+     --prefix=/usr && \
   make -j 2 && \
   make check && \
   make DESTDIR=/tmp/argtable-build install && \
@@ -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
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 96866d06..45c38f5c 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -109,21 +109,21 @@ RUN \
   make -j 2 && \
   make DESTDIR=/tmp/tvheadend-build install
 
-RUN \
+  RUN \
   echo "**** compile argtable2 ****" && \
   ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
   mkdir -p \
-    /tmp/argtable && \
+     /tmp/argtable && \
   curl -s -o \
   /tmp/argtable-src.tar.gz -L \
-    "https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
+     "https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
   tar xf \
   /tmp/argtable-src.tar.gz -C \
-    /tmp/argtable --strip-components=1 && \
-  cp /tmp/patches/config.* /tmp/argtable && \
+     /tmp/argtable --strip-components=1 && \
+  cp /tmp/patches/argtable/config.* /tmp/argtable && \
   cd /tmp/argtable && \
-  ./configure \
-    --prefix=/usr && \
+  CFLAGS="-include ctype.h -include string.h" ./configure \
+     --prefix=/usr && \
   make -j 2 && \
   make check && \
   make DESTDIR=/tmp/argtable-build install && \

From bb4bf98a18409923a1794c7b46632cdc9867edcf Mon Sep 17 00:00:00 2001
From: theALHU <huthanslhd@gmail.com>
Date: Tue, 7 Jan 2025 04:52:57 +0100
Subject: [PATCH 2/8] Rebase to 3.21

---
 Dockerfile.aarch64 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 45c38f5c..0cd87eed 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -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
@@ -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

From bb7853da084528b93800292207e2e0626e570905 Mon Sep 17 00:00:00 2001
From: theALHU <huthanslhd@gmail.com>
Date: Tue, 7 Jan 2025 05:07:04 +0100
Subject: [PATCH 3/8] correct blank spaces

---
 Dockerfile         | 10 +++++-----
 Dockerfile.aarch64 | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fa68d89f..4f5449d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -109,21 +109,21 @@ RUN \
   make -j 2 && \
   make DESTDIR=/tmp/tvheadend-build install
 
-  RUN \
+RUN \
   echo "**** compile argtable2 ****" && \
   ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
   mkdir -p \
-     /tmp/argtable && \
+    /tmp/argtable && \
   curl -s -o \
   /tmp/argtable-src.tar.gz -L \
-     "https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
+    "https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
   tar xf \
   /tmp/argtable-src.tar.gz -C \
-     /tmp/argtable --strip-components=1 && \
+    /tmp/argtable --strip-components=1 && \
   cp /tmp/patches/argtable/config.* /tmp/argtable && \
   cd /tmp/argtable && \
   CFLAGS="-include ctype.h -include string.h" ./configure \
-     --prefix=/usr && \
+    --prefix=/usr && \
   make -j 2 && \
   make check && \
   make DESTDIR=/tmp/argtable-build install && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 0cd87eed..986c438b 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -109,21 +109,21 @@ RUN \
   make -j 2 && \
   make DESTDIR=/tmp/tvheadend-build install
 
-  RUN \
+RUN \
   echo "**** compile argtable2 ****" && \
   ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
   mkdir -p \
-     /tmp/argtable && \
+    /tmp/argtable && \
   curl -s -o \
   /tmp/argtable-src.tar.gz -L \
-     "https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
+    "https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
   tar xf \
   /tmp/argtable-src.tar.gz -C \
-     /tmp/argtable --strip-components=1 && \
+    /tmp/argtable --strip-components=1 && \
   cp /tmp/patches/argtable/config.* /tmp/argtable && \
   cd /tmp/argtable && \
   CFLAGS="-include ctype.h -include string.h" ./configure \
-     --prefix=/usr && \
+    --prefix=/usr && \
   make -j 2 && \
   make check && \
   make DESTDIR=/tmp/argtable-build install && \

From 99dabd1f25e7aa11cc1023fb2cd0310e11e8e2f8 Mon Sep 17 00:00:00 2001
From: theALHU <huthanslhd@gmail.com>
Date: Tue, 7 Jan 2025 05:17:49 +0100
Subject: [PATCH 4/8] fix argtable2 path

---
 Dockerfile         | 2 +-
 Dockerfile.aarch64 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4f5449d5..7c8f4261 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -120,7 +120,7 @@ RUN \
   tar xf \
   /tmp/argtable-src.tar.gz -C \
     /tmp/argtable --strip-components=1 && \
-  cp /tmp/patches/argtable/config.* /tmp/argtable && \
+  cp /tmp/patches/config.* /tmp/argtable && \
   cd /tmp/argtable && \
   CFLAGS="-include ctype.h -include string.h" ./configure \
     --prefix=/usr && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 986c438b..6e1d68ed 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -120,7 +120,7 @@ RUN \
   tar xf \
   /tmp/argtable-src.tar.gz -C \
     /tmp/argtable --strip-components=1 && \
-  cp /tmp/patches/argtable/config.* /tmp/argtable && \
+  cp /tmp/patches/config.* /tmp/argtable && \
   cd /tmp/argtable && \
   CFLAGS="-include ctype.h -include string.h" ./configure \
     --prefix=/usr && \

From de8606e59378807ccca8568f318ce971ed7adc30 Mon Sep 17 00:00:00 2001
From: theALHU <huthanslhd@gmail.com>
Date: Tue, 7 Jan 2025 05:40:23 +0100
Subject: [PATCH 5/8] update readme.md file

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 76f17124..9f4756c0 100644
--- a/README.md
+++ b/README.md
@@ -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.20.
 * **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.

From 82afb00561376a5eedaa422644a8f6bcf12dd7e1 Mon Sep 17 00:00:00 2001
From: theALHU <huthanslhd@gmail.com>
Date: Tue, 7 Jan 2025 05:40:51 +0100
Subject: [PATCH 6/8] update readme.md file

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9f4756c0..bd10c102 100644
--- a/README.md
+++ b/README.md
@@ -355,7 +355,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **07.01.25:** - Rebase to Alpine 3.20.
+* **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.

From 7f29176dbee1c47681774d36a5bcf058d5d23e4e Mon Sep 17 00:00:00 2001
From: mriedel87 <86648463+mriedel87@users.noreply.github.com>
Date: Mon, 2 Jun 2025 22:19:47 +0200
Subject: [PATCH 7/8] update readme-vars

---
 readme-vars.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme-vars.yml b/readme-vars.yml
index 6acc95eb..4281292a 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -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."}

From 80e5bd45aa411ac44673505f36634bf2580b27f2 Mon Sep 17 00:00:00 2001
From: mriedel87 <86648463+mriedel87@users.noreply.github.com>
Date: Mon, 2 Jun 2025 22:26:15 +0200
Subject: [PATCH 8/8] upgrade ffmpeg to 6.1.2

---
 Dockerfile         | 18 +++++++++---------
 Dockerfile.aarch64 | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7c8f4261..8dfa8c47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,7 +28,7 @@ RUN \
     bsd-compat-headers \
     build-base \
     cmake \
-    ffmpeg4-dev \
+    ffmpeg-dev \
     file \
     findutils \
     gettext-dev \
@@ -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 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 6e1d68ed..a5bde079 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -28,7 +28,7 @@ RUN \
     bsd-compat-headers \
     build-base \
     cmake \
-    ffmpeg4-dev \
+    ffmpeg-dev \
     file \
     findutils \
     gettext-dev \
@@ -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 \