v8.20 (#6513)

- DietPi-Update | Hotfix for FFmpeg "downgrade" on RPi Bookworm
MichaIng · Jul 30, 2023 · 1e099f3 · 1e099f3
2 parents 79a5915 + efd0357
commit 1e099f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.update/patches b/.update/patches
@@ -1418,6 +1418,9 @@ Patch_8_20()
 
 	# Odroid N2: Assure that hardware random generator driver is loaded as early as possible to prevent rngd failures: https://github.com/MichaIng/DietPi/issues/6483
 	(( $G_HW_MODEL == 15 )) && G_EXEC eval 'echo '\''meson_rng'\'' > /etc/modules-load.d/dietpi-hwrng.conf'
+
+	# Hotfix for FFmpeg "downgrade" on RPi Bookworm: https://github.com/MichaIng/DietPi/issues/6512
+	[[ -f '/etc/apt/apt.conf.d/dietpi-ffmpeg' ]] && G_EXEC rm /etc/apt/apt.conf.d/dietpi-ffmpeg
 }
 
 # v6.35 => v7 migration

diff --git a/.update/pre-patches b/.update/pre-patches
@@ -254,6 +254,7 @@ Package: src:ffmpeg
 Pin: version 7:5*
 Pin-Priority: 1000
 _EOF_
+		G_EXEC eval 'echo '\''APT::Get::Allow-Downgrades "1";'\'' > /etc/apt/apt.conf.d/dietpi-ffmpeg'
 	fi
 fi