Merge 562d4e4cb4 into 6d458aafac

Merge pull request #3916 from theofficialgman/master
emulationstation: fix OpenGL version check
2024-05-20 05:10:53 -04:00 · 2024-05-08 21:24:24 +01:00 · 2024-05-08 20:40:18 +01:00 · 2024-05-08 15:28:33 -04:00
1 changed files with 3 additions and 0 deletions
--- a/scriptmodules/supplementary/emulationstation.sh
+++ b/scriptmodules/supplementary/emulationstation.sh
@ -173,7 +173,10 @@ function build_emulationstation() {
            compareVersions $gles_ver lt 2.0  && params+=(-DUSE_GLES1=On)
        else
            params+=(-DGL=On)
+            # mesa specific check of OpenGL version
            local gl_ver=$(sudo -u $user glxinfo -B | grep -oP 'Max compat profile version:\s\K.*')
+            # generic fallback check of OpenGL version
+            [[ -z "$gl_ver" ]] && gl_ver=$(sudo -u $user glxinfo -B | grep -oP "OpenGL version string: \K[^ ]+")
            compareVersions $gl_ver gt 2.0 && params+=(-DUSE_GL21=On)
        fi
    elif isPlatform "gles"; then
Author	SHA1	Message	Date
DirtBagXon	193308d1b0	Merge `562d4e4cb4` into `6d458aafac`	2024-05-08 21:24:24 +01:00
Jools Wills	6d458aafac	Merge pull request #3916 from theofficialgman/master emulationstation: fix OpenGL version check	2024-05-08 20:40:18 +01:00
theofficialgman	a9bdf98195	emulationstation: fix OpenGL version check	2024-05-08 15:28:33 -04:00