Still working on xwayland.

packages/games/emulators/dolphinsa/package.mk

@@ -2,14 +2,24 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
 
 PKG_NAME="dolphinsa"
-PKG_VERSION="0b160db48796f727311cea16072174d96b784f80"
-PKG_GIT_CLONE_BRANCH="egldrm"
 PKG_LICENSE="GPLv2"
-PKG_SITE="https://github.com/rtissera/dolphin"
-PKG_URL="${PKG_SITE}.git"
 PKG_DEPENDS_TARGET="toolchain libevdev libdrm ffmpeg zlib libpng lzo libusb"
 PKG_LONGDESC="Dolphin is a GameCube / Wii emulator, allowing you to play games for these two platforms on PC with improvements. "
 
+case ${DEVICE} in
+  RG552|handheld)
+    PKG_SITE="https://github.com/dolphin-emu/dolphin"
+    PKG_URL="${PKG_SITE}.git"
+    PKG_VERSION="23902f9"
+  ;;
+  *)
+    PKG_SITE="https://github.com/rtissera/dolphin"
+    PKG_URL="${PKG_SITE}.git"
+    PKG_VERSION="0b160db48796f727311cea16072174d96b784f80"
+    PKG_GIT_CLONE_BRANCH="egldrm"
+  ;;
+esac
+
 if [ ! "${OPENGL}" = "no" ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGL} glu"
 fi
@@ -25,25 +35,25 @@ if [ "${DISPLAYSERVER}" = "wl" ]; then
 fi
 
 PKG_CMAKE_OPTS_TARGET+=" -DENABLE_HEADLESS=ON \
-                        -DENABLE_EGL=ON \
-                        -DENABLE_EVDEV=ON \
-                        -DLINUX_LOCAL_DEV=ON \
-                        -DOpenGL_GL_PREFERENCE=GLVND \
-                        -DENABLE_TESTS=OFF \
-                        -DENABLE_LLVM=OFF \
-                        -DENABLE_ANALYTICS=OFF \
-                        -DENABLE_LTO=ON \
-                        -DENABLE_QT=OFF \
-                        -DENCODE_FRAMEDUMPS=OFF"
+                         -DENABLE_EGL=ON \
+                         -DENABLE_EVDEV=ON \
+                         -DLINUX_LOCAL_DEV=ON \
+                         -DOpenGL_GL_PREFERENCE=GLVND \
+                         -DENABLE_TESTS=OFF \
+                         -DENABLE_LLVM=OFF \
+                         -DENABLE_ANALYTICS=OFF \
+                         -DENABLE_LTO=ON \
+                         -DENABLE_QT=OFF \
+                         -DENCODE_FRAMEDUMPS=OFF"
 
 makeinstall_target() {
-mkdir -p ${INSTALL}/usr/bin
-cp -rf ${PKG_BUILD}/.${TARGET_NAME}/Binaries/dolphin* ${INSTALL}/usr/bin
-cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin
+  mkdir -p ${INSTALL}/usr/bin
+  cp -rf ${PKG_BUILD}/.${TARGET_NAME}/Binaries/dolphin* ${INSTALL}/usr/bin
+  cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin
 
-chmod +x ${INSTALL}/usr/bin/start_dolphin.sh
+  chmod +x ${INSTALL}/usr/bin/start_dolphin.sh
 
-mkdir -p ${INSTALL}/usr/config/dolphin-emu
-cp -rf ${PKG_BUILD}/Data/Sys/* ${INSTALL}/usr/config/dolphin-emu
-cp -rf ${PKG_DIR}/config/* ${INSTALL}/usr/config/dolphin-emu
+  mkdir -p ${INSTALL}/usr/config/dolphin-emu
+  cp -rf ${PKG_BUILD}/Data/Sys/* ${INSTALL}/usr/config/dolphin-emu
+  cp -rf ${PKG_DIR}/config/* ${INSTALL}/usr/config/dolphin-emu
 }

packages/graphics/SDL/package.mk

@@ -77,20 +77,6 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-shared \
                            --disable-render-d3d \
                            --enable-arm-neon"
 
-
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-video --disable-video-x11 --disable-x11-shared"
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-xcursor --disable-video-x11-xinerama"
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-xinput --disable-video-x11-xrandr"
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-scrnsaver --disable-video-x11-xshape"
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-vm --without-x"
-
-PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET --disable-video --disable-video-x11 --disable-x11-shared"
-PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-xcursor --disable-video-x11-xinerama"
-PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-xinput --disable-video-x11-xrandr"
-PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-scrnsaver --disable-video-x11-xshape"
-PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-vm --without-x"
-
-
 if [ ! "$OPENGL" = "no" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL glu"
 
@@ -99,6 +85,11 @@ else
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-opengl --enable-video-opengles --enable-video-fbcon"
 fi
 
+  if [ "${DISPLAYSERVER}" = "wl" ]; then
+    PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"
+    PKG_CONFIGURE_OPTS_TARGET+=" --enable-video-wayland --enable-video-wayland-qt-touch --enable-wayland-shared"
+  fi
+
 if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio"
 

packages/graphics/cairo/package.mk

@@ -36,9 +36,9 @@ elif [ "$DISPLAYSERVER" = "wl" ]; then
                     --x-libraries="$SYSROOT_PREFIX/usr/lib" \
                     --enable-xlib \
                     --enable-xlib-xrender \
-                    --enable-gl \
-                    --enable-glx \
-                    --disable-glesv2 \
+                    --disable-gl \
+                    --disable-glx \
+                    --enable-glesv2 \
                     --enable-egl \
                     --enable-xcb \
                     --enable-xlib-xcb \

packages/wayland/weston/config/kiosk.ini

@@ -1,6 +1,10 @@
 [core]
 idle-time=0
 shell=kiosk-shell.so
+xwayland=true
+
+[xwayland]
+path=/usr/bin/Xwayland
 
 [terminal]
 font-size=16

packages/wayland/weston/config/weston.ini

@@ -1,5 +1,9 @@
 [core]
 idle-time=0
+xwayland=true
+
+[xwayland]
+path=/usr/bin/Xwayland
 
 [terminal]
 font-size=16

projects/PC/devices/handheld/options

@@ -11,10 +11,10 @@
     OPENGLES="mesa"
 
   # Vulkan implementation to use (vulkan-loader / no)
-  #  VULKAN="vulkan-loader"
+    VULKAN="vulkan-loader"
 
   # VULKAN_SUPPORT
-    VULKAN_SUPPORT="no"
+    VULKAN_SUPPORT="yes"
 
   # Displayserver to use (weston / x11 / no)
     DISPLAYSERVER="wl"