Skip to content

Commit

Permalink
helpers - fix sdl1 dependency installing on non RPi platforms.
Browse files Browse the repository at this point in the history
In the past unsupported scriptmodules for a platform were not loaded, so rp_hasModule would only return true if the module was available for the platform.

As we now load all modules for displaying of information in retropie_setup / retropie_packages output, rp_hasModule function will return true, so we need to use rp_isEnabled instead.

This fixes installing scriptmodules with an sdl1.2-dev dependency on non RPi (eg x86/x11), that previously forced our custom sdl1 and then failed as it's disabled for the target.
  • Loading branch information
joolswills committed May 25, 2022
1 parent cd93023 commit b0759ff
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scriptmodules/helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,10 @@ function _mapPackage() {
compareVersions "$__os_debian_ver" lt 9 && pkg="libpng12-dev"
;;
libsdl1.2-dev)
rp_hasModule "sdl1" && pkg="RP sdl1 $pkg"
rp_isEnabled "sdl1" && pkg="RP sdl1 $pkg"
;;
libsdl2-dev)
if rp_hasModule "sdl2"; then
if rp_isEnabled "sdl2"; then
# check whether to use our own sdl2 - can be disabled to resolve issues with
# mixing custom 64bit sdl2 and os distributed i386 version on multiarch
local own_sdl2=1
Expand Down

0 comments on commit b0759ff

Please sign in to comment.