From cd4b4e831858722d95a0996620fca7c014446674 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Thu, 10 Oct 2024 01:05:26 +0800 Subject: [PATCH] mesa-vpu: use mesa from debian bookworm-backports --- extensions/mesa-vpu.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/extensions/mesa-vpu.sh b/extensions/mesa-vpu.sh index 6cb7c04b234a..aaba956d7ec1 100644 --- a/extensions/mesa-vpu.sh +++ b/extensions/mesa-vpu.sh @@ -120,12 +120,6 @@ function post_install_kernel_debs__3d() { pkgs+=("chromium") fi - elif [[ "${DISTRIBUTION}" == "Debian" && "${RELEASE}" == "bookworm" ]]; then - - display_alert "Adding mesa backport repo for ${RELEASE} from OBS" "${EXTENSION}" "info" - echo 'deb http://download.opensuse.org/repositories/home:/amazingfate:/mesa-bookworm-backport/Debian_12/ /' | tee "${SDCARD}"/etc/apt/sources.list.d/home:amazingfate:mesa-bookworm-backport.list - curl -fsSL https://download.opensuse.org/repositories/home:amazingfate:mesa-bookworm-backport/Debian_12/Release.key | gpg --dearmor | tee "${SDCARD}"/etc/apt/trusted.gpg.d/home_amazingfate_mesa-bookworm-backport.gpg > /dev/null - fi if [[ "${BUILD_DESKTOP}" == "yes" ]]; then # if desktop, add amazingfated's multimedia PPAs and rockchip-multimedia-config utility, chromium, gstreamer, etc @@ -160,7 +154,11 @@ function post_install_kernel_debs__3d() { fi display_alert "Installing 3D extension packages" "${EXTENSION}" "info" - do_with_retries 3 chroot_sdcard_apt_get_install "${pkgs[@]}" + if [[ "${DISTRIBUTION}" == "Debian" && "${RELEASE}" == "bookworm" ]]; then + do_with_retries 3 chroot_sdcard_apt_get_install -t bookworm-backports "${pkgs[@]}" + else + do_with_retries 3 chroot_sdcard_apt_get_install "${pkgs[@]}" + fi # This library gets downgraded if [[ "${BUILD_DESKTOP}" == "yes" ]]; then