[PR PATCH] mesa: update to 23.1.1. (+ required consul update)

[PR PATCH] mesa: update to 23.1.1. (+ required consul update)

[SpidFightFR]

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

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

https://github.com/SpidFightFR/void-packages update_mesa
https://github.com/void-linux/void-packages/pull/44108

mesa: update to 23.1.1. (+ required consul update)
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


Thanks to Aedinius on the [IRC](https://web.libera.chat/#voidlinux) for helping with this PR !

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

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

From a05ab03b82ccdc0f19dce857de96f1c2ed2d71cc Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 26 May 2023 15:49:26 -0500
Subject: [PATCH] mesa: update to 23.1.1.

---
 srcpkgs/consul/files/consul/run               |  2 +-
 srcpkgs/consul/template                       |  5 +-
 ...e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch | 77 -------------------
 srcpkgs/mesa/template                         | 14 ++--
 4 files changed, 11 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch

diff --git a/srcpkgs/consul/files/consul/run b/srcpkgs/consul/files/consul/run
index ece1efba0ce4..7583a552d939 100644
--- a/srcpkgs/consul/files/consul/run
+++ b/srcpkgs/consul/files/consul/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
 exec 2>&1
-exec consul agent -config-dir=/etc/consul.d
+exec chpst -u _consul:_consul consul agent -config-dir=/etc/consul.d
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index a9796ff5c796..2d032167d2a7 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
@@ -12,6 +12,9 @@ license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=ce5e6666c9bd3ee8dcd60b2ed6e082ab9893fda3c0a2218add649c197f34f2f3
+system_accounts="_consul"
+make_dirs="/etc/consul.d 0755 _consul _consul
+ /var/lib/consul 0750 _consul _consul"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch b/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
deleted file mode 100644
index f56327367526..000000000000
--- a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47 Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Sun, 12 Feb 2023 22:33:30 +0100
-Subject: [PATCH] lima: don't use resource_from_handle while creating scanout
-
-resource_from_handle implementations create an additional reference to
-the scanout resource, which caused lima to leak those resources after
-commit ad4d7ca8332488be8a75aff001f00306a9f6402e.
-
-Do as the other drivers do and import the bo directly while creating
-the scanount resource.
-
-Cc: 22.3 mesa-stable
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8198
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
-Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21330>
----
- src/gallium/drivers/lima/lima_resource.c | 26 ++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/src/gallium/drivers/lima/lima_resource.c b/src/gallium/drivers/lima/lima_resource.c
-index 54869ec03d24..0b7691f2b46f 100644
---- a/src/gallium/drivers/lima/lima_resource.c
-+++ b/src/gallium/drivers/lima/lima_resource.c
-@@ -59,7 +59,10 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    struct lima_screen *screen = lima_screen(pscreen);
-    struct renderonly_scanout *scanout;
-    struct winsys_handle handle;
--   struct pipe_resource *pres;
-+
-+   struct lima_resource *res = CALLOC_STRUCT(lima_resource);
-+   if (!res)
-+      return NULL;
- 
-    struct pipe_resource scanout_templat = *templat;
-    scanout_templat.width0 = width;
-@@ -71,20 +74,31 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    if (!scanout)
-       return NULL;
- 
-+   res->base = *templat;
-+   res->base.screen = pscreen;
-+   pipe_reference_init(&res->base.reference, 1);
-+   res->levels[0].offset = handle.offset;
-+   res->levels[0].stride = handle.stride;
-+
-    assert(handle.type == WINSYS_HANDLE_TYPE_FD);
--   pres = pscreen->resource_from_handle(pscreen, templat, &handle,
--                                        PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
-+   res->bo = lima_bo_import(screen, &handle);
-+   if (!res->bo) {
-+      FREE(res);
-+      return NULL;
-+   }
-+
-+   res->modifier_constant = true;
- 
-    close(handle.handle);
--   if (!pres) {
-+   if (!res->bo) {
-       renderonly_scanout_destroy(scanout, screen->ro);
-+      FREE(res);
-       return NULL;
-    }
- 
--   struct lima_resource *res = lima_resource(pres);
-    res->scanout = scanout;
- 
--   return pres;
-+   return &res->base;
- }
- 
- static uint32_t
--- 
-GitLab
-
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 132263d3599f..04d3a1dfe680 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,13 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.3.5
-revision=2
+version=23.1.1
+revision=1
 build_style=meson
+#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
+ -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
 makedepends="elfutils-devel expat-devel libXdamage-devel
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9
+checksum=a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40
 
 build_options="wayland"
 build_options_default="wayland"
@@ -48,8 +49,6 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 # swrast always present
 _gallium_drivers=" -Dgallium-drivers=swrast"
 _vulkan_drivers=" -Dvulkan-drivers="
-# pre-gallium drivers are mostly for old ati + i915/965
-_dri_drivers=" -Ddri-drivers="
 
 # amd and nvidia drivers on all platforms except where it makes no sense
 # amd implicitly enables clover opencl, also enable hwdec and virgl too
@@ -156,9 +155,8 @@ fi
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
 # _gallium_drivers is not affected by this problem
 _vulkan_drivers=${_vulkan_drivers/=,/=}
-_dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers}"
 
 if [ "$_have_vulkan" ]; then
 	_have_zink=yes

Re: [PR PATCH] [Updated] mesa: update to 23.1.1. (+ required consul update)

[SpidFightFR]

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

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

https://github.com/SpidFightFR/void-packages update_mesa
https://github.com/void-linux/void-packages/pull/44108

mesa: update to 23.1.1. (+ required consul update)
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


Thanks to Aedinius on the [IRC](https://web.libera.chat/#voidlinux) for helping with this PR !

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

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

From a05ab03b82ccdc0f19dce857de96f1c2ed2d71cc Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 26 May 2023 15:49:26 -0500
Subject: [PATCH] mesa: update to 23.1.1.

---
 srcpkgs/consul/files/consul/run               |  2 +-
 srcpkgs/consul/template                       |  5 +-
 ...e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch | 77 -------------------
 srcpkgs/mesa/template                         | 14 ++--
 4 files changed, 11 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch

diff --git a/srcpkgs/consul/files/consul/run b/srcpkgs/consul/files/consul/run
index ece1efba0ce4..7583a552d939 100644
--- a/srcpkgs/consul/files/consul/run
+++ b/srcpkgs/consul/files/consul/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
 exec 2>&1
-exec consul agent -config-dir=/etc/consul.d
+exec chpst -u _consul:_consul consul agent -config-dir=/etc/consul.d
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index a9796ff5c796..2d032167d2a7 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
@@ -12,6 +12,9 @@ license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=ce5e6666c9bd3ee8dcd60b2ed6e082ab9893fda3c0a2218add649c197f34f2f3
+system_accounts="_consul"
+make_dirs="/etc/consul.d 0755 _consul _consul
+ /var/lib/consul 0750 _consul _consul"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch b/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
deleted file mode 100644
index f56327367526..000000000000
--- a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47 Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Sun, 12 Feb 2023 22:33:30 +0100
-Subject: [PATCH] lima: don't use resource_from_handle while creating scanout
-
-resource_from_handle implementations create an additional reference to
-the scanout resource, which caused lima to leak those resources after
-commit ad4d7ca8332488be8a75aff001f00306a9f6402e.
-
-Do as the other drivers do and import the bo directly while creating
-the scanount resource.
-
-Cc: 22.3 mesa-stable
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8198
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
-Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21330>
----
- src/gallium/drivers/lima/lima_resource.c | 26 ++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/src/gallium/drivers/lima/lima_resource.c b/src/gallium/drivers/lima/lima_resource.c
-index 54869ec03d24..0b7691f2b46f 100644
---- a/src/gallium/drivers/lima/lima_resource.c
-+++ b/src/gallium/drivers/lima/lima_resource.c
-@@ -59,7 +59,10 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    struct lima_screen *screen = lima_screen(pscreen);
-    struct renderonly_scanout *scanout;
-    struct winsys_handle handle;
--   struct pipe_resource *pres;
-+
-+   struct lima_resource *res = CALLOC_STRUCT(lima_resource);
-+   if (!res)
-+      return NULL;
- 
-    struct pipe_resource scanout_templat = *templat;
-    scanout_templat.width0 = width;
-@@ -71,20 +74,31 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    if (!scanout)
-       return NULL;
- 
-+   res->base = *templat;
-+   res->base.screen = pscreen;
-+   pipe_reference_init(&res->base.reference, 1);
-+   res->levels[0].offset = handle.offset;
-+   res->levels[0].stride = handle.stride;
-+
-    assert(handle.type == WINSYS_HANDLE_TYPE_FD);
--   pres = pscreen->resource_from_handle(pscreen, templat, &handle,
--                                        PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
-+   res->bo = lima_bo_import(screen, &handle);
-+   if (!res->bo) {
-+      FREE(res);
-+      return NULL;
-+   }
-+
-+   res->modifier_constant = true;
- 
-    close(handle.handle);
--   if (!pres) {
-+   if (!res->bo) {
-       renderonly_scanout_destroy(scanout, screen->ro);
-+      FREE(res);
-       return NULL;
-    }
- 
--   struct lima_resource *res = lima_resource(pres);
-    res->scanout = scanout;
- 
--   return pres;
-+   return &res->base;
- }
- 
- static uint32_t
--- 
-GitLab
-
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 132263d3599f..04d3a1dfe680 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,13 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.3.5
-revision=2
+version=23.1.1
+revision=1
 build_style=meson
+#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
+ -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
 makedepends="elfutils-devel expat-devel libXdamage-devel
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9
+checksum=a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40
 
 build_options="wayland"
 build_options_default="wayland"
@@ -48,8 +49,6 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 # swrast always present
 _gallium_drivers=" -Dgallium-drivers=swrast"
 _vulkan_drivers=" -Dvulkan-drivers="
-# pre-gallium drivers are mostly for old ati + i915/965
-_dri_drivers=" -Ddri-drivers="
 
 # amd and nvidia drivers on all platforms except where it makes no sense
 # amd implicitly enables clover opencl, also enable hwdec and virgl too
@@ -156,9 +155,8 @@ fi
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
 # _gallium_drivers is not affected by this problem
 _vulkan_drivers=${_vulkan_drivers/=,/=}
-_dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers}"
 
 if [ "$_have_vulkan" ]; then
 	_have_zink=yes

Re: mesa: update to 23.1.1. (+ required consul update)

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44108#issuecomment-1565287083

Comment:
@classabbyamp i get an error wit the updated commit of consul:

```
=> ERROR: mesa-23.1.1_1: do-patch_00-patches: 'patch -s ${_args} < "${_patch}" 2> /dev/null' exited with 1
=> ERROR:   in _process_patch() at common/hooks/do-patch/00-patches.sh:34
=> ERROR:   in hook() at common/hooks/do-patch/00-patches.sh:51
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:262
=> ERROR:   in run_step() at common/xbps-src/shutils/common.sh:71
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-dopatch.sh:33
```

Re: mesa: update to 23.1.1. (+ required consul update)

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44108#issuecomment-1565287083

Comment:
@classabbyamp i get an error with the updated commit of consul:

```
=> ERROR: mesa-23.1.1_1: do-patch_00-patches: 'patch -s ${_args} < "${_patch}" 2> /dev/null' exited with 1
=> ERROR:   in _process_patch() at common/hooks/do-patch/00-patches.sh:34
=> ERROR:   in hook() at common/hooks/do-patch/00-patches.sh:51
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:262
=> ERROR:   in run_step() at common/xbps-src/shutils/common.sh:71
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-dopatch.sh:33
```

Re: mesa: update to 23.1.1. (+ required consul update)

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44108#issuecomment-1565289142

Comment:
You probably need to `./xbps-src clean`

Re: mesa: update to 23.1.1. (+ required consul update)

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44108#issuecomment-1565295873

Comment:
Yep, it works, i'm gonna let it build nicely, once that's done, gonna check if there are any mistakes in the template and update the PR. See ya then, and thanks for your help !

Re: [PR PATCH] [Updated] mesa: update to 23.1.1. (+ required consul update)

[SpidFightFR]

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

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

https://github.com/SpidFightFR/void-packages update_mesa
https://github.com/void-linux/void-packages/pull/44108

mesa: update to 23.1.1. (+ required consul update)
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


Thanks to Aedinius on the [IRC](https://web.libera.chat/#voidlinux) for helping with this PR !

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

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

From 6ee2f2d1741d59a43bd187d4e2444946e52df0b3 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 26 May 2023 16:19:37 -0500
Subject: [PATCH] mesa: update to 23.1.1.

---
 srcpkgs/consul/template                       |  4 +-
 ...e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch | 77 -------------------
 srcpkgs/mesa/template                         | 14 ++--
 3 files changed, 8 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 2d032167d2a7..7fbe8549d11b 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
@@ -13,7 +13,7 @@ homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=ce5e6666c9bd3ee8dcd60b2ed6e082ab9893fda3c0a2218add649c197f34f2f3
 system_accounts="_consul"
-make_dirs="/etc/consul.d 0755 _consul _consul
+make_dirs="/etc/consul.d 0755 root _consul
  /var/lib/consul 0750 _consul _consul"
 
 post_install() {
diff --git a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch b/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
deleted file mode 100644
index f56327367526..000000000000
--- a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47 Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Sun, 12 Feb 2023 22:33:30 +0100
-Subject: [PATCH] lima: don't use resource_from_handle while creating scanout
-
-resource_from_handle implementations create an additional reference to
-the scanout resource, which caused lima to leak those resources after
-commit ad4d7ca8332488be8a75aff001f00306a9f6402e.
-
-Do as the other drivers do and import the bo directly while creating
-the scanount resource.
-
-Cc: 22.3 mesa-stable
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8198
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
-Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21330>
----
- src/gallium/drivers/lima/lima_resource.c | 26 ++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/src/gallium/drivers/lima/lima_resource.c b/src/gallium/drivers/lima/lima_resource.c
-index 54869ec03d24..0b7691f2b46f 100644
---- a/src/gallium/drivers/lima/lima_resource.c
-+++ b/src/gallium/drivers/lima/lima_resource.c
-@@ -59,7 +59,10 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    struct lima_screen *screen = lima_screen(pscreen);
-    struct renderonly_scanout *scanout;
-    struct winsys_handle handle;
--   struct pipe_resource *pres;
-+
-+   struct lima_resource *res = CALLOC_STRUCT(lima_resource);
-+   if (!res)
-+      return NULL;
- 
-    struct pipe_resource scanout_templat = *templat;
-    scanout_templat.width0 = width;
-@@ -71,20 +74,31 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    if (!scanout)
-       return NULL;
- 
-+   res->base = *templat;
-+   res->base.screen = pscreen;
-+   pipe_reference_init(&res->base.reference, 1);
-+   res->levels[0].offset = handle.offset;
-+   res->levels[0].stride = handle.stride;
-+
-    assert(handle.type == WINSYS_HANDLE_TYPE_FD);
--   pres = pscreen->resource_from_handle(pscreen, templat, &handle,
--                                        PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
-+   res->bo = lima_bo_import(screen, &handle);
-+   if (!res->bo) {
-+      FREE(res);
-+      return NULL;
-+   }
-+
-+   res->modifier_constant = true;
- 
-    close(handle.handle);
--   if (!pres) {
-+   if (!res->bo) {
-       renderonly_scanout_destroy(scanout, screen->ro);
-+      FREE(res);
-       return NULL;
-    }
- 
--   struct lima_resource *res = lima_resource(pres);
-    res->scanout = scanout;
- 
--   return pres;
-+   return &res->base;
- }
- 
- static uint32_t
--- 
-GitLab
-
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 132263d3599f..04d3a1dfe680 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,13 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.3.5
-revision=2
+version=23.1.1
+revision=1
 build_style=meson
+#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
+ -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
 makedepends="elfutils-devel expat-devel libXdamage-devel
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9
+checksum=a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40
 
 build_options="wayland"
 build_options_default="wayland"
@@ -48,8 +49,6 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 # swrast always present
 _gallium_drivers=" -Dgallium-drivers=swrast"
 _vulkan_drivers=" -Dvulkan-drivers="
-# pre-gallium drivers are mostly for old ati + i915/965
-_dri_drivers=" -Ddri-drivers="
 
 # amd and nvidia drivers on all platforms except where it makes no sense
 # amd implicitly enables clover opencl, also enable hwdec and virgl too
@@ -156,9 +155,8 @@ fi
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
 # _gallium_drivers is not affected by this problem
 _vulkan_drivers=${_vulkan_drivers/=,/=}
-_dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers}"
 
 if [ "$_have_vulkan" ]; then
 	_have_zink=yes

Re: mesa: update to 23.1.1. (+ required consul update)

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44108#issuecomment-1565309353

Comment:
Okay so this update of my branch says "3 files changed", probably because i firstly changed consul, but in reality i pulled the latest commits from the void repos and added back my changes with mesa. It should be okay, but please keep me in touch.

Re: mesa: update to 23.1.1.

[abenson]

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/44108#issuecomment-1565429176

Comment:
Something went wrong with your commit... It shows the wrong author.

Re: mesa: update to 23.1.1.

[abenson]

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/44108#issuecomment-1565429176

Comment:
Something went wrong with your commit... It shows the wrong author.

Follow @classabbyamp's recommendation, run `git pull --rebase` and then `git commit --amend --reset-author`.

Re: [PR PATCH] [Updated] mesa: update to 23.1.1.

[SpidFightFR]

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

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

https://github.com/SpidFightFR/void-packages update_mesa
https://github.com/void-linux/void-packages/pull/44108

mesa: update to 23.1.1.
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


Thanks to Aedinius on the [IRC](https://web.libera.chat/#voidlinux) for helping with this PR !

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

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

From dbfac53f4ee10f3b3f93add96b2effc5214b421e Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Sat, 27 May 2023 15:09:43 +0000
Subject: [PATCH] mesa: update to 23.1.1.

---
 srcpkgs/consul/template                       |  4 +-
 ...e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch | 77 -------------------
 srcpkgs/mesa/template                         | 14 ++--
 3 files changed, 8 insertions(+), 87 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 2d032167d2a7..7fbe8549d11b 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
@@ -13,7 +13,7 @@ homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=ce5e6666c9bd3ee8dcd60b2ed6e082ab9893fda3c0a2218add649c197f34f2f3
 system_accounts="_consul"
-make_dirs="/etc/consul.d 0755 _consul _consul
+make_dirs="/etc/consul.d 0755 root _consul
  /var/lib/consul 0750 _consul _consul"
 
 post_install() {
diff --git a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch b/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
deleted file mode 100644
index f56327367526..000000000000
--- a/srcpkgs/mesa/patches/c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c426e5677f36c3b0b8e8ea199ed4f2c7fad06d47 Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Sun, 12 Feb 2023 22:33:30 +0100
-Subject: [PATCH] lima: don't use resource_from_handle while creating scanout
-
-resource_from_handle implementations create an additional reference to
-the scanout resource, which caused lima to leak those resources after
-commit ad4d7ca8332488be8a75aff001f00306a9f6402e.
-
-Do as the other drivers do and import the bo directly while creating
-the scanount resource.
-
-Cc: 22.3 mesa-stable
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8198
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
-Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21330>
----
- src/gallium/drivers/lima/lima_resource.c | 26 ++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/src/gallium/drivers/lima/lima_resource.c b/src/gallium/drivers/lima/lima_resource.c
-index 54869ec03d24..0b7691f2b46f 100644
---- a/src/gallium/drivers/lima/lima_resource.c
-+++ b/src/gallium/drivers/lima/lima_resource.c
-@@ -59,7 +59,10 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    struct lima_screen *screen = lima_screen(pscreen);
-    struct renderonly_scanout *scanout;
-    struct winsys_handle handle;
--   struct pipe_resource *pres;
-+
-+   struct lima_resource *res = CALLOC_STRUCT(lima_resource);
-+   if (!res)
-+      return NULL;
- 
-    struct pipe_resource scanout_templat = *templat;
-    scanout_templat.width0 = width;
-@@ -71,20 +74,31 @@ lima_resource_create_scanout(struct pipe_screen *pscreen,
-    if (!scanout)
-       return NULL;
- 
-+   res->base = *templat;
-+   res->base.screen = pscreen;
-+   pipe_reference_init(&res->base.reference, 1);
-+   res->levels[0].offset = handle.offset;
-+   res->levels[0].stride = handle.stride;
-+
-    assert(handle.type == WINSYS_HANDLE_TYPE_FD);
--   pres = pscreen->resource_from_handle(pscreen, templat, &handle,
--                                        PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
-+   res->bo = lima_bo_import(screen, &handle);
-+   if (!res->bo) {
-+      FREE(res);
-+      return NULL;
-+   }
-+
-+   res->modifier_constant = true;
- 
-    close(handle.handle);
--   if (!pres) {
-+   if (!res->bo) {
-       renderonly_scanout_destroy(scanout, screen->ro);
-+      FREE(res);
-       return NULL;
-    }
- 
--   struct lima_resource *res = lima_resource(pres);
-    res->scanout = scanout;
- 
--   return pres;
-+   return &res->base;
- }
- 
- static uint32_t
--- 
-GitLab
-
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 132263d3599f..04d3a1dfe680 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,13 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=22.3.5
-revision=2
+version=23.1.1
+revision=1
 build_style=meson
+#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
- -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
+ -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
 makedepends="elfutils-devel expat-devel libXdamage-devel
@@ -22,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9
+checksum=a2679031ed5b73b29c4f042ac64d96f83b0cfe4858617de32e2efc196c653a40
 
 build_options="wayland"
 build_options_default="wayland"
@@ -48,8 +49,6 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 # swrast always present
 _gallium_drivers=" -Dgallium-drivers=swrast"
 _vulkan_drivers=" -Dvulkan-drivers="
-# pre-gallium drivers are mostly for old ati + i915/965
-_dri_drivers=" -Ddri-drivers="
 
 # amd and nvidia drivers on all platforms except where it makes no sense
 # amd implicitly enables clover opencl, also enable hwdec and virgl too
@@ -156,9 +155,8 @@ fi
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
 # _gallium_drivers is not affected by this problem
 _vulkan_drivers=${_vulkan_drivers/=,/=}
-_dri_drivers=${_dri_drivers/=,/=}
 
-configure_args+=" ${_vulkan_drivers} ${_dri_drivers}"
+configure_args+=" ${_vulkan_drivers}"
 
 if [ "$_have_vulkan" ]; then
 	_have_zink=yes

Re: mesa: update to 23.1.1.

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44108#issuecomment-1565492985

Comment:
> Something went wrong with your commit... It shows the wrong author.
> 
> Follow @classabbyamp's recommendation, run `git pull --rebase` and then `git commit --amend --reset-author`.

okay i ran both of the commands, i hope this time it will be good !

Re: mesa: update to 23.1.1.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44108#issuecomment-1567325790

Comment:
There are still changes to the consul template included here that shouldn't be

Re: [PR PATCH] [Closed]: mesa: update to 23.1.1.

[SpidFightFR]

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

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

mesa: update to 23.1.1.
https://github.com/void-linux/void-packages/pull/44108

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


Thanks to Aedinius on the [IRC](https://web.libera.chat/#voidlinux) for helping with this PR !

Re: [PR PATCH] [Updated] mesa: update to 23.1.1.

[SpidFightFR]

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

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

https://github.com/SpidFightFR/void-packages update_mesa
https://github.com/void-linux/void-packages/pull/44108

mesa: update to 23.1.1.
#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


Thanks to Aedinius on the [IRC](https://web.libera.chat/#voidlinux) for helping with this PR !

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

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

Re: mesa: update to 23.1.1.

[JamiKettunen]

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

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/44138#issuecomment-1569289563

Comment:
There was no need to make a new PR replacing #44108 as you can always just amend/force-push to update the state of the branch; I guess this also supersedes #42407.

Anyway this definitely should be tested on `musl` with a modern AMD GPU as on Chimera Linux my RX 6600 was having some heavy artifacts on Wayland GNOME with 23.1.x while rebuilding 23.0.3 got rid of it, I'll start bisecting this and may be able to supply a patch or something later as needed.

**EDIT:** https://gitlab.freedesktop.org/mesa/mesa/-/commit/796af8e7 applies on top of 23.1.x and fixes the issue above, and as of late also https://github.com/chimera-linux/cports/pull/185/commits/dc86a690 does

Re: mesa: update to 23.1.1.

[HadetTheUndying]

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

New comment by HadetTheUndying on void-packages repository

https://github.com/void-linux/void-packages/pull/44138#issuecomment-1583473928

Comment:
`mesa-23.1.2` is out today as well.

Re: mesa: update to 23.1.1.

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44138#issuecomment-1581290800

Comment:
Any news with that PR ?

Re: mesa: update to 23.1.1.

[JamiKettunen]

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

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/44138#issuecomment-1569289563

Comment:
There was no need to make a new PR replacing #44108 as you can always just amend/force-push to update the state of the branch; I guess this also supersedes #42407.

Anyway this definitely should be tested on `musl` with a modern AMD GPU as on Chimera Linux my RX 6600 was having some heavy artifacts on 23.1.x while rebuilding 23.0.3 got rid of it, I'll start bisecting this and may be able to supply a patch or something later as needed.

**EDIT:** https://gitlab.freedesktop.org/mesa/mesa/-/commit/796af8e7 applies on top of 23.1.x and fixes the issue above

Re: mesa: update to 23.1.1.

[SpidFightFR]

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

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44138#issuecomment-1570161826

Comment:
@JamiKettunen Ngl i made this PR because i remade the whole git commit from the ground up, as i made a ton of mistakes previously.

Anyway, now everything works as intended !

And i made the original PR cuz i have a RX 7900 XTX and there are quite huge issues with xorg on mesa 22...

Re: mesa: update to 23.1.1.

[JamiKettunen]

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

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/44138#issuecomment-1569289563

Comment:
There was no need to make a new PR replacing #44108 as you can always just amend/force-push to update the state of the branch; I guess this also supersedes #42407.

Anyway this definitely should be tested on `musl` with a modern AMD GPU as on Chimera Linux my RX 6600 was having some heavy artifacts on 23.1.x while rebuilding 23.0.3 got rid of it, I'll start bisecting this and may be able to supply a patch or something later as needed.