Skip to content

Commit b0759ff

Browse files
committed
helpers - fix sdl1 dependency installing on non RPi platforms.
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.
1 parent cd93023 commit b0759ff

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scriptmodules/helpers.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,10 @@ function _mapPackage() {
227227
compareVersions "$__os_debian_ver" lt 9 && pkg="libpng12-dev"
228228
;;
229229
libsdl1.2-dev)
230-
rp_hasModule "sdl1" && pkg="RP sdl1 $pkg"
230+
rp_isEnabled "sdl1" && pkg="RP sdl1 $pkg"
231231
;;
232232
libsdl2-dev)
233-
if rp_hasModule "sdl2"; then
233+
if rp_isEnabled "sdl2"; then
234234
# check whether to use our own sdl2 - can be disabled to resolve issues with
235235
# mixing custom 64bit sdl2 and os distributed i386 version on multiarch
236236
local own_sdl2=1

0 commit comments

Comments
 (0)