summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/mesa/APKBUILD8
-rw-r--r--user/mesa/nouveau-flush-fix.patch11
2 files changed, 16 insertions, 3 deletions
diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD
index f04943365..d5f828129 100644
--- a/user/mesa/APKBUILD
+++ b/user/mesa/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=mesa
-pkgver=21.3.8
+pkgver=21.3.9
_llvmver=14
pkgrel=0
pkgdesc="Mesa DRI OpenGL library"
@@ -25,6 +25,7 @@ source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
big-endian-flipping.patch
musl-fixes.patch
no-tls.patch
+ nouveau-flush-fix.patch
"
_dri_driverdir=/usr/lib/xorg/modules/dri
@@ -151,7 +152,8 @@ dri() {
mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/
}
-sha512sums="0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9 mesa-21.3.8.tar.xz
+sha512sums="4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684 mesa-21.3.9.tar.xz
3417e5c6d7ec564178e1d72431042b0a6ba659321f13a3dda81eda5fa0f2c8bc7c6972cb8266aea84ab05976ffb161659e9988c50ecc418e8bc1e1ce8f93a65f big-endian-flipping.patch
9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch
-076bb17d85235f3c833af8f1641f3556e406ad187b7ae1ebacced5f57b8832243a878678de4e50880c9a50b2aae3c42ad2342ed8c3e18d881edb7dd5018a710e no-tls.patch"
+076bb17d85235f3c833af8f1641f3556e406ad187b7ae1ebacced5f57b8832243a878678de4e50880c9a50b2aae3c42ad2342ed8c3e18d881edb7dd5018a710e no-tls.patch
+7283dc0e86e1ddaf4590008db57dd591921f47928945782afaa283f3b87770c731bab19d3d8879b4bf8b785f8886b9b46c576ca735296123f8afff29655abaeb nouveau-flush-fix.patch"
diff --git a/user/mesa/nouveau-flush-fix.patch b/user/mesa/nouveau-flush-fix.patch
new file mode 100644
index 000000000..97512d01a
--- /dev/null
+++ b/user/mesa/nouveau-flush-fix.patch
@@ -0,0 +1,11 @@
+--- mesa-21.3.8/src/mesa/drivers/dri/nouveau/nouveau_driver.c.old 2022-03-18 19:26:47.000000000 +0000
++++ mesa-21.3.8/src/mesa/drivers/dri/nouveau/nouveau_driver.c 2023-10-23 06:05:10.177357372 +0000
+@@ -69,7 +69,7 @@
+ struct nouveau_context *nctx = to_nouveau_context(ctx);
+ struct nouveau_pushbuf *push = context_push(ctx);
+
+- PUSH_KICK(push);
++ if (push) PUSH_KICK(push);
+
+ if (ctx->DrawBuffer && _mesa_is_winsys_fbo(ctx->DrawBuffer) &&
+ ctx->DrawBuffer->_ColorDrawBufferIndexes[0] == BUFFER_FRONT_LEFT) {