desktop/weston: Updated for version 10.0.0.

- Merge README.SBo with README, as there is less manual intervention
required with 15.0 than with earlier renditions of current.
- Add patch for elogind support (will submit upstream).

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 31 insertions, 103 deletions

diff --git a/desktop/weston/README b/desktop/weston/README
index 390aa05e91..797461b9ae 100644
--- a/desktop/weston/README
+++ b/desktop/weston/README
@@ -10,3 +10,12 @@ environments on top of Weston's core.
 A small suite of example or demo clients are also provided: though they
 can be useful in themselves, their main purpose is to be an example or
 test case for others building compositors or clients.
+
+Optional Dependencies:
+
+At the present time, the only optional dependency for this SlackBuild is
+colord, which is disabled by default. That is because colord pulls in
+many dependencies.
+
+If you would like to enable colord functionality in this SlackBuild, set
+the USE_COLORD variable to "true" before running the SlackBuild.
diff --git a/desktop/weston/README.SBo b/desktop/weston/README.SBo
deleted file mode 100644
index bfd1c71693..0000000000
--- a/desktop/weston/README.SBo
+++ /dev/null
@@ -1,91 +0,0 @@
-Weston:  reference implementation of a Wayland compositor.
-==========================================================
-
-This README is current as of Weston 9.0.0.
-
-Introduction
-------------
-
-Weston is the reference implementation of a Wayland compositor, as well
-as a useful environment in and of itself.
-
-Out of the box, Weston provides a very basic desktop, or a full-featured
-environment for non-desktop uses such as automotive, embedded,
-in-flight, industrial, kiosks, set-top boxes and TVs. It also provides a
-library allowing other projects to build their own full-featured
-environments on top of Weston's core.
-
-A small suite of example or demo clients are also provided: though they
-can be useful in themselves, their main purpose is to be an example or
-test case for others building compositors or clients.
-
-
-Slackware-specific Information
-------------------------------
-
-*****************************************
-IMPORTANT:  MANUAL INTERVENTION REQUIRED.
-*****************************************
-
-This SlackBuild of Weston takes a fairly "hands off" approach, and there
-are a few things users need to be aware of.
-
-To launch Weston, here are some required steps.
-
-Please note that setting weston-launch suid root is NOT required any longer
-under PAM-ified Slackware Current.
-
-1. If you do not have another script exporting XDG_RUNTIME_DIR, you
-should enable the one that comes with this SlackBuild:
-
-	# chmod +x /etc/profile.d/weston.sh
-		(or .csh, depending on your shell)
-
-2. Logout (if necessary) and re-login as root.
-
-Once you've logged out and back in as root, run:
-
-	`exec weston-launch -u $USER`
-
-where $USER is the username of the normal user you would like to launch Weston
-as.
-
-To launch with Xwayland support, run:
-
-	`exec weston-launch -u $USER -- --xwayland`
-
-You can use the Ctrl+Alt+Backspace keyboard combination to kill Weston.
-
-
-Optional Dependencies
----------------------
-
-At the present time, the only optional dependency for this SlackBuild is
-colord, which is disabled by default. That is because colord pulls in many
-dependencies, while building Weston without colord requires no dependencies at
-all on Slackware current, which may be more desirable for users that just want
-to quickly test out Wayland by getting Weston up and running.
-
-If you would like to enable colord functionality in this SlackBuild,
-set the USE_COLORD variable to "true" before running the SlackBuild.
-
-
-Known Issues
-------------
-
-* I have not had success getting Weston to launch with the proprietary nvidia
-drivers in use. YMMV. I have had the best luck with the Intel KMS drivers.
-
-* In testing 8.0.0 on the newly PAM-ified Slackware current, I have found that
-after running Ctrl+Alt+Backspace to quit, I am brought back to a blank,
-black screen. If this happens, try waiting a few seconds and then hit
-Ctrl+Alt+F2 (for instance) followed by Ctrl+Alt+F1 to get back to the console.
-
-* I want to stress and emphasize that this is still relatively experimental
-software, that talks to your hardware at a fairly low level. For the most
-part, I have not had any major issues, but I have seen some odd bugs and
-behaviour, including Weston hard-locking my system upon exit and having to
-reboot. I have also returned to my shell to find that some keystrokes I had
-inputted while using Weston had been inputted into my console with a series of
-"Command not found" errors. I do not believe Weston has been widely tested on
-non-systemd/logind systems such as Slackware. Use at your own risk.
diff --git a/desktop/weston/weston-10.0.0-elogind.patch b/desktop/weston/weston-10.0.0-elogind.patch
new file mode 100644
index 0000000000..776f15497c
--- /dev/null
+++ b/desktop/weston/weston-10.0.0-elogind.patch
@@ -0,0 +1,13 @@
+diff -Naur weston-10.0.0/libweston/meson.build weston-10.0.0-elogind/libweston/meson.build
+--- weston-10.0.0/libweston/meson.build	2022-02-01 16:59:57.000000000 -0500
++++ weston-10.0.0-elogind/libweston/meson.build	2022-03-28 23:44:39.649373893 -0400
+@@ -157,6 +157,9 @@
+ systemd_dep = dependency('', required: false)
+ if get_option('launcher-logind')
+ 	systemd_dep = dependency('libsystemd', version: '>= 209', required: false)
++	if not systemd_dep.found()
++		systemd_dep = dependency('libelogind', version: '>= 209', required: false)
++	endif
+ 	if systemd_dep.found()
+ 		config_h.set('HAVE_SYSTEMD_LOGIN_209', '1')
+ 	else
diff --git a/desktop/weston/weston.SlackBuild b/desktop/weston/weston.SlackBuild
index d1382dd8e5..1df0cf009e 100644
--- a/desktop/weston/weston.SlackBuild
+++ b/desktop/weston/weston.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Weston
 
-# Copyright 2019-2021 Logan Rathbone <poprocks@gmail.com>
+# Copyright 2019-2022 Logan Rathbone <poprocks@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=weston
-VERSION=${VERSION:-9.0.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-10.0.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -73,6 +73,9 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
+# Patches
+patch -p1 < $CWD/weston-10.0.0-elogind.patch
+
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find -L . \
@@ -91,13 +94,8 @@ cd build
     --prefix=/usr \
     --mandir=man \
     --libdir=lib${LIBDIRSUFFIX} \
-    -Dlauncher-logind=false \
-    -Dbackend-rdp=false \
     -Dsystemd=false \
-    -Dpipewire=false \
-    -Dsimple-dmabuf-drm=auto \
     -Dcolor-management-colord=${USE_COLORD:-false}
-
   ninja
   DESTDIR=$PKG ninja install
 cd ..
@@ -180,7 +178,6 @@ EOF
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CONTRIBUTING.md COPYING DCO-1.1.txt README.md notes.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README.SBo > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
 
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/desktop/weston/weston.info b/desktop/weston/weston.info
index 332af5663f..48dc8ae9be 100644
--- a/desktop/weston/weston.info
+++ b/desktop/weston/weston.info
@@ -1,8 +1,8 @@
 PRGNAM="weston"
-VERSION="9.0.0"
+VERSION="10.0.0"
 HOMEPAGE="https://wayland.freedesktop.org/"
-DOWNLOAD="https://github.com/wayland-project/weston/archive/9.0.0/weston-9.0.0.tar.gz"
-MD5SUM="6c1cd2986d3d0782701d213e302b96e8"
+DOWNLOAD="https://github.com/wayland-project/weston/archive/10.0.0/weston-10.0.0.tar.gz"
+MD5SUM="f80d57b07e80727b5b8c06f11e3bb014"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""