extra/mesa to 23.3.3-1

This commit is contained in:
Kevin Mihelich 2024-01-13 00:57:28 +00:00
parent 7314661be4
commit 4c9d3cae23
3 changed files with 10 additions and 70 deletions

View file

@ -1,7 +1,7 @@
pkgbase = mesa pkgbase = mesa
pkgdesc = An open-source implementation of the OpenGL specification pkgdesc = An open-source implementation of the OpenGL specification
pkgver = 23.3.2 pkgver = 23.3.3
pkgrel = 2 pkgrel = 1
epoch = 1 epoch = 1
url = https://www.mesa3d.org/ url = https://www.mesa3d.org/
arch = x86_64 arch = x86_64
@ -44,9 +44,8 @@ pkgbase = mesa
makedepends = valgrind makedepends = valgrind
makedepends = directx-headers makedepends = directx-headers
makedepends = libomxil-bellagio makedepends = libomxil-bellagio
source = https://mesa.freedesktop.org/archive/mesa-23.3.2.tar.xz source = https://mesa.freedesktop.org/archive/mesa-23.3.3.tar.xz
source = https://mesa.freedesktop.org/archive/mesa-23.3.2.tar.xz.sig source = https://mesa.freedesktop.org/archive/mesa-23.3.3.tar.xz.sig
source = 0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
source = LICENSE source = LICENSE
validpgpkeys = 8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D validpgpkeys = 8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D
validpgpkeys = 946D09B5E4C9845E63075FF1D961C596A7203456 validpgpkeys = 946D09B5E4C9845E63075FF1D961C596A7203456
@ -54,13 +53,11 @@ pkgbase = mesa
validpgpkeys = A5CC9FEC93F2F837CB044912336909B6B25FADFA validpgpkeys = A5CC9FEC93F2F837CB044912336909B6B25FADFA
validpgpkeys = 71C4B75620BC75708B4BDB254C95FAAB3EB073EC validpgpkeys = 71C4B75620BC75708B4BDB254C95FAAB3EB073EC
validpgpkeys = 57551DE15B968F6341C248F68D8E31AFC32428A6 validpgpkeys = 57551DE15B968F6341C248F68D8E31AFC32428A6
sha256sums = 3cfcb81fa16f89c56abe3855d2637d396ee4e03849b659000a6b8e5f57e69adc sha256sums = 518307c0057fa3cee8b58df78be431d4df5aafa7edc60d09278b2d7a0a80f3b4
sha256sums = SKIP sha256sums = SKIP
sha256sums = 95ac7d00491f84c75af205d26181ae1227faf75c2f767fd6935b8a76d60d4728
sha256sums = 7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537 sha256sums = 7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537
b2sums = fc97e17dd7a139056190010325f1d57978ef8618ae87731f459daedc303223f3fbce660c2361dcd518d35c709357435366c75ebfd6366daa9f0dec99b534604f b2sums = 6b57e99356abccf398c5fb84953fc1490ddf516dbeed1feca8d16344a04c1c15183325752717447a34a61dd4cdda897147e3194f869d8dbadfa5c45a0c95dab5
b2sums = SKIP b2sums = SKIP
b2sums = 4ee0dde6be8134e71a7d0034e8aff58f1479c9787400ca404bbfccfb1b1a2ce12e84616341c6856b043d3cd2be1af82717e85e1d0f67eac1afc386ceb610a272
b2sums = 1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb b2sums = 1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb
pkgname = vulkan-mesa-layers pkgname = vulkan-mesa-layers

View file

@ -1,51 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 1 Jan 2024 17:19:30 +0100
Subject: [PATCH] Revert "d3d12: Only destroy the winsys during screen
destruction, not reset"
This reverts commit 684d11421c30c0f8230ccbcc8dcc94a457eb5f44.
For: https://gitlab.archlinux.org/archlinux/packaging/packages/mesa/-/issues/5
---
.pick_status.json | 2 +-
src/gallium/drivers/d3d12/d3d12_screen.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 0c787e915471..f6b0909e7d92 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2014,7 +2014,7 @@
"description": "d3d12: Only destroy the winsys during screen destruction, not reset",
"nominated": true,
"nomination_type": 1,
- "resolution": 1,
+ "resolution": 0,
"main_sha": null,
"because_sha": "81c8e89ff8e846839fffc1d103b2080bef5c1b5c",
"notes": null
diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp
index 9b0233fb9d92..ee74cf2b064f 100644
--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
@@ -735,15 +735,15 @@ d3d12_deinit_screen(struct d3d12_screen *screen)
screen->dev->Release();
screen->dev = nullptr;
}
+ if (screen->winsys) {
+ screen->winsys->destroy(screen->winsys);
+ screen->winsys = nullptr;
+ }
}
void
d3d12_destroy_screen(struct d3d12_screen *screen)
{
- if (screen->winsys) {
- screen->winsys->destroy(screen->winsys);
- screen->winsys = nullptr;
- }
slab_destroy_parent(&screen->transfer_pool);
mtx_destroy(&screen->submit_mutex);
mtx_destroy(&screen->descriptor_pool_mutex);

View file

@ -25,8 +25,8 @@ pkgname=(
'mesa-vdpau' 'mesa-vdpau'
'mesa' 'mesa'
) )
pkgver=23.3.2 pkgver=23.3.3
pkgrel=2 pkgrel=1
epoch=1 epoch=1
pkgdesc="An open-source implementation of the OpenGL specification" pkgdesc="An open-source implementation of the OpenGL specification"
url="https://www.mesa3d.org/" url="https://www.mesa3d.org/"
@ -82,16 +82,13 @@ makedepends=(
) )
source=( source=(
https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
LICENSE LICENSE
) )
sha256sums=('3cfcb81fa16f89c56abe3855d2637d396ee4e03849b659000a6b8e5f57e69adc' sha256sums=('518307c0057fa3cee8b58df78be431d4df5aafa7edc60d09278b2d7a0a80f3b4'
'SKIP' 'SKIP'
'95ac7d00491f84c75af205d26181ae1227faf75c2f767fd6935b8a76d60d4728'
'7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537') '7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537')
b2sums=('fc97e17dd7a139056190010325f1d57978ef8618ae87731f459daedc303223f3fbce660c2361dcd518d35c709357435366c75ebfd6366daa9f0dec99b534604f' b2sums=('6b57e99356abccf398c5fb84953fc1490ddf516dbeed1feca8d16344a04c1c15183325752717447a34a61dd4cdda897147e3194f869d8dbadfa5c45a0c95dab5'
'SKIP' 'SKIP'
'4ee0dde6be8134e71a7d0034e8aff58f1479c9787400ca404bbfccfb1b1a2ce12e84616341c6856b043d3cd2be1af82717e85e1d0f67eac1afc386ceb610a272'
'1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb') '1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov@gmail.com> validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov@gmail.com>
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty@igalia.com> '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty@igalia.com>
@ -103,9 +100,6 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
prepare() { prepare() {
cd mesa-$pkgver cd mesa-$pkgver
# https://gitlab.archlinux.org/archlinux/packaging/packages/mesa/-/issues/5
patch -Np1 -i ../0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
# Include package release in version string so Chromium invalidates # Include package release in version string so Chromium invalidates
# its GPU cache; otherwise it can cause pages to render incorrectly. # its GPU cache; otherwise it can cause pages to render incorrectly.
# https://bugs.launchpad.net/ubuntu/+source/chromium-browser/+bug/2020604 # https://bugs.launchpad.net/ubuntu/+source/chromium-browser/+bug/2020604