Re: [PR PATCH] [Updated] mesa-dri: enable vc4 driver for armv6l

[ericonr <ericonr@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages mesa-vc4-armv6l
https://github.com/void-linux/void-packages/pull/20888

mesa-dri: enable vc4 driver for armv6l
Related to #20861 

A patch file from https://github.com/void-linux/void-packages/pull/20888.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-vc4-armv6l-20888.patch --]
[-- Type: text/x-diff, Size: 6996 bytes --]

From 0ed9d2db02a62d7dd020b84c923d162c30245295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 11 Apr 2020 16:42:10 -0300
Subject: [PATCH 1/4] 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 08029db97f2..fc4550e7686 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=20.0.5
-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 b67f6996595215888a5bdf3d3145a2ff03339c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 11 Apr 2020 17:37:47 -0300
Subject: [PATCH 2/4] xorg-server: enable xorg-server-xwayland for all arches

This commit allows us to remove the arch check in the plasma-workspace
template.
---
 srcpkgs/xorg-server/template | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 0b31bc8324c..0d8a0b4cb30 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,14 +1,15 @@
 # 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
  -Dxkb_output_dir=/var/lib/xkb -Dfont_root_dir=/usr/share/fonts/X11
  -Ddmx=true -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true
  -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false)
- -Dos_vendor=Void"
+ -Dos_vendor=Void -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true
+ -Dxwayland=true"
 hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
@@ -26,26 +27,13 @@ distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
 checksum=d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-24_1 xf86-video-modesetting-1_1"
-replaces="xf86-video-modesetting>=0"
-subpackages="xorg-server-devel xorg-server-xdmx xorg-server-xephyr xorg-server-xnest xorg-server-xvfb"
+replaces="xf86-video-modesetting>=0 glamor-egl>=0"
+subpackages="xorg-server-devel xorg-server-xdmx xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-server-xwayland"
 conf_files="/etc/X11/Xwrapper.config"
 
 build_options="elogind"
 desc_option_elogind="Rootless Xorg support with elogind"
 
-case "$XBPS_TARGET_MACHINE" in
-i686*|x86_64*|aarch64*|ppc*|armv7l*)
-	# Enable glamor/dri/opengl/xwayland by default.
-	configure_args+=" -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true -Dxwayland=true"
-	replaces+=" glamor-egl>=0"
-	subpackages+=" xorg-server-xwayland"
-	;;
-*)
-	# Enable dri2 on !x86 via libdri.
-	configure_args+=" -Dglx=true -Ddri1=false -Ddri2=true -Ddri3=true -Dxwayland=false"
-	;;
-esac
-
 # disable VBE on non-x86 systems
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*) configure_args+=" -Dint10=x86emu -Dvbe=true" ;;

From fada58bee19f1db68786b4ae8ed07a2c5f068f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 11 Apr 2020 17:45:57 -0300
Subject: [PATCH 3/4] plasma-workspace: remove arch check for
 xorg-server-xwayland

---
 srcpkgs/plasma-workspace/template | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index b89a4232146..22d4ee740a2 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
@@ -13,7 +13,7 @@ makedepends="qt5-devel qt5-declarative-devel qt5-script-devel plasma-framework-d
  libqalculate-devel prison-devel kholidays-devel ksolid-devel kpeople-devel
  libkscreen-devel kactivities5-stats-devel"
 depends="kactivitymanagerd kwin iso-codes milou plasma-integration
- kquickcharts qt5-wayland"
+ kquickcharts qt5-wayland xorg-server-xwayland"
 short_desc="KDE Window manager"
 maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
@@ -21,12 +21,6 @@ homepage="https://projects.kde.org/projects/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
 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*)
-		depends+=" xorg-server-xwayland" ;;
-esac
-
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 4f4be6c0a053a640a3f1bf75e22fefe7f3d8d461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 11 Apr 2020 17:46:36 -0300
Subject: [PATCH 4/4] sway: remove xorg-server-xwayland dependency. Claim
 maintainer.

---
 srcpkgs/sway/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 964702f3948..c7f8236861b 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,16 +1,16 @@
 # 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 <xtraeme@gmail.com>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"