From 54e4756c5e09a29cfb8e8814c2055bacb97b9895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sat, 11 Apr 2020 16:42:10 -0300 Subject: [PATCH 1/5] mesa-dri: enable vc4 driver for armv6l --- srcpkgs/mesa/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 508cb8d6684..872f2d91d6c 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,7 +1,7 @@ # Template file for 'mesa' pkgname=mesa version=20.0.4 -revision=1 +revision=2 wrksrc="mesa-${version}" build_style=meson configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true @@ -80,7 +80,7 @@ aarch64*) subpackages+=" mesa-kmsro-dri mesa-tegra-dri mesa-nouveau-dri mesa-v3d-dri mesa-vc4-dri" subpackages+=" mesa-etnaviv-dri mesa-freedreno-dri mesa-lima-dri mesa-panfrost-dri" ;; -armv7l*) +armv[67]l*) configure_args+=" -Dgallium-drivers=auto" configure_args+=" -Dvulkan-drivers= -Ddri-drivers= -Dgallium-xvmc=false" configure_args+=" -Dgallium-xa=false -Dgallium-vdpau=false -Dgallium-va=false" From dee2d75b1de2764c418a2b48035b2334a050472d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sat, 11 Apr 2020 17:37:47 -0300 Subject: [PATCH 2/5] xorg-server: enable xorg-server-xwayland for armv6l This is possible due to the VC4 driver being enabled for this arch. This requires changes in all the packages that depend on xorg-server-xwayland, which currently are: * plasma-workspace * sway * gdm --- srcpkgs/xorg-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 0b31bc8324c..4502614eca0 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template file for 'xorg-server' pkgname=xorg-server version=1.20.8 -revision=1 +revision=2 build_style=meson configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb @@ -34,7 +34,7 @@ build_options="elogind" desc_option_elogind="Rootless Xorg support with elogind" case "$XBPS_TARGET_MACHINE" in -i686*|x86_64*|aarch64*|ppc*|armv7l*) +i686*|x86_64*|aarch64*|ppc*|armv[67]l*) # Enable glamor/dri/opengl/xwayland by default. configure_args+=" -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true -Dxwayland=true" replaces+=" glamor-egl>=0" From 347ebe396943af5e006a8c641604b3e2a0710a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sat, 11 Apr 2020 17:45:57 -0300 Subject: [PATCH 3/5] plasma-workspace: update arch check for xorg-server-xwayland --- srcpkgs/plasma-workspace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index b89a4232146..e993bf699ad 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -1,7 +1,7 @@ # Template file for 'plasma-workspace' pkgname=plasma-workspace version=5.18.4.1 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons @@ -23,7 +23,7 @@ checksum=924d8401c3d1fe5d107b6d3facaf96c292f1d4972529831993056982f28b1601 # xorg-server-xwayland only exists for a few archs, see xorg-server/template case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*|aarch64*|ppc*|armv7l*) + i686*|x86_64*|aarch64*|ppc*|armv[67]l*) depends+=" xorg-server-xwayland" ;; esac From 0e372e741a2913deb909df2a90f68827696aa380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sat, 11 Apr 2020 17:46:36 -0300 Subject: [PATCH 4/5] sway: sway: add arch check for xorg-server-xwayland --- srcpkgs/sway/template | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index 964702f3948..e4b7f4898c7 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,14 +1,14 @@ # Template file for 'sway' pkgname=sway version=1.4 -revision=1 +revision=2 build_style=meson conf_files="/etc/sway/config" hostmakedepends="pkg-config wayland-devel scdoc git" makedepends="xcb-util-wm-devel xcb-util-errors-devel wlroots-devel wayland-devel wayland-protocols pcre-devel json-c-devel pango-devel cairo-devel gdk-pixbuf-devel" -depends="swaybg xorg-server-xwayland $(vopt_if elogind elogind)" +depends="swaybg $(vopt_if elogind elogind)" short_desc="Tiling Wayland compositor compatible with i3" maintainer="Juan RP " license="MIT" @@ -19,6 +19,12 @@ checksum=e2805291fc01d49e21dda4b273e38170d1fff4e1757215439729edbed880dfbe build_options="elogind" desc_option_elogind="Uses elogind instead of setuid for privilege escalation" +# xorg-server-xwayland only exists for a few archs, see xorg-server/template +case "$XBPS_TARGET_MACHINE" in + i686*|x86_64*|aarch64*|ppc*|armv[67]l*) + depends+=" xorg-server-xwayland" ;; +esac + post_patch() { vsed -e 's/werror=true/werror=false/g' -i meson.build } From 7b5806c897a8d1a2711bc4fec40c4d1c6dcadc36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sat, 11 Apr 2020 17:47:28 -0300 Subject: [PATCH 5/5] gdm: gdm: add arch check for xorg-server-xwayland --- srcpkgs/gdm/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index bb5b48692d4..1651bec4490 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=3.34.1 -revision=1 +revision=2 build_helper="gir" build_style=gnu-configure configure_args="$(vopt_enable gir introspection) @@ -13,8 +13,7 @@ configure_args="$(vopt_enable gir introspection) hostmakedepends="dconf gettext itstool pkg-config" makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel" -depends="gnome-settings-daemon gnome-shell xorg-server xorg-server-xwayland - xrdb" +depends="gnome-settings-daemon gnome-shell xorg-server xrdb" checkdepends="check-devel" short_desc="GNOME Display Manager" maintainer="Enno Boland " @@ -43,6 +42,11 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends+=" glib-devel pam-devel" fi +case "$XBPS_TARGET_MACHINE" in + i686*|x86_64*|aarch64*|ppc*|armv[67]l*) + depends+=" xorg-server-xwayland" ;; +esac + post_install() { vinstall $FILESDIR/Xsession 755 etc/gdm