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

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] mesa-dri: enable vc4 driver for armv6l
@ 2020-04-11 19:43 ericonr
  2020-04-11 19:48 ` xtraeme
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: ericonr @ 2020-04-11 19:43 UTC (permalink / raw)
  To: ml

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

There is a new 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: 893 bytes --]

From f2379e84e7c3f38e78b8f881e01289a0c60c553e 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] mesa-dri: enable vc4 driver for armv6l

---
 srcpkgs/mesa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 508cb8d6684..06a667c5c6b 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -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"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
@ 2020-04-11 19:48 ` xtraeme
  2020-04-11 20:12 ` [PR PATCH] [Updated] " ericonr
                   ` (15 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: xtraeme @ 2020-04-11 19:48 UTC (permalink / raw)
  To: ml

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/20888#issuecomment-612500470

Comment:
missing revbump

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
  2020-04-11 19:48 ` xtraeme
@ 2020-04-11 20:12 ` ericonr
  2020-04-11 20:24 ` ericonr
                   ` (14 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-11 20:12 UTC (permalink / raw)
  To: ml

[-- 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: 1112 bytes --]

From 54e4756c5e09a29cfb8e8814c2055bacb97b9895 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] 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"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
  2020-04-11 19:48 ` xtraeme
  2020-04-11 20:12 ` [PR PATCH] [Updated] " ericonr
@ 2020-04-11 20:24 ` ericonr
  2020-04-11 20:24 ` ericonr
                   ` (13 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-11 20:24 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/20888#issuecomment-612506615

Comment:
@xtraeme fixed! Given that xwayland wasn't built for armv6l because of the lack of VC4 driver (at least that's what 85e2e69d439 seems to indicate), can I add it to the xorg-server template and include the commit in this PR?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (2 preceding siblings ...)
  2020-04-11 20:24 ` ericonr
@ 2020-04-11 20:24 ` ericonr
  2020-04-11 20:25 ` xtraeme
                   ` (12 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-11 20:24 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/20888#issuecomment-612506615

Comment:
@xtraeme fixed! Given that xwayland wasn't built for armv6l because of the lack of VC4 driver (at least that's what 85e2e69d439 seems to indicate), can I add it to the xorg-server template and include the commit in this PR? In the present situation this would also require updating the plasma-workspace and sway packages.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (3 preceding siblings ...)
  2020-04-11 20:24 ` ericonr
@ 2020-04-11 20:25 ` xtraeme
  2020-04-11 20:40 ` ericonr
                   ` (11 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: xtraeme @ 2020-04-11 20:25 UTC (permalink / raw)
  To: ml

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/20888#issuecomment-612506880

Comment:
Sure

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (4 preceding siblings ...)
  2020-04-11 20:25 ` xtraeme
@ 2020-04-11 20:40 ` ericonr
  2020-04-11 20:50 ` xtraeme
                   ` (10 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-11 20:40 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/20888#issuecomment-612509308

Comment:
Given that I'd be enabling a new package to be built, it shouldn't require a revbump, right?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (5 preceding siblings ...)
  2020-04-11 20:40 ` ericonr
@ 2020-04-11 20:50 ` xtraeme
  2020-04-11 20:53 ` [PR PATCH] [Updated] " ericonr
                   ` (9 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: xtraeme @ 2020-04-11 20:50 UTC (permalink / raw)
  To: ml

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/20888#issuecomment-612510961

Comment:
you are wrong, it's the opposite! you need to revbump when the binpkgs change somehow.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (6 preceding siblings ...)
  2020-04-11 20:50 ` xtraeme
@ 2020-04-11 20:53 ` ericonr
  2020-04-11 20:55 ` ericonr
                   ` (8 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-11 20:53 UTC (permalink / raw)
  To: ml

[-- 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: 6408 bytes --]

From 54e4756c5e09a29cfb8e8814c2055bacb97b9895 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/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 9983ad0e3c205167e8cde98169fd075c8d0e235e 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/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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 0b31bc8324c..cbabe158fe6 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -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 a6a552582a10dfb0270a2af76f5ca254c395f0df 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/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 3c85d80b003cdb0bdb5cad8e8d32e5bc70210a17 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/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 <xtraeme@gmail.com>"
 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 074de24e433ef260553581044ae655f0633a47ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
@@ -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
 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (7 preceding siblings ...)
  2020-04-11 20:53 ` [PR PATCH] [Updated] " ericonr
@ 2020-04-11 20:55 ` ericonr
  2020-04-11 20:56 ` ericonr
                   ` (7 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-11 20:55 UTC (permalink / raw)
  To: ml

[-- 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: 6678 bytes --]

From 54e4756c5e09a29cfb8e8814c2055bacb97b9895 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/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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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 <xtraeme@gmail.com>"
 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?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
@@ -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
 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (8 preceding siblings ...)
  2020-04-11 20:55 ` ericonr
@ 2020-04-11 20:56 ` ericonr
  2020-04-18  5:49 ` [PR PATCH] [Updated] " ericonr
                   ` (6 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-11 20:56 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/20888#issuecomment-612512008

Comment:
@xtraeme updated all the necessary packages and added the arch checks. I don't know if there's anywhere I could fit this snippet to avoid duplication, but if there is, it would probably be a good idea. Also added revbumps for everybody, I think.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (9 preceding siblings ...)
  2020-04-11 20:56 ` ericonr
@ 2020-04-18  5:49 ` ericonr
  2020-04-26 20:50 ` ericonr
                   ` (5 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-18  5:49 UTC (permalink / raw)
  To: ml

[-- 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: 6757 bytes --]

From 8d0be003a67764dd6ab71daf3819035bb298912f 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/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 f33020f9583ee0478641192ad1d1a1c69136157a 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/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 833ac726c1a66f23732acdbf8d32c45208d36440 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/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 e13abc20a55837921e95b60ab7f0fc881596ad69 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/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 <xtraeme@gmail.com>"
 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 7eab434e9c51ef79796ac3931438da9f7cac82f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index bb5b48692d4..1f95f92bc92 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 <gottox@voidlinux.org>"
@@ -43,6 +42,12 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel pam-devel"
 fi
 
+# 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_install() {
 	vinstall $FILESDIR/Xsession 755 etc/gdm
 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (10 preceding siblings ...)
  2020-04-18  5:49 ` [PR PATCH] [Updated] " ericonr
@ 2020-04-26 20:50 ` ericonr
  2020-04-26 21:11 ` ericonr
                   ` (4 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-26 20:50 UTC (permalink / raw)
  To: ml

[-- 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: 6757 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/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 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 307c2265166322f1042bd7b6dec325c4aa44dc6f 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/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 c518a131cc8fb346b60ffb1d41db955f7bb3f14b 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/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 6f3b055b05e0ae564b6e8944848a53eea011f6b5 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/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 <xtraeme@gmail.com>"
 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 cc675506cb6c7110740b6cb89b3190209cbf7394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index bb5b48692d4..1f95f92bc92 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 <gottox@voidlinux.org>"
@@ -43,6 +42,12 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel pam-devel"
 fi
 
+# 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_install() {
 	vinstall $FILESDIR/Xsession 755 etc/gdm
 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (11 preceding siblings ...)
  2020-04-26 20:50 ` ericonr
@ 2020-04-26 21:11 ` ericonr
  2020-04-26 21:21 ` q66
                   ` (3 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-26 21:11 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/20888#issuecomment-619625459

Comment:
@q66 could you take a look at this PR, please? I rebased it and I think it's as close to ready as it can be, unless we can determine for sure that we can remove the `xorg-server-xwayland` check.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (12 preceding siblings ...)
  2020-04-26 21:11 ` ericonr
@ 2020-04-26 21:21 ` q66
  2020-04-26 21:47 ` [PR PATCH] [Updated] " ericonr
                   ` (2 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: q66 @ 2020-04-26 21:21 UTC (permalink / raw)
  To: ml

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/20888#issuecomment-619626899

Comment:
let's drop the xwayland check, and enable xwayland in xorg everywhere, how about that?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (13 preceding siblings ...)
  2020-04-26 21:21 ` q66
@ 2020-04-26 21:47 ` ericonr
  2020-04-26 21:55 ` ericonr
  2020-04-26 21:59 ` [PR PATCH] [Merged]: " q66
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-26 21:47 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (14 preceding siblings ...)
  2020-04-26 21:47 ` [PR PATCH] [Updated] " ericonr
@ 2020-04-26 21:55 ` ericonr
  2020-04-26 21:59 ` [PR PATCH] [Merged]: " q66
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2020-04-26 21:55 UTC (permalink / raw)
  To: ml

[-- 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: 7157 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 010a869c057d50f666a96698bec68adb6f101fac 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 | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 0b31bc8324c..de2eefdb851 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
@@ -25,27 +26,16 @@ homepage="https://xorg.freedesktop.org"
 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"
+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 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 1acc7dbe3d87e2dc6faabfdab3f00a986adf754e 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 65b18f28c9912ab03cb05c011af9109663db41ff 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"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Merged]: mesa-dri: enable vc4 driver for armv6l
  2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
                   ` (15 preceding siblings ...)
  2020-04-26 21:55 ` ericonr
@ 2020-04-26 21:59 ` q66
  16 siblings, 0 replies; 18+ messages in thread
From: q66 @ 2020-04-26 21:59 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

mesa-dri: enable vc4 driver for armv6l
https://github.com/void-linux/void-packages/pull/20888

Description:
Related to #20861 

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2020-04-26 21:59 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-11 19:43 [PR PATCH] mesa-dri: enable vc4 driver for armv6l ericonr
2020-04-11 19:48 ` xtraeme
2020-04-11 20:12 ` [PR PATCH] [Updated] " ericonr
2020-04-11 20:24 ` ericonr
2020-04-11 20:24 ` ericonr
2020-04-11 20:25 ` xtraeme
2020-04-11 20:40 ` ericonr
2020-04-11 20:50 ` xtraeme
2020-04-11 20:53 ` [PR PATCH] [Updated] " ericonr
2020-04-11 20:55 ` ericonr
2020-04-11 20:56 ` ericonr
2020-04-18  5:49 ` [PR PATCH] [Updated] " ericonr
2020-04-26 20:50 ` ericonr
2020-04-26 21:11 ` ericonr
2020-04-26 21:21 ` q66
2020-04-26 21:47 ` [PR PATCH] [Updated] " ericonr
2020-04-26 21:55 ` ericonr
2020-04-26 21:59 ` [PR PATCH] [Merged]: " q66

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).