Merge branch 'master' of https://github.com/Hancock33/batocera.se

Author: Hancock33

package/batocera/core/batocera-resolution/batocera-resolution.mk

@@ -30,7 +30,7 @@ ifeq ($(BR2_PACKAGE_BATOCERA_WAYLAND_SWAY),y)
 endif
 
 ifeq ($(BR2_PACKAGE_BATOCERA_WAYLAND_LABWC),y)
-    BATOCERA_SCRIPT_TYPE=wayland-labwc
+    BATOCERA_RESOLUTION_DPROG=wayland-labwc
     BATOCERA_RESOLUTION_DEPENDENCIES += grim wf-recorder
 endif
 

package/batocera/core/batocera-resolution/scripts/screenshot/batocera-screenshot.wayland-sway

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+. /etc/profile.d/xdg.sh
+. /etc/profile.d/wayland.sh
+
 FILE=$1
 if [ -z ${FILE} ]; then
     FILE="/userdata/screenshots/screenshot-$(date +%Y.%m.%d-%Hh%M.%S).png"

package/batocera/core/batocera-scripts/batocera-scripts.mk

@@ -84,6 +84,7 @@ define BATOCERA_SCRIPTS_INSTALL_TARGET_CMDS
 	install -m 0755 $(BATOCERA_SCRIPTS_CP_PATH)/scripts/bluetooth/batocera-bluetooth			$(TARGET_DIR)/usr/bin/
 	install -m 0755 $(BATOCERA_SCRIPTS_CP_PATH)/scripts/bluetooth/batocera-bluetooth-agent		$(TARGET_DIR)/usr/bin/
 	install -m 0755 $(BATOCERA_SCRIPTS_CP_PATH)/scripts/bluetooth/bluezutils.py					$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ # any variable ?
+	install -m 0755 $(BATOCERA_SCRIPTS_PATH)/scripts/getLocalWaylandDisplay						$(TARGET_DIR)/usr/bin/
 	install -m 0755 $(BATOCERA_SCRIPTS_CP_PATH)/scripts/getLocalXDisplay						$(TARGET_DIR)/usr/bin/
 	ln -sf /usr/bin/batocera-xtract																$(TARGET_DIR)/usr/bin/file-roller
 endef

package/batocera/core/batocera-scripts/scripts/getLocalWaylandDisplay

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+find /run -name "wayland-*.lock" 2>/dev/null | head -1 | sed -e s+"^.*/\([^/]*\)\.lock$"+"\1"+
+exit ${PIPESTATUS[0]}

package/batocera/core/batocera-system/batocera-system.mk

@@ -120,6 +120,10 @@ define BATOCERA_SYSTEM_INSTALL_TARGET_CMDS
 	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-system/xdg.sh $(TARGET_DIR)/etc/profile.d/xdg.sh
 	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-system/dbus.sh $(TARGET_DIR)/etc/profile.d/dbus.sh
 
+	# not really needed for xorg
+	cp $(BR2_EXTERNAL_BATOCERA_PATH)/package/batocera/core/batocera-system/wayland.sh \
+	    $(TARGET_DIR)/etc/profile.d/wayland.sh
+
 	# list of modules that doesnt like suspend
 	mkdir -p $(TARGET_DIR)/etc/pm/config.d
 	echo 'SUSPEND_MODULES="rtw88_8822ce snd_pci_acp5x"' > $(TARGET_DIR)/etc/pm/config.d/config

package/batocera/core/batocera-system/wayland.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# SWAYSOCK=<XDG_RUNTIME_DIR>/sway-ipc.<uid>.sock
+export SWAYSOCK=${XDG_RUNTIME_DIR}/sway-ipc.0.sock
+export WAYLAND_DISPLAY=$(getLocalWaylandDisplay)