Github messages for voidlinux
 help / color / mirror / Atom feed
From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] mesa: update to 20.3.1.
Date: Sun, 20 Dec 2020 04:37:03 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27291@inbox.vuxu.org> (raw)

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

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages mesa
https://github.com/void-linux/void-packages/pull/27291

mesa: update to 20.3.1.
- removed drm and surfaceless from platforms since they're determined
automatically now.
- fix driver search path to use /usr/lib${wordsize}; see
https://github.com/void-linux/void-packages/pull/27269
- remove transitional dummy packages that only depend on mesa-dri

Closes: #27214 [via git-merge-pr]

I'm not sure if the issue here https://gitlab.freedesktop.org/mesa/mesa/-/issues/3989 matters for us.

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

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

From ae3026fc521c41f37fb8486247f5dcc967bb002e Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Wed, 16 Dec 2020 20:55:08 -0600
Subject: [PATCH] mesa: update to 20.3.1.

- removed drm and surfaceless from platforms since they're determined
automatically now.
- fix driver search path to use /usr/lib${wordsize}; see
https://github.com/void-linux/void-packages/pull/27269
- remove transitional dummy packages that only depend on mesa-dri

Closes: #27214 [via git-merge-pr]
---
 srcpkgs/mesa-etnaviv-dri   |  1 -
 srcpkgs/mesa-freedreno-dri |  1 -
 srcpkgs/mesa-kmsro-dri     |  1 -
 srcpkgs/mesa-lima-dri      |  1 -
 srcpkgs/mesa-panfrost-dri  |  1 -
 srcpkgs/mesa-tegra-dri     |  1 -
 srcpkgs/mesa-v3d-dri       |  1 -
 srcpkgs/mesa-vc4-dri       |  1 -
 srcpkgs/mesa-vmwgfx-dri    |  1 -
 srcpkgs/mesa/template      | 87 ++++++--------------------------------
 10 files changed, 13 insertions(+), 83 deletions(-)
 delete mode 120000 srcpkgs/mesa-etnaviv-dri
 delete mode 120000 srcpkgs/mesa-freedreno-dri
 delete mode 120000 srcpkgs/mesa-kmsro-dri
 delete mode 120000 srcpkgs/mesa-lima-dri
 delete mode 120000 srcpkgs/mesa-panfrost-dri
 delete mode 120000 srcpkgs/mesa-tegra-dri
 delete mode 120000 srcpkgs/mesa-v3d-dri
 delete mode 120000 srcpkgs/mesa-vc4-dri
 delete mode 120000 srcpkgs/mesa-vmwgfx-dri

diff --git a/srcpkgs/mesa-etnaviv-dri b/srcpkgs/mesa-etnaviv-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-etnaviv-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-freedreno-dri b/srcpkgs/mesa-freedreno-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-freedreno-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-kmsro-dri b/srcpkgs/mesa-kmsro-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-kmsro-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-lima-dri b/srcpkgs/mesa-lima-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-lima-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-panfrost-dri b/srcpkgs/mesa-panfrost-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-panfrost-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-tegra-dri b/srcpkgs/mesa-tegra-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-tegra-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-v3d-dri b/srcpkgs/mesa-v3d-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-v3d-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-vc4-dri b/srcpkgs/mesa-vc4-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-vc4-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-vmwgfx-dri b/srcpkgs/mesa-vmwgfx-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-vmwgfx-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 5bc5a611f38..da8aa2c1134 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,19 +1,20 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=20.2.3
+version=20.3.1
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
  -Dosmesa=gallium -Dgles1=true -Dgles2=true -Dglx=dri -Ddri3=true
- -Dlmsensors=true -Dplatforms=x11,drm,$(vopt_if wayland wayland,)surfaceless
- -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14"
+ -Dlmsensors=true -Dplatforms=x11$(vopt_if wayland ',wayland')
+ -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14
+ -Ddri-drivers-path=/usr/lib${XBPS_TARGET_WORDSIZE}"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang gzip
- $(vopt_if wayland 'wayland-protocols wayland-devel')"
+ wayland-protocols wayland-devel"
 makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
  libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
+ wayland-devel wayland-protocols llvm libsensors-devel
  libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
  libarchive-devel"
 depends="libglvnd"
@@ -23,10 +24,11 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=ae1b240e11531df528d14dc214d2dc4d2b4f2e835c6230ba0b492b171eceb82b
+checksum=af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f
+provides="mesa-etnaviv-dri>=0 mesa-freedreno-dri>=0 mesa-kmsro-dri>=0
+ mesa-lima-dri>=0 mesa-panfrost-dri>=0 mesa-tegra-dri>=0 mesa-v3d-dri>=0
+ mesa-vc4-dri>=0 mesa-vmwgfx-dri>=0"
 
-build_options="wayland"
-build_options_default="wayland"
 
 # Set subpackages manually to set proper rdeps in 32bit pkgs.
 subpackages="libglapi libgbm libOSMesa"
@@ -337,89 +339,26 @@ mesa-vulkan-overlay-layer_package() {
 mesa-ati-dri_package() {
 	build_style=meta
 	lib32mode=full
-	short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
+	short_desc="Mesa DRI drivers for ATI GPUs"
 	depends="mesa-dri mesa-vulkan-radeon"
 	if [ "$_have_hwdec" ]; then
 		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
 	fi
 }
 
-mesa-etnaviv-dri_package() {
-	build_style=meta
-	lib32mode=full
-	short_desc="Mesa DRI drivers for Vivante GPUs (transitional dummy package)"
-	depends="mesa-dri"
-}
-
-mesa-freedreno-dri_package() {
-	build_style=meta
-	lib32mode=full
-	short_desc="Mesa DRI drivers for Adreno GPUs (transitional dummy package)"
-	depends="mesa-dri"
-}
-
 mesa-intel-dri_package() {
 	build_style=meta
 	lib32mode=full
-	short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)"
+	short_desc="Mesa DRI drivers for Intel GPUs"
 	depends="mesa-dri mesa-vulkan-intel"
 }
 
-mesa-kmsro-dri_package() {
-	build_style=meta
-	lib32mode=full
-	short_desc="KMS Render-only Mesa DRI drivers (transitional dummy package)"
-	depends="mesa-dri"
-}
-
-mesa-lima-dri_package() {
-	build_style=meta
-	lib32mode=full
-	short_desc="Mesa DRI drivers for Mali GPUs (Utgard) (transitional dummy package)"
-	depends="mesa-dri"
-}
-
 mesa-nouveau-dri_package() {
 	build_style=meta
 	lib32mode=full
-	short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
+	short_desc="Mesa DRI drivers for NVIDIA GPUs"
 	depends="mesa-dri"
 	if [ "$_have_hwdec" ]; then
 		depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
 	fi
 }
-
-mesa-panfrost-dri_package() {
-	build_style=meta
-	lib32mode=full
-	short_desc="Mesa DRI drivers for Mali GPUs (Midgard/Bifrost) (dummy package)"
-	depends="mesa-dri"
-}
-
-mesa-tegra-dri_package() {
-	build_style=meta
-	lib32mode=full
-	short_desc="Mesa DRI drivers for Tegra GPU (transitional dummy package)"
-	depends="mesa-dri"
-}
-
-mesa-v3d-dri_package() {
-	build_style=meta
-	lib32mode=full
-	short_desc="Mesa DRI drivers for Videocore VI GPU (transitional dummy package)"
-	depends="mesa-dri"
-}
-
-mesa-vmwgfx-dri_package() {
-	build_style=meta
-	lib32mode=full
-	short_desc="Mesa DRI drivers for VMware (transitional dummy package)"
-	depends="mesa-dri"
-}
-
-mesa-vc4-dri_package() {
-	build_style=meta
-	lib32mode=full
-	short_desc="Mesa DRI drivers for Videocore IV GPU (transitional dummy package)"
-	depends="mesa-dri"
-}

             reply	other threads:[~2020-12-20  3:37 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-20  3:37 ericonr [this message]
2020-12-20  3:57 ` [PR PATCH] [Updated] " ericonr
2020-12-20 11:45 ` [PR REVIEW] " st3r4g
2020-12-20 12:08 ` st3r4g
2020-12-20 13:18 ` st3r4g
2020-12-20 13:19 ` st3r4g
2020-12-20 14:44 ` ericonr
2020-12-20 14:52 ` st3r4g
2020-12-20 16:33 ` st3r4g
2020-12-20 16:38 ` st3r4g
2020-12-20 16:42 ` st3r4g
2020-12-20 23:01 ` q66
2020-12-20 23:24 ` st3r4g
2020-12-20 23:36 ` q66
2020-12-20 23:37 ` q66
2020-12-21  2:27 ` [PR PATCH] [Updated] " ericonr
2020-12-21  2:29 ` [PR REVIEW] " ericonr
2020-12-21 12:35 ` ericonr
2020-12-21 14:52 ` st3r4g
2020-12-21 14:53 ` st3r4g
2020-12-21 14:56 ` st3r4g
2020-12-21 14:57 ` ericonr
2020-12-21 15:01 ` st3r4g
2020-12-21 15:02 ` st3r4g
2020-12-21 17:48 ` [PR REVIEW] " q66
2020-12-21 17:50 ` q66
2020-12-21 17:50 ` q66
2020-12-21 17:57 ` [PR REVIEW] " ericonr
2020-12-22  4:39 ` [PR PATCH] [Updated] " ericonr
2020-12-22  5:25 ` ericonr
2020-12-22  5:25 ` ericonr
2020-12-22 21:50 ` [PR PATCH] [Updated] " ericonr
2020-12-22 23:44 ` st3r4g
  -- strict thread matches above, loose matches on Subject: below --
2020-12-17  2:57 [PR PATCH] " HadetTheUndying

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27291@inbox.vuxu.org \
    --to=ericonr@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).