Skip to content

Commit

Permalink
Merge pull request #3880 from RetroPie/revert-3836-xorg-install-2
Browse files Browse the repository at this point in the history
Revert "helpers: map 'xorg' for Pi5 and for 'legacy' exclusion"
  • Loading branch information
joolswills authored Mar 7, 2024
2 parents 8396ec9 + 2e6fc4c commit 1d25e8b
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions scriptmodules/helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,6 @@ function _mapPackage() {
libfreetype6-dev)
[[ "$__os_debian_ver" -gt 10 ]] || compareVersions "$__os_ubuntu_ver" gt 23.04 && pkg="libfreetype-dev"
;;
xorg)
# outside X11, don't install the 'xserver-xorg-legacy' package, even if recommended by 'apt'
# since it breaks launching x11 apps with 'runcommand'
! isPlatform "x11" && pkg+=" xserver-xorg-legacy-"
# Pi5 needs an additional package for xserver to start
isPlatform "rpi5" && pkg+=" gldriver-test"
;;
esac
echo "$pkg"
}
Expand Down

0 comments on commit 1d25e8b

Please sign in to comment.