git: b3fbc0c3d48c - main - graphics/mesa-devel: unbreak on -CURRENT after GNU qsort_r
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 17 Sep 2022 11:09:46 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b3fbc0c3d48c5e1cc7ac2e87e3ee1f847120bfab
commit b3fbc0c3d48c5e1cc7ac2e87e3ee1f847120bfab
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-09-17 07:47:03 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-09-17 11:09:03 +0000
graphics/mesa-devel: unbreak on -CURRENT after GNU qsort_r
In file included from ../src/util/u_qsort.cpp:24:
../src/util/u_qsort.h:68:4: error: no matching function for call to 'qsort_r'
qsort_r(base, nmemb, size, &data, util_qsort_adapter);
^~~~~~~
/usr/include/stdlib.h:314:7: note: candidate function not viable: no known conversion from 'struct util_qsort_adapter_data *' to 'int (*)(const void *, const void *, void *)' for 4th argument
void qsort_r(void *, size_t, size_t,
^
PR: 266227
Reported by: antoine (via exp-run)
Submitted by: delphij
---
graphics/mesa-devel/Makefile | 1 +
graphics/mesa-devel/distinfo | 2 ++
2 files changed, 3 insertions(+)
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 5e903bfca8c4..9242a7e414c0 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -10,6 +10,7 @@ PATCHFILES+= 50433886a3e3.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-
PATCHFILES+= 4356e7185193.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16987
PATCHFILES+= b2a22acce617.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16987
PATCHFILES+= 19eb2c30bff0.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16987
+PATCHFILES+= 8f1aa7dc16df.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18527
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Bleeding edge Mesa drivers (OpenGL, Vulkan)
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index dec555b16469..45bb1af3cbc0 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -11,3 +11,5 @@ SHA256 (b2a22acce617.patch) = 9ec231cdcec3235164b0c0298d35e65225940878e75d9f972b
SIZE (b2a22acce617.patch) = 2425
SHA256 (19eb2c30bff0.patch) = 238e1031e32bda8fa72bd649df857d775ffe5caec26c1d4428215cf65f564c2b
SIZE (19eb2c30bff0.patch) = 1217
+SHA256 (8f1aa7dc16df.patch) = 8e53f4030197998492b16ff0315db195389bd0e508258f0650dd474f0225e202
+SIZE (8f1aa7dc16df.patch) = 2804