Merge pull request #1970 from fewtarius/dev

Fix weston11 package.

packages/wayland/weston/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="weston"
-PKG_VERSION="12.0.1"
+PKG_VERSION="12.0.2"
 
 PKG_LICENSE="MIT"
 PKG_SITE="https://wayland.freedesktop.org/"

packages/wayland/weston11/config/kiosk.ini

@@ -1,6 +1,6 @@
 [core]
 idle-time=0
-backend=/usr/lib/libweston-10/drm-backend.so
+backend=drm-backend.so
 shell=kiosk-shell.so
 xwayland=true
 

packages/wayland/weston11/config/weston.ini

@@ -1,6 +1,6 @@
 [core]
 idle-time=0
-backend=/usr/lib/libweston-10/drm-backend.so
+backend=drm-backend.so
 xwayland=true
 
 [xwayland]

packages/wayland/weston11/package.mk

@@ -3,11 +3,13 @@
 
 PKG_NAME="weston11"
 PKG_VERSION="11.0.3"
+
 PKG_LICENSE="MIT"
 PKG_SITE="https://wayland.freedesktop.org/"
 PKG_URL="https://gitlab.freedesktop.org/wayland/weston/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain wayland wayland-protocols libdrm libxkbcommon libinput cairo pango libjpeg-turbo dbus seatd glu ${OPENGL} libX11 xorg-server libXcursor xkbcomp setxkbmap cairo xterm splash"
+PKG_DEPENDS_TARGET="toolchain wayland wayland-protocols libdrm libxkbcommon libxcb-cursor libinput pipewire cairo pango libjpeg-turbo dbus seatd glu ${OPENGL} libX11 xorg-server libXcursor xkbcomp setxkbmap cairo xterm splash"
 PKG_LONGDESC="Reference implementation of a Wayland compositor"
+PKG_PATCH_DIRS+="${DEVICE}"
 
 PKG_MESON_OPTS_TARGET="-Dbackend-drm=true \
                        -Dbackend-drm-screencast-vaapi=false \
@@ -16,23 +18,18 @@ PKG_MESON_OPTS_TARGET="-Dbackend-drm=true \
                        -Dscreenshare=false \
                        -Dbackend-wayland=true \
                        -Dbackend-x11=false \
-                       -Ddeprecated-backend-fbdev=false \
                        -Dbackend-default=drm \
                        -Drenderer-gl=true \
-                       -Ddeprecated-weston-launch=false \
                        -Dxwayland=true \
                        -Dsystemd=true \
                        -Dremoting=false \
-                       -Dpipewire=false \
+                       -Dpipewire=true \
                        -Dshell-desktop=true \
                        -Dshell-fullscreen=true \
                        -Dshell-ivi=false \
                        -Dshell-kiosk=true \
                        -Ddesktop-shell-client-default="weston-desktop-shell" \
-                       -Ddeprecated-wl-shell=false \
                        -Dcolor-management-lcms=false \
-                       -Dcolor-management-colord=false \
-                       -Dlauncher-logind=false \
                        -Dlauncher-libseat=true \
                        -Dimage-jpeg=true \
                        -Dimage-webp=false \
@@ -43,7 +40,6 @@ PKG_MESON_OPTS_TARGET="-Dbackend-drm=true \
                        -Dwcap-decode=true \
                        -Dtest-junit-xml=false \
                        -Dtest-skip-is-failure=false \
-                       -Dtest-gl-renderer=false \
                        -Ddoc=false"
 
 pre_configure_target() {

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

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
-export SDL_AUDIODRIVER=alsa
+export SDL_AUDIODRIVER=pulseaudio
 export SDL_VIDEODRIVER=wayland
 export WAYLAND_DISPLAY=wayland-1
 export XKB_CONFIG_ROOT=/usr/share/X11/xkb

packages/wayland/weston11/system.d/weston.service

@@ -10,7 +10,7 @@ Environment=LANG=C
 Environment=XDG_RUNTIME_DIR=/var/run/0-runtime-dir
 WorkingDirectory=/storage
 ExecStartPre=-/usr/lib/weston/weston-config
-ExecStart=/usr/bin/weston --tty=7 --log=/var/log/weston.log
+ExecStart=/usr/bin/weston --log=/var/log/weston.log
 Restart=always
 RestartSec=2