weston: update to 6.0.0.

common/shlibs

@@ -2796,8 +2796,7 @@ libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.21 libqalculate-3.0.0_1
-libweston-5.so.0 weston-5.0.0_1
-libweston-desktop-5.so.0 weston-5.0.0_1
+libweston-6.so.0 weston-6.0.0_1
 libostree-1.so.1 libostree-2017.3_1
 librhash.so.0 rhash-1.3.4_1
 libserialport.so.0 libserialport-0.1.1_1

srcpkgs/weston/template

@@ -1,44 +1,50 @@
 # Template file for 'weston'
 pkgname=weston
-version=5.0.0
+version=6.0.0
 revision=1
-build_style=gnu-configure
-configure_args="--disable-setuid-install
- --enable-colord --enable-x11-compositor --enable-xwayland
- $(vopt_enable dbus) $(vopt_enable elogind systemd-login)
- $(vopt_enable vaapi vaapi-recorder)"
-hostmakedepends="pkg-config wayland-devel wayland-protocols autoconf automake libtool"
+build_style=meson
+configure_args="-Dtest-junit-xml=false -Dbackend-rdp=false -Dsystemd=false
+ -Dremoting=false
+ -Dlauncher-logind=$(vopt_if elogind true false)
+ -Dbackend-drm-screencast-vaapi=$(vopt_if vaapi true false)"
+hostmakedepends="pkg-config wayland-devel wayland-protocols"
 makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel
  pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel
  poppler-glib-devel pam-devel lcms2-devel eudev-libudev-devel libdrm-devel
- libinput-devel libxcb-devel libXcursor-devel colord-devel
- $(vopt_if dbus dbus-devel) $(vopt_if vaapi 'glu-devel libva-devel')
- $(vopt_if elogind elogind-devel)"
+ libinput-devel libxcb-devel libXcursor-devel colord-devel dbus-devel
+ $(vopt_if vaapi 'glu-devel libva-devel') $(vopt_if elogind elogind-devel)"
 short_desc="Reference implementation of a Wayland compositor"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
-checksum=15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf
+checksum=546323a90607b3bd7f48809ea9d76e64cd09718102f2deca6d95aa59a882e612
 system_groups="weston-launch"
 lib32disabled=yes
 
 # Package build options
-build_options="dbus elogind vaapi"
-build_options_default="dbus"
+build_options="elogind vaapi"
+desc_option_elogind="Use elogind for suidless startup"
 
 case "$XBPS_TARGET_MACHINE" in
-x86_64*|i686*|ppc64*)
-	build_options_default+=" vaapi" ;;
+	x86_64*|i686*|ppc64*)
+		build_options_default+=" vaapi"
+		configure_args+=" -Dsimple-dmabuf-drm=intel"
+		;;
+	armv*|aarch*)
+		configure_args+=" -Dsimple-dmabuf-drm=freedreno"
+		;;
 esac
 
 pre_configure() {
-	autoreconf -fi
+	vsed -i "/subdir('tests')/d" meson.build
 }
 
 post_install() {
 	# weston-launch must be setuid
-	chmod u+s ${DESTDIR}/usr/bin/weston-launch
+	if [ -z "$build_option_elogind" ]; then
+		chmod u+s ${DESTDIR}/usr/bin/weston-launch
+	fi
 	vlicense COPYING LICENSE
 	# Remove development files.
 	rm -rf ${DESTDIR}/usr/include
@@ -54,6 +60,7 @@ weston-colord_package() {
 
 weston-x11_package() {
 	short_desc+=" - x11 backend"
+	depends="weston"
 	pkg_install() {
 		vmove "/usr/lib/libweston-${version%%.*}/x11-backend.so"
 	}