JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Extend mesa-vpu extension to load unpatched Chromium by default (#6657)

Browse Source 
* Extend mesa-vpu extension to load unpatches Chromium by default
* Pin only Chromium browser

For future - make separate browser extension
This commit is contained in:
Igor
2024-07-29 08:16:00 +02:00
committed by GitHub
parent 0c86f76d30
commit 10b92e2493
1 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
extensions/mesa-vpu.sh
View File

@@ -13,6 +13,9 @@ function extension_prepare_config__3d() {
# only used when generating desktop # only used when generating desktop
[[ "${BUILD_DESKTOP}" != "yes" ]] && return 0 [[ "${BUILD_DESKTOP}" != "yes" ]] && return 0
# some desktops doesn't support wayland
[[ "${DESKTOP_ENVIRONMENT}" == "xfce" || "${DESKTOP_ENVIRONMENT}" == "i3-wm" ]] && return 0
# Define image suffix # Define image suffix
if [[ "${LINUXFAMILY}" =~ ^(rockchip-rk3588|rk35xx)$ && "$BRANCH" =~ ^(legacy)$ && "${RELEASE}" =~ ^(jammy|noble)$ ]]; then if [[ "${LINUXFAMILY}" =~ ^(rockchip-rk3588|rk35xx)$ && "$BRANCH" =~ ^(legacy)$ && "${RELEASE}" =~ ^(jammy|noble)$ ]]; then
@@ -43,6 +46,9 @@ function post_install_kernel_debs__3d() {
# Do not install those packages on CLI and minimal images # Do not install those packages on CLI and minimal images
[[ "${BUILD_DESKTOP}" != "yes" ]] && return 0 [[ "${BUILD_DESKTOP}" != "yes" ]] && return 0
# some desktops doesn't support wayland
[[ "${DESKTOP_ENVIRONMENT}" == "xfce" || "${DESKTOP_ENVIRONMENT}" == "i3-wm" ]] && return 0
# Packages that are going to be installed # Packages that are going to be installed
declare -a pkgs=("mesa-utils" "mesa-utils-extra" "libglx-mesa0" "libgl1-mesa-dri" "glmark2" "glmark2-wayland" "glmark2-es2-wayland" "glmark2-es2") declare -a pkgs=("mesa-utils" "mesa-utils-extra" "libglx-mesa0" "libgl1-mesa-dri" "glmark2" "glmark2-wayland" "glmark2-es2-wayland" "glmark2-es2")
@@ -76,6 +82,36 @@ function post_install_kernel_debs__3d() {
Pin-Priority: 1001 Pin-Priority: 1001
EOF EOF
if [[ "${ARCH}" == "arm64" ]]; then
display_alert "Adding Amazingfate Chromium PPAs" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/chromium --yes --no-update
sed -i "s/oracular/noble/g" "${SDCARD}"/etc/apt/sources.list.d/liujianfeng1994-ubuntu-chromium-"${RELEASE}".*
display_alert "Pinning amazingfated's Chromium PPAs" "${EXTENSION}" "info"
cat <<- EOF > "${SDCARD}"/etc/apt/preferences.d/liujianfeng1994-chromium-pin
Package: chromium
Pin: release o=LP-PPA-liujianfeng1994-chromium
Pin-Priority: 1001
EOF
else
display_alert "Adding Xtradebs Apps PPAs" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard add-apt-repository ppa:xtradeb/apps --yes --no-update
sed -i "s/oracular/noble/g" "${SDCARD}"/etc/apt/sources.list.d/xtradeb-ubuntu-apps-"${RELEASE}".*
display_alert "Pinning Xtradebs PPAs" "${EXTENSION}" "info"
cat <<- EOF > "${SDCARD}"/etc/apt/preferences.d/xtradebs-apps-pin
Package: chromium
Pin: release o=LP-PPA-xtradebs-apps
Pin-Priority: 1001
EOF
fi
pkgs+=("chromium")
elif [[ "${DISTRIBUTION}" == "Debian" && "${RELEASE}" == "bookworm" ]]; then elif [[ "${DISTRIBUTION}" == "Debian" && "${RELEASE}" == "bookworm" ]]; then
display_alert "Adding mesa backport repo for ${RELEASE} from OBS" "${EXTENSION}" "info" display_alert "Adding mesa backport repo for ${RELEASE} from OBS" "${EXTENSION}" "info"
@@ -113,4 +149,9 @@ function post_install_kernel_debs__3d() {
display_alert "Upgrading Mesa packages" "${EXTENSION}" "info" display_alert "Upgrading Mesa packages" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard_apt_get dist-upgrade do_with_retries 3 chroot_sdcard_apt_get dist-upgrade
# Disable wayland flag for XFCE
#if [[ "${DESKTOP_ENVIRONMENT}" == "xfce" ]]; then
# sed -e '/wayland/ s/^#*/#/' -i "${SDCARD}"/etc/chromium.d/default-flags
#fi
} }