Continue to work on dolphin.

packages/games/emulators/PPSSPPSDL/package.mk

@@ -32,18 +32,13 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 			   -DUSING_X11_VULKAN=OFF"
 fi
 
-#if [ "${VULKAN_SUPPORT}" = "yes" ]
-#then
-#  PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
-#  PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN_DISPLAY_KHR=ON \
-#                           -DVULKAN=ON \
-#                           -DUSING_X11_VULKAN=OFF"
-#fi
-### Vulkan seems to be broken upstream, disable for now.
-PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN_DISPLAY_KHR=OFF \
-			 -DVULKAN=OFF \
-			 -DUSING_X11_VULKAN=OFF"
-
+if [ "${VULKAN_SUPPORT}" = "yes" ]
+then
+  PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
+  PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN_DISPLAY_KHR=ON \
+                           -DVULKAN=ON \
+                           -DUSING_X11_VULKAN=OFF"
+fi
 
 if [ "${DISPLAYSERVER}" = "wl" ]; then
   PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"

packages/games/emulators/dolphinsa/package.mk

@@ -37,7 +37,7 @@ fi
 if [ "${DISPLAYSERVER}" = "wl" ]; then
   PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
   PKG_CONFIGURE_OPTS_TARGET+=" -DENABLE_X11=ON \
-                               -DENABLE_EGL=OFF"
+                               -DENABLE_EGL=ON"
 fi
 
 if [ "${VULKAN_SUPPORT}" = "yes" ]

packages/graphics/SDL2/package.mk

@@ -15,33 +15,51 @@ PKG_PATCH_DIRS+="${DEVICE}"
 
 if [ ! "${OPENGL}" = "no" ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGL} glu"
-  PKG_CMAKE_OPTS_TARGET+=" -DVIDEO_OPENGL=ON \
-                           -DVIDEO_X11=OFF"
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_OPENGL=ON \
+                           -DVIDEO_OPENGL=ON \
+                           -DVIDEO_KMSDRM=OFF"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_OPENGL=OFF \
+                           -DVIDEO_OPENGL=OFF \
+                           -DVIDEO_KMSDRM=OFF"
 fi
 
 if [ "${OPENGLES_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-  PKG_CMAKE_OPTS_TARGET+="-DVIDEO_OPENGLES=ON \
-                          -DVIDEO_VULKAN=OFF \
-			  -DVIDEO_X11=OFF"
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_OPENGLES=ON \
+                           -DVIDEO_OPENGLES=ON \
+                           -DVIDEO_KMSDRM=ON"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_OPENGLES=OFF \
+                           -DVIDEO_OPENGLES=OFF \
+                           -DVIDEO_KMSDRM=OFF"
 fi
 
 if [ "${VULKAN_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
-  PKG_CMAKE_OPTS_TARGET+=" -DVIDEO_VULKAN=ON \
-                           -DVIDEO_X11=OFF"
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_VULKAN=ON \
+                           -DVIDEO_OPENGL=OFF \
+                           -DVIDEO_VULKAN=ON"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_VULKAN=OFF \
+                           -DVIDEO_VULKAN=OFF"
 fi
 
 if [ "${DISPLAYSERVER}" = "wl" ]
 then
   PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"
-  PKG_CMAKE_OPTS_TARGET+=" -DVIDEO_WAYLAND=ON \
-                           -DVIDEO_WAYLAND_QT_TOUCH=ON \
-                           -DWAYLAND_SHARED=ON"
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_WAYLAND=ON \
+                           -DVIDEO_WAYLAND=ON \
+                           -DVIDEO_WAYLAND_QT_TOUCH=OFF \
+                           -DWAYLAND_SHARED=ON \
+                           -DVIDEO_X11=OFF \
+                           -DSDL_X11=OFF"
 else
   PKG_CMAKE_OPTS_TARGET+=" -DVIDEO_WAYLAND=OFF \
                            -DVIDEO_WAYLAND_QT_TOUCH=ON \
-                           -DWAYLAND_SHARED=OFF"
+                           -DWAYLAND_SHARED=OFF \
+                           -DVIDEO_X11=OFF \
+                           -DSDL_X11=OFF"
 fi
 
 case ${PROJECT} in
@@ -97,7 +115,6 @@ pre_configure_target(){
                          -DCLOCK_GETTIME=OFF \
                          -DRPATH=OFF \
                          -DRENDER_D3D=OFF \
-                         -DVIDEO_KMSDRM=ON \
                          -DPULSEAUDIO=ON"
 }
 

packages/ui/emulationstation/sources/start_es.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
+. /etc/profile
 /usr/bin/es_settings
 emulationstation --log-path /var/log

packages/wayland/weston/package.mk

@@ -16,7 +16,7 @@ PKG_MESON_OPTS_TARGET="-Dbackend-drm=true \
                        -Dbackend-rdp=false \
                        -Dscreenshare=false \
                        -Dbackend-wayland=true \
-                       -Dbackend-x11=true \
+                       -Dbackend-x11=false \
                        -Ddeprecated-backend-fbdev=false \
                        -Dbackend-default=drm \
                        -Drenderer-gl=true \

packages/wayland/weston/profile.d/04-weston.conf

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
+export SDL_VIDEODRIVER=wayland
 export WAYLAND_DISPLAY=wayland-1
 export XKB_CONFIG_ROOT=/usr/share/X11/xkb
 export XDG_RUNTIME_DIR=/var/run/0-runtime-dir