upg appstream mesa yad
This commit is contained in:
parent
baf573862e
commit
327de5b6b0
|
@ -8,7 +8,7 @@
|
|||
pkgbase=appstream
|
||||
pkgname=(appstream appstream-qt5) # appstream-qt)
|
||||
pkgver=1.0.1
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc='Provides a standard for creating app stores across distributions w/o systemd'
|
||||
url='https://distributions.freedesktop.org/wiki/AppStream'
|
||||
depends=(cairo curl fontconfig freetype2 gcc-libs gdk-pixbuf2 glib2 glibc librsvg libstemmer
|
||||
|
@ -81,8 +81,7 @@ validpgpkeys=(D33A3F0CA16B0ACC51A60738494C8A5FBF4DECEB) # Matthias Klumpp <matth
|
|||
|
||||
sha256sums=(fa4d5994e5c6f22e9b66cb0b52e8b5f5d96e7353ea5528b56436e0150829203b # AppStream-1.0.1.tar.xz
|
||||
f5eb15764bf63abb02def3cbd3a68fb11d2329d72f65d23518fbd8a151a19c80 # AppStream-1.0.1.tar.xz.asc
|
||||
3a96a1479cfd18dad36c2ca3181aabe46af9bf772c00b965d86ec5f55cd0e0eb) # update-appstream-cache.hook
|
||||
|
||||
## 3e3a68b0f446cc11949210a744b64ebad2435e757cbd7b31d605a7a755ec2915 appstream-1.0.1-01-x86_64.pkg.tar.lz
|
||||
## 452c75f90baf286e1aaea4ce1227101b375842db23444b5f8a944af4de3cc050 appstream-qt5-1.0.1-01-x86_64.pkg.tar.lz
|
||||
edc632e4a76ebe5efc76a56fe5f797e5c981cca6f2f0111c7ce0170d1330c788) # update-appstream-cache.hook
|
||||
|
||||
## e24948de1b2a6d2da4f26cf5c0bf2677c510aaa0c69afc9e6037ec1f1e718187 appstream-1.0.1-02-x86_64.pkg.tar.lz
|
||||
## c8571766e43c942ddf94fd7e162ce559dabb8617a3a34ebfb76bdee203340e2a appstream-qt5-1.0.1-02-x86_64.pkg.tar.lz
|
||||
|
|
|
@ -7,7 +7,7 @@ pkgname=(appstream
|
|||
appstream-qt5
|
||||
appstream-qt)
|
||||
pkgver=1.0.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='Provides a standard for creating app stores across distributions'
|
||||
arch=(x86_64)
|
||||
url='https://distributions.freedesktop.org/wiki/AppStream'
|
||||
|
@ -41,7 +41,7 @@ source=(https://www.freedesktop.org/software/appstream/releases/AppStream-$pkgve
|
|||
update-appstream-cache.hook)
|
||||
sha256sums=('fa4d5994e5c6f22e9b66cb0b52e8b5f5d96e7353ea5528b56436e0150829203b'
|
||||
'SKIP'
|
||||
'3a96a1479cfd18dad36c2ca3181aabe46af9bf772c00b965d86ec5f55cd0e0eb')
|
||||
'edc632e4a76ebe5efc76a56fe5f797e5c981cca6f2f0111c7ce0170d1330c788')
|
||||
validpgpkeys=(D33A3F0CA16B0ACC51A60738494C8A5FBF4DECEB) # Matthias Klumpp <matthias@tenstral.net>
|
||||
|
||||
build() {
|
||||
|
|
|
@ -4,6 +4,7 @@ Operation = Install
|
|||
Operation = Upgrade
|
||||
Operation = Remove
|
||||
Target = usr/share/app-info/*
|
||||
Target = usr/share/swcatalog/*
|
||||
|
||||
[Trigger]
|
||||
Type = Package
|
||||
|
|
|
@ -8,8 +8,8 @@
|
|||
pkgbase=mesa
|
||||
pkgname=('vulkan-mesa-layers' 'opencl-clover-mesa' 'opencl-rusticl-mesa' 'vulkan-intel' 'vulkan-radeon'
|
||||
'vulkan-swrast' 'vulkan-virtio' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
|
||||
pkgver=23.3.2
|
||||
pkgrel=02
|
||||
pkgver=23.3.3
|
||||
pkgrel=01
|
||||
epoch=1
|
||||
pkgdesc="An open-source implementation of the OpenGL specification w/o systemd or zstd"
|
||||
url="https://www.mesa3d.org/"
|
||||
|
@ -62,14 +62,10 @@ makedepends=(
|
|||
'libomxil-bellagio'
|
||||
)
|
||||
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
|
||||
0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
|
||||
LICENSE)
|
||||
|
||||
prepare() {
|
||||
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
|
||||
# its GPU cache; otherwise it can cause pages to render incorrectly.
|
||||
|
@ -304,19 +300,19 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
|
|||
'71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <dylan@pnwbakers.com>
|
||||
'57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric@engestrom.ch>
|
||||
|
||||
sha256sums=(3cfcb81fa16f89c56abe3855d2637d396ee4e03849b659000a6b8e5f57e69adc # mesa-23.3.2.tar.xz
|
||||
af032541193cd26c935d3a116429a9bce80705b86b19fca8d7cdb6108cbed5ac # mesa-23.3.2.tar.xz.sig
|
||||
95ac7d00491f84c75af205d26181ae1227faf75c2f767fd6935b8a76d60d4728 # 0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
|
||||
sha256sums=(518307c0057fa3cee8b58df78be431d4df5aafa7edc60d09278b2d7a0a80f3b4 # mesa-23.3.3.tar.xz
|
||||
65fb7c89ae4a7ea00d91273f9be5c5612d91c5bd3cf7b18c2bd7efa3ae6813ec # mesa-23.3.3.tar.xz.sig
|
||||
7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE
|
||||
|
||||
## 14c25f13a455ebc3544c35dca0de505f89a3f3b0a6d8562b1459f96426249eac libva-mesa-driver-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 1dc5c2c21b41f5d287bdb686d97a8713f36f65e24b7a082ec4942063885173f8 mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 99de5d3edf6f3651632e5cd6acce4c6d55876449052e7af699393094f4be491e mesa-vdpau-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## a676e66eeb144dde62de38890ac7ead84baf214d008433bfd3e1b7eb10c29cce opencl-clover-mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## e99f602d14d17192ac885251781002ce3e94e7d9f60078e218dd6e416258ebe0 opencl-rusticl-mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 2ecb6b65b221a8501a8c8236476170e7fa5d7e98af075f77a9baeb1bbb28f814 vulkan-intel-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## d6993965fe7655c1a8a771d8fa8f72c5f38b7c0383042932b18878e918c6caf5 vulkan-mesa-layers-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 55f296e85e779b438803feba712dd27658c755ec2f51de09cd24a77bf15c3644 vulkan-radeon-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 8aa834ab698ddfc7f2bea3ded3de2b16fe1957489c0c56c4b41d51c594a46537 vulkan-swrast-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
## 3a2d795efcf378d6343833776ff1aca08b5c631f6a30169c77752d2c088b8d01 vulkan-virtio-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
|
||||
## 6ad8c35b1405f52b44e2cc1a0d1c0a221ee071a01362e65e2358643045a8986f libva-mesa-driver-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
## a5b5cbef1153288ffefe9993cf8402ed8fd1c56476627b741b12687c54783e09 mesa-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
## 05b5475d06070815a4a39692c19b06a0dc309e381177480bd7cce55dade4719d mesa-vdpau-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
## d3e8017c7211599ebeabb8baaaa6303848f1c5e434ef7fe35edbd4e61c87b78b opencl-clover-mesa-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
## bd3d79b8619d0e44671e6bd4a3bdba5a82f1aea84e0eb16562ce72f633a3608d opencl-rusticl-mesa-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
## 7062f974f6cb15f417548df5543ffe7e70cdeb55d4d51b15493cee66e7ff7560 vulkan-intel-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
## aa647f27f5af4c7a9a133d75f1f23773266f4b34f115c7e66d70e958900ed6cf vulkan-mesa-layers-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
## 314bd2e5bdb40b692f9031de2d9f192455445a91b2a4948dcb867b5db98d0877 vulkan-radeon-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
## eba5b3bfbbf24b6ef38fd7e0e3050ada235135599f11de1bdc4b6ae945e7c73b vulkan-swrast-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
## d6c66adb9c05ccda08cc84e39acdc19b626ed1811ff8ba7a0504a67f7640f131 vulkan-virtio-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
@ -16,8 +16,8 @@ pkgname=(
|
|||
'mesa-vdpau'
|
||||
'mesa'
|
||||
)
|
||||
pkgver=23.3.2
|
||||
pkgrel=2
|
||||
pkgver=23.3.3
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="An open-source implementation of the OpenGL specification"
|
||||
url="https://www.mesa3d.org/"
|
||||
|
@ -73,16 +73,13 @@ makedepends=(
|
|||
)
|
||||
source=(
|
||||
https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
|
||||
0001-Revert-d3d12-Only-destroy-the-winsys-during-screen-d.patch
|
||||
LICENSE
|
||||
)
|
||||
sha256sums=('3cfcb81fa16f89c56abe3855d2637d396ee4e03849b659000a6b8e5f57e69adc'
|
||||
sha256sums=('518307c0057fa3cee8b58df78be431d4df5aafa7edc60d09278b2d7a0a80f3b4'
|
||||
'SKIP'
|
||||
'95ac7d00491f84c75af205d26181ae1227faf75c2f767fd6935b8a76d60d4728'
|
||||
'7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537')
|
||||
b2sums=('fc97e17dd7a139056190010325f1d57978ef8618ae87731f459daedc303223f3fbce660c2361dcd518d35c709357435366c75ebfd6366daa9f0dec99b534604f'
|
||||
b2sums=('6b57e99356abccf398c5fb84953fc1490ddf516dbeed1feca8d16344a04c1c15183325752717447a34a61dd4cdda897147e3194f869d8dbadfa5c45a0c95dab5'
|
||||
'SKIP'
|
||||
'4ee0dde6be8134e71a7d0034e8aff58f1479c9787400ca404bbfccfb1b1a2ce12e84616341c6856b043d3cd2be1af82717e85e1d0f67eac1afc386ceb610a272'
|
||||
'1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb')
|
||||
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov@gmail.com>
|
||||
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty@igalia.com>
|
||||
|
@ -94,9 +91,6 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
|
|||
prepare() {
|
||||
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
|
||||
# its GPU cache; otherwise it can cause pages to render incorrectly.
|
||||
# https://bugs.launchpad.net/ubuntu/+source/chromium-browser/+bug/2020604
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
mv vulkan-mesa-layers-1:23.3.2-02-x86_64.pkg.tar.lz vulkan-mesa-layers-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv opencl-clover-mesa-1:23.3.2-02-x86_64.pkg.tar.lz opencl-clover-mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv opencl-rusticl-mesa-1:23.3.2-02-x86_64.pkg.tar.lz opencl-rusticl-mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-intel-1:23.3.2-02-x86_64.pkg.tar.lz vulkan-intel-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-radeon-1:23.3.2-02-x86_64.pkg.tar.lz vulkan-radeon-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-swrast-1:23.3.2-02-x86_64.pkg.tar.lz vulkan-swrast-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-virtio-1:23.3.2-02-x86_64.pkg.tar.lz vulkan-virtio-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv libva-mesa-driver-1:23.3.2-02-x86_64.pkg.tar.lz libva-mesa-driver-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv mesa-vdpau-1:23.3.2-02-x86_64.pkg.tar.lz mesa-vdpau-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv mesa-1:23.3.2-02-x86_64.pkg.tar.lz mesa-1_23.3.2-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-mesa-layers-1:23.3.3-01-x86_64.pkg.tar.lz vulkan-mesa-layers-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
mv opencl-clover-mesa-1:23.3.3-01-x86_64.pkg.tar.lz opencl-clover-mesa-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
mv opencl-rusticl-mesa-1:23.3.3-01-x86_64.pkg.tar.lz opencl-rusticl-mesa-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
mv vulkan-intel-1:23.3.3-01-x86_64.pkg.tar.lz vulkan-intel-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
mv vulkan-radeon-1:23.3.3-01-x86_64.pkg.tar.lz vulkan-radeon-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
mv vulkan-swrast-1:23.3.3-01-x86_64.pkg.tar.lz vulkan-swrast-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
mv vulkan-virtio-1:23.3.3-01-x86_64.pkg.tar.lz vulkan-virtio-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
mv libva-mesa-driver-1:23.3.3-01-x86_64.pkg.tar.lz libva-mesa-driver-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
mv mesa-vdpau-1:23.3.3-01-x86_64.pkg.tar.lz mesa-vdpau-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
mv mesa-1:23.3.3-01-x86_64.pkg.tar.lz mesa-1_23.3.3-01-x86_64.pkg.tar.lz
|
||||
|
|
|
@ -0,0 +1,51 @@
|
|||
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);
|
|
@ -0,0 +1,72 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: WinLinux1028 <reimu@hakurei.win>
|
||||
Date: Tue, 11 Jul 2023 18:16:01 +0900
|
||||
Subject: [PATCH] radeonsi: prefix function with si_ to prevent name collision
|
||||
|
||||
Fixed a build error caused by multiple gfx11_init_query symbols when building with iris and radeonsi specified in gallium-drivers.
|
||||
|
||||
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9238
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24045>
|
||||
---
|
||||
src/gallium/drivers/radeonsi/gfx11_query.c | 4 ++--
|
||||
src/gallium/drivers/radeonsi/si_pipe.c | 4 ++--
|
||||
src/gallium/drivers/radeonsi/si_pipe.h | 4 ++--
|
||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/drivers/radeonsi/gfx11_query.c b/src/gallium/drivers/radeonsi/gfx11_query.c
|
||||
index bfcd8e251105..2a331cc3bda2 100644
|
||||
--- a/src/gallium/drivers/radeonsi/gfx11_query.c
|
||||
+++ b/src/gallium/drivers/radeonsi/gfx11_query.c
|
||||
@@ -422,13 +422,13 @@ struct pipe_query *gfx11_sh_query_create(struct si_screen *screen, enum pipe_que
|
||||
return (struct pipe_query *)query;
|
||||
}
|
||||
|
||||
-void gfx11_init_query(struct si_context *sctx)
|
||||
+void si_gfx11_init_query(struct si_context *sctx)
|
||||
{
|
||||
list_inithead(&sctx->shader_query_buffers);
|
||||
sctx->atoms.s.shader_query.emit = emit_shader_query;
|
||||
}
|
||||
|
||||
-void gfx11_destroy_query(struct si_context *sctx)
|
||||
+void si_gfx11_destroy_query(struct si_context *sctx)
|
||||
{
|
||||
if (!sctx->shader_query_buffers.next)
|
||||
return;
|
||||
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
|
||||
index 91da22b5746c..f11cd2256b95 100644
|
||||
--- a/src/gallium/drivers/radeonsi/si_pipe.c
|
||||
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
|
||||
@@ -192,7 +192,7 @@ static void si_destroy_context(struct pipe_context *context)
|
||||
si_release_all_descriptors(sctx);
|
||||
|
||||
if (sctx->gfx_level >= GFX10 && sctx->has_graphics)
|
||||
- gfx11_destroy_query(sctx);
|
||||
+ si_gfx11_destroy_query(sctx);
|
||||
|
||||
if (sctx->sqtt) {
|
||||
struct si_screen *sscreen = sctx->screen;
|
||||
@@ -637,7 +637,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign
|
||||
/* Initialize graphics-only context functions. */
|
||||
if (sctx->has_graphics) {
|
||||
if (sctx->gfx_level >= GFX10)
|
||||
- gfx11_init_query(sctx);
|
||||
+ si_gfx11_init_query(sctx);
|
||||
si_init_msaa_functions(sctx);
|
||||
si_init_shader_functions(sctx);
|
||||
si_init_state_functions(sctx);
|
||||
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
|
||||
index 55f1d1788f1a..389716854f9a 100644
|
||||
--- a/src/gallium/drivers/radeonsi/si_pipe.h
|
||||
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
|
||||
@@ -1616,8 +1616,8 @@ void *si_create_query_result_cs(struct si_context *sctx);
|
||||
void *gfx11_create_sh_query_result_cs(struct si_context *sctx);
|
||||
|
||||
/* gfx11_query.c */
|
||||
-void gfx11_init_query(struct si_context *sctx);
|
||||
-void gfx11_destroy_query(struct si_context *sctx);
|
||||
+void si_gfx11_init_query(struct si_context *sctx);
|
||||
+void si_gfx11_destroy_query(struct si_context *sctx);
|
||||
|
||||
/* si_test_image_copy_region.c */
|
||||
void si_test_image_copy_region(struct si_screen *sscreen);
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=yad
|
||||
pkgver=13.0
|
||||
pkgrel=02 # rebuilt due to libicu
|
||||
pkgrel=03 # rebuilt due to libicu
|
||||
pkgdesc='A fork of zenity - display graphical dialogs from shell scripts or command line'
|
||||
url='https://github.com/v1cont/yad'
|
||||
depends=('gtk3' 'webkit2gtk' 'gtksourceview3' 'gspell')
|
||||
|
@ -49,4 +49,4 @@ license=('GPL3')
|
|||
|
||||
sha256sums=(194198c4a58e20ceffd9a3206633c3726d962d7d4219edb77aeb748897403e34) # yad-13.0.tar.xz
|
||||
|
||||
## 2380439fb2fd3577a4cb502a16e5c18a9a0aaad4916e48700909ed22d9c8c5f6 yad-13.0-02-x86_64.pkg.tar.lz
|
||||
## 2d8c819104fd7b3617b240811e65f6178bb52e77a150e09debdf5a1f761ecac3 yad-13.0-03-x86_64.pkg.tar.lz
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
pkgname=yad
|
||||
pkgver=13.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='A fork of zenity - display graphical dialogs from shell scripts or command line'
|
||||
url='https://github.com/v1cont/yad'
|
||||
arch=('x86_64')
|
||||
license=('GPL3')
|
||||
depends=('gtk3' 'webkit2gtk' 'gtksourceview3' 'gspell')
|
||||
depends=('gtk3' 'webkit2gtk-4.1' 'gtksourceview3' 'gspell')
|
||||
makedepends=('autoconf' 'automake' 'intltool')
|
||||
source=("https://github.com/v1cont/yad/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz")
|
||||
sha256sums=('194198c4a58e20ceffd9a3206633c3726d962d7d4219edb77aeb748897403e34')
|
||||
|
@ -19,6 +19,9 @@ sha256sums=('194198c4a58e20ceffd9a3206633c3726d962d7d4219edb77aeb748897403e34')
|
|||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
||||
# use webkit2gtk-4.1
|
||||
sed -i 's|webkit2gtk-4.0|webkit2gtk-4.1|' configure.ac
|
||||
|
||||
autoreconf -ivf
|
||||
intltoolize
|
||||
}
|
||||
|
@ -30,7 +33,6 @@ build() {
|
|||
--prefix=/usr \
|
||||
--enable-icon-browser \
|
||||
--enable-html \
|
||||
--enable-gio \
|
||||
--enable-spell \
|
||||
--enable-sourceview
|
||||
|
||||
|
|
Loading…
Reference in New Issue