v9.1

- Raspberry Pi Trixie | Align and apply workaround for FFmpeg installs on RPi Trixie systems: The package from the RPi (Bookworm) repo has a higher epoch version, but of course its dependencies cannot be satisfied with Trixie library versions. Hence assure that all packages from the "ffmpeg" source are always pulled from Debian/Raspbian instead.

.build/images/dietpi-installer

@@ -795,11 +795,7 @@ setenv rootuuid "true"' /boot/boot.cmd
 			if (( $DISTRO_TARGET > 7 ))
 			then
 				G_DIETPI-NOTIFY 2 'Enforcing Debian Trixie FFmpeg packages over RPi repo ones'
-				cat << '_EOF_' > /etc/apt/preferences.d/dietpi-ffmpeg
-Package: src:ffmpeg
-Pin: origin archive.raspberrypi.org
-Pin-Priority: -1
-_EOF_
+				G_EXEC eval 'echo -e '\''Package: src:ffmpeg\nPin: origin archive.raspberrypi.com\nPin-Priority: -1'\'' > /etc/apt/preferences.d/dietpi-ffmpeg'
 			fi
 		fi
 

.github/workflows/dietpi-software.bash

@@ -303,11 +303,7 @@ then
 	G_EXEC dpkg --root=rootfs -i keyring.deb
 	G_EXEC rm keyring.deb
 	# Enforce Debian Trixie FFmpeg packages over RPi repo ones
-	[[ $DISTRO != 'trixie' ]] || cat << '_EOF_' > rootfs/etc/apt/preferences.d/dietpi-ffmpeg || exit 1
-Package: src:ffmpeg
-Pin: origin archive.raspberrypi.com
-Pin-Priority: -1
-_EOF_
+	[[ $DISTRO == 'trixie' ]] && G_EXEC eval 'echo -e '\''Package: src:ffmpeg\nPin: origin archive.raspberrypi.com\nPin-Priority: -1'\'' > /etc/apt/preferences.d/dietpi-ffmpeg'
 fi
 
 # Install test builds from dietpi.com if requested

.update/pre-patches

@@ -289,9 +289,8 @@ then
 	# RPi/ARMv6 container Bookworm
 	elif [[ $G_DISTRO -ge 7 && -f '/etc/apt/sources.list.d/raspi.list' ]]
 	then
-		G_DIETPI-NOTIFY 2 'Migrating RPi APT repository to Bookworm and removing obsolete FFmpeg workaround'
+		G_DIETPI-NOTIFY 2 'Migrating RPi APT repository to Bookworm'
 		G_EXEC eval 'echo '\''deb https://archive.raspberrypi.com/debian/ bookworm main'\'' > /etc/apt/sources.list.d/raspi.list'
-		[[ -f '/etc/apt/preferences.d/dietpi-ffmpeg' ]] && G_EXEC rm /etc/apt/preferences.d/dietpi-ffmpeg
 
 		G_DIETPI-NOTIFY 2 'Removing faulty non-free-firmware component if present'
 		(( $G_RASPBIAN )) && G_EXEC sed --follow-symlinks -i 's/ non-free-firmware$//' /etc/apt/sources.list
@@ -382,5 +381,16 @@ then
 	grep -q 'DietPi v6' /boot/dietpi/dietpi-update && > "../DietPi-Update/DietPi-$GITBRANCH_TARGET/dietpi/server_version-6" > "../DietPi-Update/DietPi-$GITBRANCH_TARGET/dietpi/pre-patch_file" > /boot/dietpi/patch_file
 fi
 
+# v9.1
+if (( $G_DIETPI_VERSION_CORE < 9 || ( $G_DIETPI_VERSION_CORE == 9 && $G_DIETPI_VERSION_SUB < 1 ) ))
+then
+	# RPi/ARMv6 container Trixie
+	elif [[ $G_DISTRO -ge 8 && -f '/etc/apt/sources.list.d/raspi.list' ]]
+	then
+		G_DIETPI-NOTIFY 2 'Adding FFmpeg workaround for RPi Trixie systems'
+		G_EXEC eval 'echo -e '\''Package: src:ffmpeg\nPin: origin archive.raspberrypi.com\nPin-Priority: -1'\'' > /etc/apt/preferences.d/dietpi-ffmpeg'
+	fi	
+fi
+
 exit 0
 }