Skip to content

Commit cc07a9f

Browse files
committed
sdl2 - updated to retropie-2.0.20 branch
Added libsamplerate0-dev dependency to module. Branch includes reworking the patch for kms modesetting via env variables, some minor changes to our Mali and RPI patches, and some removal of no longer needed changes. It also includes removal of some debian/control build dependencies which were added to upstream to align with Debian's packaging. The addition causes dependencies like libwayland-dev and libpulse-dev to be required for all platforms. As we handle adding dependencies in our sdl module code, these have been removed in our retropie-2.0.16+ sdl2 branch. Include fix for detection of videocore due to our renamed include folders (thanks @cmitu).
1 parent 0619d80 commit cc07a9f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

scriptmodules/supplementary/sdl2.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ rp_module_section="depends"
1616
rp_module_flags=""
1717

1818
function get_ver_sdl2() {
19-
echo "2.0.10"
19+
echo "2.0.20"
2020
}
2121

2222
function get_pkg_ver_sdl2() {
23-
local ver="$(get_ver_sdl2)+5"
23+
local ver="$(get_ver_sdl2)+1"
2424
isPlatform "rpi" && ver+="rpi"
2525
isPlatform "mali" && ver+="mali"
2626
echo "$ver"
@@ -33,7 +33,7 @@ function get_arch_sdl2() {
3333
function _list_depends_sdl2() {
3434
# Dependencies from the debian package control + additional dependencies for the pi (some are excluded like dpkg-dev as they are
3535
# already covered by the build-essential package retropie relies on.
36-
local depends=(libasound2-dev libudev-dev libibus-1.0-dev libdbus-1-dev fcitx-libs-dev libsndio-dev)
36+
local depends=(libasound2-dev libudev-dev libibus-1.0-dev libdbus-1-dev fcitx-libs-dev libsndio-dev libsamplerate0-dev)
3737
# these were removed by a PR for vero4k support (cannot test). Needed though at least for for RPI and X11
3838
! isPlatform "vero4k" && depends+=(libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev libgl1-mesa-dev)
3939
isPlatform "gles" || isPlatform "gl" && depends+=(libegl1-mesa-dev libgles2-mesa-dev)
@@ -91,6 +91,7 @@ function build_sdl2() {
9191
if isPlatform "rpi" && [[ -d "/opt/vc/include" ]]; then
9292
# move proprietary videocore headers
9393
sed -i -e 's/\"EGL/\"brcmEGL/g' -e 's/\"GLES/\"brcmGLES/g' ./src/video/raspberry/SDL_rpivideo.h
94+
sed -i -e 's#<EGL/eglplatform#<brcmEGL/eglplatform#g' configure
9495
mv /opt/vc/include/EGL /opt/vc/include/brcmEGL
9596
mv /opt/vc/include/GLES /opt/vc/include/brcmGLES
9697
mv /opt/vc/include/GLES2 /opt/vc/include/brcmGLES2

0 commit comments

Comments
 (0)