upg cmake libutempter mesa qt5-base zip unzip
add modules
This commit is contained in:
parent
9518ed0bb6
commit
a67282c3f6
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=cmake
|
||||
pkgver=3.27.6
|
||||
pkgver=3.27.7
|
||||
pkgrel=01
|
||||
pkgdesc='A cross-platform open-source make system w/o zstd or qt-gui '
|
||||
url="https://www.cmake.org/"
|
||||
|
|
@ -59,13 +59,12 @@ license=('custom')
|
|||
|
||||
validpgpkeys=(CBA23971357C2E6590D9EFD3EC8FEF3A7BFB4EDA) # Brad King <brad.king@kitware.com>
|
||||
|
||||
sha512sums=('268b5bd84800c37ce0e311cadf13c275a538d612844cc8687107549fe6341a6c3115560e3b9162836843016213d225f62db130bc251bf8aff50c69b9bd58e638'
|
||||
'46c5536d7b8d8b08f97a7352d89df8c12ee9c3b28cd49bd29f91d6136bdb56481f93eb2ceb9c0391dc1284c43f36f384f7b749483b64aebb4f84c6a2cd9077d5'
|
||||
'SKIP')
|
||||
sha512sums=('2e9b83dee8f8c012be4219ab74ebaa8b8438ea55d5204237a1c9feba94c732afe7baceddb9c681672903112b1e40f7b1a86b284cfceed15f46ce8f90143dbb86'
|
||||
'5f093ed51b10f530318c8b8205ff35f91443a71064008115eecce2f7e8393a3cb3b7dd1c35e5b7b58981c49b19ee708966321085a3237ec313a0865d26948e32'
|
||||
'SKIP')
|
||||
|
||||
sha256sums=(ef3056df528569e0e8956f6cf38806879347ac6de6a4ff7e4105dc4578732cfb # cmake-3.27.6.tar.gz
|
||||
d5ac6d28aa0557f025b1fa16bc53e04b87fdab04d1498e5d994d458b0cf9840c # cmake-3.27.6-SHA-256.txt
|
||||
bc5a9be5f9b4e5d238280176f3be89b21a949fc551d6441444e171913fd97217) # cmake-3.27.6-SHA-256.txt.asc
|
||||
|
||||
## df9c336d09c4b654fe6a45ff1c700a8f8a41b39069d2d9e2c3597afdfdbdc00a cmake-3.27.6-01-x86_64.pkg.tar.lz
|
||||
sha256sums=(08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e # cmake-3.27.7.tar.gz
|
||||
5bb3f53db3f3f8fa0c8a4af6e555a38dbc232b81021971fa9c16fa142377224a # cmake-3.27.7-SHA-256.txt
|
||||
4444e94e311fe690e0d529e7a12f6eb694b003907be0cc49268a7f35bf4f808c) # cmake-3.27.7-SHA-256.txt.asc
|
||||
|
||||
## 9152b95f111142abcb736984a9c18a796d1322a49accd32dec9937282d6e04f1 cmake-3.27.7-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: Pierre Schmitz <pierre@archlinux.de>
|
||||
|
||||
pkgname=cmake
|
||||
pkgver=3.27.6
|
||||
pkgver=3.27.7
|
||||
pkgrel=1
|
||||
pkgdesc='A cross-platform open-source make system'
|
||||
arch=('x86_64')
|
||||
|
|
@ -18,8 +18,8 @@ optdepends=(
|
|||
)
|
||||
source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
|
||||
"https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}-SHA-256.txt"{,.asc})
|
||||
sha512sums=('268b5bd84800c37ce0e311cadf13c275a538d612844cc8687107549fe6341a6c3115560e3b9162836843016213d225f62db130bc251bf8aff50c69b9bd58e638'
|
||||
'46c5536d7b8d8b08f97a7352d89df8c12ee9c3b28cd49bd29f91d6136bdb56481f93eb2ceb9c0391dc1284c43f36f384f7b749483b64aebb4f84c6a2cd9077d5'
|
||||
sha512sums=('2e9b83dee8f8c012be4219ab74ebaa8b8438ea55d5204237a1c9feba94c732afe7baceddb9c681672903112b1e40f7b1a86b284cfceed15f46ce8f90143dbb86'
|
||||
'5f093ed51b10f530318c8b8205ff35f91443a71064008115eecce2f7e8393a3cb3b7dd1c35e5b7b58981c49b19ee708966321085a3237ec313a0865d26948e32'
|
||||
'SKIP')
|
||||
validpgpkeys=(CBA23971357C2E6590D9EFD3EC8FEF3A7BFB4EDA) # Brad King <brad.king@kitware.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,3 +9,4 @@ cppdap
|
|||
nlohmann-json
|
||||
|
||||
|
||||
python-typing_extensions
|
||||
|
|
|
|||
|
|
@ -7,26 +7,25 @@
|
|||
|
||||
pkgname=libutempter
|
||||
pkgver=1.2.1
|
||||
pkgrel=03
|
||||
pkgrel=04
|
||||
pkgdesc="Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files w/o systemd"
|
||||
arch=('x86_64')
|
||||
url="http://ftp.altlinux.org/pub/people/ldv/utempter"
|
||||
depends=('glibc')
|
||||
makedepends=('sh')
|
||||
source=(http://ftp.altlinux.org/pub/people/ldv/utempter/$pkgname-$pkgver.tar.gz{,.asc})
|
||||
makedepends=('sh' 'git')
|
||||
#source=(http://ftp.altlinux.org/pub/people/ldv/utempter/$pkgname-$pkgver.tar.gz{,.asc})
|
||||
source=(git+https://github.com/altlinux/libutempter.git?signed#tag=${pkgver}-alt1)
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
cd $pkgname/$pkgname
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
cd $pkgname/$pkgname
|
||||
make DESTDIR="$pkgdir" install
|
||||
echo 'z /usr/lib/utempter/utempter 2755 root utmp' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
|
||||
}
|
||||
|
||||
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
|
@ -35,11 +34,6 @@ license=('LGPL')
|
|||
|
||||
validpgpkeys=(296D6F29A020808E8717A8842DB5BD89A340AEB7) # Dmitry V. Levin <ldv@altlinux.org>
|
||||
|
||||
sha512sums=('d3a3bab7d2c2a68534c5ad41dd02bde849eb08df5dbb895a79b50b74d269c48c4cfcd12c4654941ccb7cdd43f486cfdc19148fa470870562f5cd324ce9782429'
|
||||
'SKIP')
|
||||
|
||||
sha256sums=(967fef372f391de501843ad87570c6cf5dabd9651f00f1783090fbc12b2a34cb # libutempter-1.2.1.tar.gz
|
||||
5b870ce4ee8147923fd051c42cfe86c24e54eb631040aa6f4e63cf0e4ae84c14) # libutempter-1.2.1.tar.gz.asc
|
||||
|
||||
## 1b21a6cbaf198a4aaa21627faae3ea4c03a370aceb6df01b65d32de14788050e libutempter-1.2.1-03-x86_64.pkg.tar.lz
|
||||
sha256sums=(SKIP)
|
||||
|
||||
## 49c55ba8f49dc38248de57f2b96230d0ac997d448e0904e1ffc3b99851b30661 libutempter-1.2.1-04-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -2,25 +2,24 @@
|
|||
|
||||
pkgname=libutempter
|
||||
pkgver=1.2.1
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc="Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files"
|
||||
arch=('x86_64')
|
||||
url="http://ftp.altlinux.org/pub/people/ldv/utempter"
|
||||
license=('LGPL')
|
||||
depends=('glibc')
|
||||
makedepends=('systemd')
|
||||
source=(http://ftp.altlinux.org/pub/people/ldv/utempter/$pkgname-$pkgver.tar.gz{,.asc})
|
||||
sha512sums=('d3a3bab7d2c2a68534c5ad41dd02bde849eb08df5dbb895a79b50b74d269c48c4cfcd12c4654941ccb7cdd43f486cfdc19148fa470870562f5cd324ce9782429'
|
||||
'SKIP')
|
||||
makedepends=('git' 'systemd')
|
||||
source=(git+https://github.com/altlinux/libutempter.git?signed#tag=${pkgver}-alt1)
|
||||
sha512sums=('SKIP')
|
||||
validpgpkeys=(296D6F29A020808E8717A8842DB5BD89A340AEB7) # Dmitry V. Levin <ldv@altlinux.org>
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
cd $pkgname/$pkgname
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
cd $pkgname/$pkgname
|
||||
make DESTDIR="$pkgdir" install
|
||||
echo 'z /usr/lib/utempter/utempter 2755 root utmp' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
rm -rf {src,pkg,libutempter*tar.gz*}
|
||||
rm -rf {src,pkg,libutempter}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
git
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -9,7 +9,7 @@ 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.2.1
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
epoch=1
|
||||
pkgdesc="An open-source implementation of the OpenGL specification w/o systemd or zstd"
|
||||
url="https://www.mesa3d.org/"
|
||||
|
|
@ -62,11 +62,16 @@ makedepends=(
|
|||
'libomxil-bellagio'
|
||||
)
|
||||
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
|
||||
0001-radeonsi-prefix-function-with-si_-to-prevent-name-co.patch
|
||||
LICENSE)
|
||||
|
||||
prepare() {
|
||||
cd mesa-$pkgver
|
||||
|
||||
# https://bugs.archlinux.org/task/79831
|
||||
# https://gitlab.freedesktop.org/mesa/mesa/-/issues/9889#note_2113953
|
||||
patch -Np1 -i ../0001-radeonsi-prefix-function-with-si_-to-prevent-name-co.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
|
||||
|
|
@ -113,10 +118,7 @@ build() {
|
|||
-D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \
|
||||
-D vulkan-drivers=amd,intel,intel_hasvk,swrast,virtio \
|
||||
-D vulkan-layers=device-select,intel-nullhw,overlay
|
||||
|
||||
# Print config
|
||||
meson configure build
|
||||
|
||||
meson configure build # Print config
|
||||
# ninja -C build
|
||||
meson compile -C build
|
||||
|
||||
|
|
@ -305,16 +307,7 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
|
|||
|
||||
sha256sums=(64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc # mesa-23.2.1.tar.xz
|
||||
6d9c6703c559667ccf1c0fbd178029f239edd61929f6ca500eb289b6780610fb # mesa-23.2.1.tar.xz.sig
|
||||
fcd21477e5c6122dc74f72457364448b171f7843b7a671e1f9df9c61bd888898 # 0001-radeonsi-prefix-function-with-si_-to-prevent-name-co.patch
|
||||
7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE
|
||||
|
||||
## 32bee7f201c1dbe0ed714a28a0e71e4831f5a895e81ed5fd25ea9d7cc0b1ae37 mesa-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
## 64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc mesa-23.2.1.tar.xz
|
||||
## 6d9c6703c559667ccf1c0fbd178029f239edd61929f6ca500eb289b6780610fb mesa-23.2.1.tar.xz.sig
|
||||
## d1283293d60bd7313f889cacf4d8c9340f6216756e46068c7010c1a4ad69d048 mesa-vdpau-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
## 99bc506699fcc7bf8011ef39b1139d1e5b1ed26ee0e52251f48f93f5b52a7134 opencl-clover-mesa-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
## 8c166bdf060860c57030d254be9237c531b0de43c3de935f5ecbadcaa426e54f opencl-rusticl-mesa-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
## 0280ba3e249f036b4ba9f708905b24e4e53dc7f0befdbc9706e8eb484f4fc807 vulkan-intel-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
## d09757362c78d87e57735c5c9206b65ce01595e5062c045eac8c21d0d38a781f vulkan-mesa-layers-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
## aba1c63ed23a23783cd418ccb7834fff04ac74e09923200defa56448cc1e269a vulkan-radeon-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
## 50d1f88a9124386f6dcb43bc1d9316fd910cd4ce5266d0e887e08cc95c07b4e7 vulkan-swrast-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
## 06f0dda8d3f30941dcdb9363c05527a0f8b0af884108a217547e136ecb841070 vulkan-virtio-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
## dc8841391a5809939368f087ec6b37d6ad4ca62d2e211e2b2a7489f97afe873f mesa-1_23.2.1-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ pkgname=(
|
|||
'mesa'
|
||||
)
|
||||
pkgver=23.2.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
epoch=1
|
||||
pkgdesc="An open-source implementation of the OpenGL specification"
|
||||
url="https://www.mesa3d.org/"
|
||||
|
|
@ -73,13 +73,16 @@ makedepends=(
|
|||
)
|
||||
source=(
|
||||
https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
|
||||
0001-radeonsi-prefix-function-with-si_-to-prevent-name-co.patch
|
||||
LICENSE
|
||||
)
|
||||
sha256sums=('64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc'
|
||||
'SKIP'
|
||||
'fcd21477e5c6122dc74f72457364448b171f7843b7a671e1f9df9c61bd888898'
|
||||
'7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537')
|
||||
b2sums=('51e44c2e9b7dfe17cf4cb7252e169109d03a006caa8ec34036fb594c0c44e9278d0088170894c1a9debdea911f746470e1d256576e0635cae5c3e670ab49161b'
|
||||
'SKIP'
|
||||
'b5f2ee167103d53bc0d5ada123d9c3a1e394b5c0b992401da2d4cf69da30710f7d5b6b9264634e02a1e9856798780c1dc3faed01058274599290cb82c15dd193'
|
||||
'1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb')
|
||||
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov@gmail.com>
|
||||
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty@igalia.com>
|
||||
|
|
@ -91,6 +94,10 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
|
|||
prepare() {
|
||||
cd mesa-$pkgver
|
||||
|
||||
# https://bugs.archlinux.org/task/79831
|
||||
# https://gitlab.freedesktop.org/mesa/mesa/-/issues/9889#note_2113953
|
||||
patch -Np1 -i ../0001-radeonsi-prefix-function-with-si_-to-prevent-name-co.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.2.1-01-x86_64.pkg.tar.lz vulkan-mesa-layers-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
mv opencl-clover-mesa-1:23.2.1-01-x86_64.pkg.tar.lz opencl-clover-mesa-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
mv opencl-rusticl-mesa-1:23.2.1-01-x86_64.pkg.tar.lz opencl-rusticl-mesa-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
mv vulkan-intel-1:23.2.1-01-x86_64.pkg.tar.lz vulkan-intel-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
mv vulkan-radeon-1:23.2.1-01-x86_64.pkg.tar.lz vulkan-radeon-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
mv vulkan-swrast-1:23.2.1-01-x86_64.pkg.tar.lz vulkan-swrast-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
mv vulkan-virtio-1:23.2.1-01-x86_64.pkg.tar.lz vulkan-virtio-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
mv libva-mesa-driver-1:23.2.1-01-x86_64.pkg.tar.lz libva-mesa-driver-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
mv mesa-vdpau-1:23.2.1-01-x86_64.pkg.tar.lz mesa-vdpau-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
mv mesa-1:23.2.1-01-x86_64.pkg.tar.lz mesa-1_23.2.1-01-x86_64.pkg.tar.lz
|
||||
mv vulkan-mesa-layers-1:23.2.1-02-x86_64.pkg.tar.lz vulkan-mesa-layers-1_23.2.1-02-x86_64.pkg.tar.lz
|
||||
mv opencl-clover-mesa-1:23.2.1-02-x86_64.pkg.tar.lz opencl-clover-mesa-1_23.2.1-02-x86_64.pkg.tar.lz
|
||||
mv opencl-rusticl-mesa-1:23.2.1-02-x86_64.pkg.tar.lz opencl-rusticl-mesa-1_23.2.1-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-intel-1:23.2.1-02-x86_64.pkg.tar.lz vulkan-intel-1_23.2.1-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-radeon-1:23.2.1-02-x86_64.pkg.tar.lz vulkan-radeon-1_23.2.1-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-swrast-1:23.2.1-02-x86_64.pkg.tar.lz vulkan-swrast-1_23.2.1-02-x86_64.pkg.tar.lz
|
||||
mv vulkan-virtio-1:23.2.1-02-x86_64.pkg.tar.lz vulkan-virtio-1_23.2.1-02-x86_64.pkg.tar.lz
|
||||
mv libva-mesa-driver-1:23.2.1-02-x86_64.pkg.tar.lz libva-mesa-driver-1_23.2.1-02-x86_64.pkg.tar.lz
|
||||
mv mesa-vdpau-1:23.2.1-02-x86_64.pkg.tar.lz mesa-vdpau-1_23.2.1-02-x86_64.pkg.tar.lz
|
||||
mv mesa-1:23.2.1-02-x86_64.pkg.tar.lz mesa-1_23.2.1-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,55 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
|
||||
Date: Sun, 12 Jun 2022 23:59:05 +0300
|
||||
Subject: [PATCH] anv: force MEDIA_INTERFACE_DESCRIPTOR_LOAD reemit after
|
||||
3D->GPGPU switch
|
||||
|
||||
Seems to fix a hang in the following titles :
|
||||
- Age of Empire 4
|
||||
- Monster Hunter Rise
|
||||
|
||||
where the HW is hung on a PIPE_CONTROL after a GPGPU_WALKER but no
|
||||
MEDIA_INTERFACE_DESCRIPTOR_LOAD was emitted since the switch from 3D
|
||||
to GPGPU.
|
||||
|
||||
This would happen in the following case :
|
||||
|
||||
vkCmdBindPipeline(COMPUTE, cs_pipeline);
|
||||
vkCmdDispatch(...);
|
||||
vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
|
||||
vkCmdDraw(...);
|
||||
vkCmdDispatch(...);
|
||||
|
||||
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
|
||||
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
|
||||
Cc: mesa-stable
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17247>
|
||||
---
|
||||
src/intel/vulkan/genX_cmd_buffer.c | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
|
||||
index 25d337945896..1b382cae49a1 100644
|
||||
--- a/src/intel/vulkan/genX_cmd_buffer.c
|
||||
+++ b/src/intel/vulkan/genX_cmd_buffer.c
|
||||
@@ -6383,6 +6383,20 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer,
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if GFX_VERx10 == 120
|
||||
+ /* Undocumented workaround to force the re-emission of
|
||||
+ * MEDIA_INTERFACE_DESCRIPTOR_LOAD when switching from 3D to Compute
|
||||
+ * pipeline without rebinding a pipeline :
|
||||
+ * vkCmdBindPipeline(COMPUTE, cs_pipeline);
|
||||
+ * vkCmdDispatch(...);
|
||||
+ * vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
|
||||
+ * vkCmdDraw(...);
|
||||
+ * vkCmdDispatch(...);
|
||||
+ */
|
||||
+ if (pipeline == _3D)
|
||||
+ cmd_buffer->state.compute.pipeline_dirty = true;
|
||||
+#endif
|
||||
+
|
||||
#if GFX_VER >= 12
|
||||
/* From Tigerlake PRM, Volume 2a, PIPELINE_SELECT:
|
||||
*
|
||||
|
|
@ -0,0 +1,130 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
|
||||
Date: Mon, 3 Apr 2023 14:52:59 +0300
|
||||
Subject: [PATCH] intel/fs: fix scheduling of HALT instructions
|
||||
|
||||
With the following test :
|
||||
|
||||
dEQP-VK.spirv_assembly.instruction.terminate_invocation.terminate.no_out_of_bounds_load
|
||||
|
||||
There is a :
|
||||
|
||||
shader_start:
|
||||
... <- no control flow
|
||||
g0 = some_alu
|
||||
g1 = fbl
|
||||
g2 = broadcast g3, g1
|
||||
g4 = get_buffer_size g2
|
||||
... <- no control flow
|
||||
halt <- on some lanes
|
||||
g5 = send <surface>, g4
|
||||
|
||||
eliminate_find_live_channel will remove the fbl/broadcast because it
|
||||
assumes lane0 is active at get_buffer_size :
|
||||
|
||||
shader_start:
|
||||
... <- no control flow
|
||||
g0 = some_alu
|
||||
g4 = get_buffer_size g0
|
||||
... <- no control flow
|
||||
halt <- on some lanes
|
||||
g5 = send <surface>, g4
|
||||
|
||||
But then the instruction scheduler will move the get_buffer_size after
|
||||
the halt :
|
||||
|
||||
shader_start:
|
||||
... <- no control flow
|
||||
halt <- on some lanes
|
||||
g0 = some_alu
|
||||
g4 = get_buffer_size g0
|
||||
g5 = send <surface>, g4
|
||||
|
||||
get_buffer_size pulls the surface index from lane0 in g0 which could
|
||||
have been turned off by the halt and we end up accessing an invalid
|
||||
surface handle.
|
||||
|
||||
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
|
||||
Cc: mesa-stable
|
||||
---
|
||||
.../compiler/brw_schedule_instructions.cpp | 46 +++++++++++++++++++
|
||||
1 file changed, 46 insertions(+)
|
||||
|
||||
diff --git a/src/intel/compiler/brw_schedule_instructions.cpp b/src/intel/compiler/brw_schedule_instructions.cpp
|
||||
index 3286e3f83b96..43f63784b2e8 100644
|
||||
--- a/src/intel/compiler/brw_schedule_instructions.cpp
|
||||
+++ b/src/intel/compiler/brw_schedule_instructions.cpp
|
||||
@@ -651,6 +651,7 @@ public:
|
||||
ralloc_free(this->mem_ctx);
|
||||
}
|
||||
void add_barrier_deps(schedule_node *n);
|
||||
+ void add_cross_lane_deps(schedule_node *n);
|
||||
void add_dep(schedule_node *before, schedule_node *after, int latency);
|
||||
void add_dep(schedule_node *before, schedule_node *after);
|
||||
|
||||
@@ -1098,6 +1099,28 @@ is_scheduling_barrier(const backend_instruction *inst)
|
||||
inst->has_side_effects();
|
||||
}
|
||||
|
||||
+static bool
|
||||
+has_cross_lane_access(const fs_inst *inst)
|
||||
+{
|
||||
+ if (inst->opcode == SHADER_OPCODE_BROADCAST ||
|
||||
+ inst->opcode == SHADER_OPCODE_READ_SR_REG ||
|
||||
+ inst->opcode == SHADER_OPCODE_CLUSTER_BROADCAST ||
|
||||
+ inst->opcode == SHADER_OPCODE_SHUFFLE ||
|
||||
+ inst->opcode == FS_OPCODE_LOAD_LIVE_CHANNELS ||
|
||||
+ inst->opcode == SHADER_OPCODE_FIND_LAST_LIVE_CHANNEL ||
|
||||
+ inst->opcode == SHADER_OPCODE_FIND_LIVE_CHANNEL)
|
||||
+ return true;
|
||||
+
|
||||
+ for (unsigned s = 0; s < inst->sources; s++) {
|
||||
+ if (inst->src[s].file == VGRF) {
|
||||
+ if (inst->src[s].stride == 0)
|
||||
+ return true;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* Sometimes we really want this node to execute after everything that
|
||||
* was before it and before everything that followed it. This adds
|
||||
@@ -1128,6 +1151,25 @@ instruction_scheduler::add_barrier_deps(schedule_node *n)
|
||||
}
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * Because some instructions like HALT can disable lanes, scheduling prior to
|
||||
+ * a cross lane access should not be allowed, otherwise we could end up with
|
||||
+ * later instructions accessing uninitialized data.
|
||||
+ */
|
||||
+void
|
||||
+instruction_scheduler::add_cross_lane_deps(schedule_node *n)
|
||||
+{
|
||||
+ schedule_node *prev = (schedule_node *)n->prev;
|
||||
+
|
||||
+ if (prev) {
|
||||
+ while (!prev->is_head_sentinel()) {
|
||||
+ if (has_cross_lane_access((fs_inst *)prev->inst))
|
||||
+ add_dep(prev, n, 0);
|
||||
+ prev = (schedule_node *)prev->prev;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
/* instruction scheduling needs to be aware of when an MRF write
|
||||
* actually writes 2 MRFs.
|
||||
*/
|
||||
@@ -1165,6 +1207,10 @@ fs_instruction_scheduler::calculate_deps()
|
||||
if (is_scheduling_barrier(inst))
|
||||
add_barrier_deps(n);
|
||||
|
||||
+ if (inst->opcode == BRW_OPCODE_HALT ||
|
||||
+ inst->opcode == SHADER_OPCODE_HALT_TARGET)
|
||||
+ add_cross_lane_deps(n);
|
||||
+
|
||||
/* read-after-write deps. */
|
||||
for (int i = 0; i < inst->sources; i++) {
|
||||
if (inst->src[i].file == VGRF) {
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Kai-Heng Feng <kai.heng.feng@canonical.com>
|
||||
Date: Thu, 29 Dec 2022 13:43:27 +0800
|
||||
Subject: [PATCH] iris: Retry DRM_IOCTL_I915_GEM_EXECBUFFER2 on ENOMEM
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
We are seeing endless DRM_IOCTL_SYNCOBJ_WAIT ioctl when system memory is
|
||||
under pressured.
|
||||
|
||||
Commit f9d8d9acbb6a ("iris: Avoid abort() if kernel can't allocate
|
||||
memory") avoids the abort() on ENOMEM by resetting the batch. However,
|
||||
when there's an ongoing OpenGL query, resetting the batch will make the
|
||||
snapshots_landed never be flipped, so iris_get_query_result() gets stuck
|
||||
in the while loop forever.
|
||||
|
||||
Since there's no guarantee that the next batch after resetting won't hit
|
||||
ENOMEM, so instead of resetting the batch, be patient and wait until kernel has
|
||||
enough memory. Once the batch is submiited and snapshots_landed gets
|
||||
flipped, iris_get_query_result() can proceed normally.
|
||||
|
||||
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
|
||||
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6851
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449>
|
||||
---
|
||||
src/gallium/drivers/iris/iris_batch.c | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
|
||||
index c7a08a0e1f5f..deab85ce4aaf 100644
|
||||
--- a/src/gallium/drivers/iris/iris_batch.c
|
||||
+++ b/src/gallium/drivers/iris/iris_batch.c
|
||||
@@ -981,9 +981,14 @@ submit_batch(struct iris_batch *batch)
|
||||
}
|
||||
|
||||
int ret = 0;
|
||||
- if (!batch->screen->devinfo->no_hw &&
|
||||
- intel_ioctl(batch->screen->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf))
|
||||
- ret = -errno;
|
||||
+ if (!batch->screen->devinfo->no_hw) {
|
||||
+ do {
|
||||
+ ret = intel_ioctl(batch->screen->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf);
|
||||
+ } while (ret && errno == ENOMEM);
|
||||
+
|
||||
+ if (ret)
|
||||
+ ret = -errno;
|
||||
+ }
|
||||
|
||||
simple_mtx_unlock(bo_deps_lock);
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Kai-Heng Feng <kai.heng.feng@canonical.com>
|
||||
Date: Thu, 29 Dec 2022 14:01:31 +0800
|
||||
Subject: [PATCH] Revert "iris: Avoid abort() if kernel can't allocate memory"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This reverts commit f9d8d9acbb6a620684fb4dac4affe25816587d92.
|
||||
|
||||
Now ENOMEM is handled in submit_batch(), we don't need to check it for
|
||||
resetting anymore.
|
||||
|
||||
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449>
|
||||
---
|
||||
src/gallium/drivers/iris/iris_batch.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
|
||||
index deab85ce4aaf..2993f0ab7ee8 100644
|
||||
--- a/src/gallium/drivers/iris/iris_batch.c
|
||||
+++ b/src/gallium/drivers/iris/iris_batch.c
|
||||
@@ -1097,9 +1097,8 @@ _iris_batch_flush(struct iris_batch *batch, const char *file, int line)
|
||||
* with a new logical context, and inform iris_context that all state
|
||||
* has been lost and needs to be re-initialized. If this succeeds,
|
||||
* dubiously claim success...
|
||||
- * Also handle ENOMEM here.
|
||||
*/
|
||||
- if ((ret == -EIO || ret == -ENOMEM) && replace_kernel_ctx(batch)) {
|
||||
+ if (ret == -EIO && replace_kernel_ctx(batch)) {
|
||||
if (batch->reset->reset) {
|
||||
/* Tell gallium frontends the device is lost and it was our fault. */
|
||||
batch->reset->reset(batch->reset->data, PIPE_GUILTY_CONTEXT_RESET);
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
|
||||
Date: Thu, 2 Mar 2023 09:35:08 +0200
|
||||
Subject: [PATCH] egl/wayland: Fix destruction of event queue with proxies
|
||||
still attached.
|
||||
|
||||
Destroy the display wrapper proxy before destroying the event queue that
|
||||
the proxy is attached to.
|
||||
|
||||
This silences a warning that libwayland 1.22 emits for programs that use
|
||||
EGL/Wayland:
|
||||
|
||||
warning: queue 0x562a5ed2cd20 destroyed while proxies still attached:
|
||||
wl_display@1 still attached
|
||||
|
||||
Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21646>
|
||||
---
|
||||
src/egl/drivers/dri2/platform_wayland.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
|
||||
index 32b0ff70002d..962bc34a2166 100644
|
||||
--- a/src/egl/drivers/dri2/platform_wayland.c
|
||||
+++ b/src/egl/drivers/dri2/platform_wayland.c
|
||||
@@ -2800,10 +2800,10 @@ dri2_teardown_wayland(struct dri2_egl_display *dri2_dpy)
|
||||
wl_shm_destroy(dri2_dpy->wl_shm);
|
||||
if (dri2_dpy->wl_registry)
|
||||
wl_registry_destroy(dri2_dpy->wl_registry);
|
||||
- if (dri2_dpy->wl_queue)
|
||||
- wl_event_queue_destroy(dri2_dpy->wl_queue);
|
||||
if (dri2_dpy->wl_dpy_wrapper)
|
||||
wl_proxy_wrapper_destroy(dri2_dpy->wl_dpy_wrapper);
|
||||
+ if (dri2_dpy->wl_queue)
|
||||
+ wl_event_queue_destroy(dri2_dpy->wl_queue);
|
||||
|
||||
if (dri2_dpy->own_device)
|
||||
wl_display_disconnect(dri2_dpy->wl_dpy);
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
|
||||
Date: Thu, 2 Mar 2023 10:10:42 +0200
|
||||
Subject: [PATCH] vulkan/wsi/wayland: Fix destruction of event queue with
|
||||
proxies still attached.
|
||||
|
||||
Destroy the surface dmabuf feedback proxy before destroying the event
|
||||
queue that the proxy is attached to.
|
||||
|
||||
This silences a warning that libwayland 1.22 emits for programs that use
|
||||
Vulkan/Wayland:
|
||||
|
||||
warning: queue 0x557a4efbcf70 destroyed while proxies still attached:
|
||||
zwp_linux_dmabuf_feedback_v1@18 still attached
|
||||
|
||||
Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21647>
|
||||
---
|
||||
src/vulkan/wsi/wsi_common_wayland.c | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
|
||||
index 0c6560371f75..6a241bcfabe1 100644
|
||||
--- a/src/vulkan/wsi/wsi_common_wayland.c
|
||||
+++ b/src/vulkan/wsi/wsi_common_wayland.c
|
||||
@@ -1156,18 +1156,18 @@ wsi_wl_surface_destroy(VkIcdSurfaceBase *icd_surface, VkInstance _instance,
|
||||
struct wsi_wl_surface *wsi_wl_surface =
|
||||
wl_container_of((VkIcdSurfaceWayland *)icd_surface, wsi_wl_surface, base);
|
||||
|
||||
- if (wsi_wl_surface->surface)
|
||||
- wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
|
||||
-
|
||||
- if (wsi_wl_surface->display)
|
||||
- wsi_wl_display_destroy(wsi_wl_surface->display);
|
||||
-
|
||||
if (wsi_wl_surface->wl_dmabuf_feedback) {
|
||||
zwp_linux_dmabuf_feedback_v1_destroy(wsi_wl_surface->wl_dmabuf_feedback);
|
||||
dmabuf_feedback_fini(&wsi_wl_surface->dmabuf_feedback);
|
||||
dmabuf_feedback_fini(&wsi_wl_surface->pending_dmabuf_feedback);
|
||||
}
|
||||
|
||||
+ if (wsi_wl_surface->surface)
|
||||
+ wl_proxy_wrapper_destroy(wsi_wl_surface->surface);
|
||||
+
|
||||
+ if (wsi_wl_surface->display)
|
||||
+ wsi_wl_display_destroy(wsi_wl_surface->display);
|
||||
+
|
||||
vk_free2(&instance->alloc, pAllocator, wsi_wl_surface);
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
|
||||
Date: Sat, 22 Apr 2023 01:21:20 +0000
|
||||
Subject: [PATCH] rusticl: Fix bindgen invocation
|
||||
|
||||
The deprecated `--size_t-is-usize` was removed in bindgen 0.65.1, being
|
||||
enabled by default.
|
||||
---
|
||||
src/gallium/frontends/rusticl/meson.build | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
|
||||
index e53b50a9b8b8..9fa024cb8db4 100644
|
||||
--- a/src/gallium/frontends/rusticl/meson.build
|
||||
+++ b/src/gallium/frontends/rusticl/meson.build
|
||||
@@ -92,7 +92,6 @@ rusticl_gen_args = [
|
||||
rusticl_bindgen_args = [
|
||||
'--no-convert-floats',
|
||||
'--use-array-pointers-in-arguments',
|
||||
- '--size_t-is-usize',
|
||||
'--default-enum-style', 'rust',
|
||||
'--with-derive-partialeq',
|
||||
'--with-derive-eq',
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=modules
|
||||
pkgver=0.1.0
|
||||
pkgrel=03
|
||||
pkgdesc='Utility script written in pure-POSIX sh to load modules from files'
|
||||
url='https://git.obarun.org/obdev'
|
||||
source=($pkgname::git+$url/modules.git#tag=v$pkgver)
|
||||
makedepends=(git)
|
||||
depends=(kmod)
|
||||
|
||||
build() {
|
||||
cd $pkgname
|
||||
./configure --bindir=/usr/bin
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname
|
||||
make DESTDIR="$pkgdir" install
|
||||
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}"/LICENSE
|
||||
}
|
||||
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=(ISC)
|
||||
|
||||
sha256sums=(SKIP)
|
||||
|
||||
## 7d8acda183854fc1c270d26cf8da327640216346d7343ff545097d9575ae295f modules-0.1.0-03-x86_64.pkg.tar.lz
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
# Obarun : 66 init/supervisor
|
||||
# Maintainer : Eric Vidal <eric@obarun.org>
|
||||
# Maintainer : Jean-Michel T.Dydak <jean-michel@obarun.org>
|
||||
# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/modules
|
||||
#----------------
|
||||
#--------------------------------------------------------------
|
||||
# DESCRIPTION ]
|
||||
|
||||
pkgname=modules
|
||||
pkgver=0.1.0
|
||||
pkgrel=2
|
||||
pkgdesc='Utility script written in pure-POSIX sh to load modules from files'
|
||||
|
||||
url='https://git.obarun.org/obdev/modules.git'
|
||||
|
||||
track=tag
|
||||
target=v$pkgver
|
||||
source=(
|
||||
$pkgname::git+$url#$track=$target
|
||||
)
|
||||
|
||||
#----------------------
|
||||
# BUILD CONFIGURATION ]
|
||||
|
||||
makedepends=(
|
||||
'git'
|
||||
)
|
||||
|
||||
#------------------------
|
||||
# INSTALL CONFIGURATION ]
|
||||
|
||||
depends=(
|
||||
'kmod'
|
||||
)
|
||||
|
||||
#----------------
|
||||
# BUILD CONTROL ]
|
||||
|
||||
_path=(
|
||||
--bindir=/usr/bin
|
||||
)
|
||||
|
||||
#--------
|
||||
# BUILD ]
|
||||
|
||||
build() {
|
||||
cd $pkgname
|
||||
./configure "${_path[@]}"
|
||||
}
|
||||
|
||||
#----------
|
||||
# PACKAGE ]
|
||||
|
||||
package() {
|
||||
cd $pkgname
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
#-------------------------
|
||||
# LICENCE AND VALIDATION ]
|
||||
|
||||
arch=(x86_64)
|
||||
license=(ISC)
|
||||
|
||||
sha512sums=(' ')
|
||||
|
|
@ -0,0 +1 @@
|
|||
rm -rf {src,pkg,modules}
|
||||
|
|
@ -0,0 +1 @@
|
|||
git
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
|
||||
|
||||
real 0m1.994s
|
||||
user 0m1.347s
|
||||
sys 0m0.333s
|
||||
|
||||
|
|
@ -7,10 +7,10 @@
|
|||
|
||||
pkgbase=qt5-base
|
||||
pkgname=(qt5-base qt5-xcb-private-headers)
|
||||
_basever=5.15.10
|
||||
pkgver=5.15.10+kde+r165
|
||||
_commit=9b7fd27c2b4a363ba4434353be2932483be99234
|
||||
pkgrel=1
|
||||
_basever=5.15.11
|
||||
pkgver=5.15.11+kde+r134
|
||||
_commit=c672f8bffff5af90a40bad7e621eae4616b12a31
|
||||
pkgrel=01
|
||||
url='https://www.qt.io'
|
||||
pkgdesc='A cross-platform application and UI framework w/o systemd'
|
||||
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig' 'xdg-utils'
|
||||
|
|
@ -129,5 +129,5 @@ sha256sums=(SKIP
|
|||
5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qmake-cflags.patch
|
||||
4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch
|
||||
|
||||
## 82fbbb0e7f23d162d1bcc80df3f332ca7a1a0bac87845d497abe9e2c6a6df216 qt5-base-5.15.10+kde+r165-1-x86_64.pkg.tar.lz
|
||||
## aab7a2f75ab45d7394e9f11dd76cacda433d75c8e57ead5e7d4ee02b165e3f25 qt5-xcb-private-headers-5.15.10+kde+r165-1-x86_64.pkg.tar.lz
|
||||
## 35ad4010a70edfacddbf83af850bbcfdde7f641ffa180213328529b9b51556c9 qt5-base-5.15.11+kde+r134-01-x86_64.pkg.tar.lz
|
||||
## bbcc63bd0bd3bb0d59fbc66d468996e6affb15b6b6a6cf2d12426a60712db792 qt5-xcb-private-headers-5.15.11+kde+r134-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
|
||||
pkgbase=qt5-base
|
||||
pkgname=(qt5-base qt5-xcb-private-headers)
|
||||
_basever=5.15.10
|
||||
pkgver=5.15.10+kde+r165
|
||||
_basever=5.15.11
|
||||
pkgver=5.15.11+kde+r134
|
||||
pkgrel=1
|
||||
_commit=9b7fd27c2b4a363ba4434353be2932483be99234
|
||||
_commit=c672f8bffff5af90a40bad7e621eae4616b12a31
|
||||
arch=('x86_64')
|
||||
url='https://www.qt.io'
|
||||
license=('GPL3' 'LGPL3' 'FDL' 'custom')
|
||||
|
|
|
|||
|
|
@ -8,10 +8,9 @@
|
|||
pkgname=unzip
|
||||
pkgver=6.0
|
||||
_pkgver=${pkgver/./}
|
||||
pkgrel=019
|
||||
pkgrel=020
|
||||
pkgdesc='For extracting and viewing files in .zip archives'
|
||||
url='http://infozip.sourceforge.net/UnZip.html'
|
||||
arch=('x86_64')
|
||||
depends=('bzip2' 'bash')
|
||||
#options=('debug') ### uncomment this to have the debug pkg produced
|
||||
source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
|
||||
|
|
@ -44,7 +43,8 @@ source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
|
|||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-zipbomb-part6.patch'
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-zipbomb-switch.patch'
|
||||
'unzip-6.0_CVE-2021-4217.patch'
|
||||
'https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch')
|
||||
# 'https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch'
|
||||
'28-cve-2022-0529-and-cve-2022-0530.patch')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}${_pkgver}"
|
||||
|
|
@ -102,7 +102,9 @@ package() {
|
|||
}
|
||||
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('custom')
|
||||
|
||||
|
|
@ -138,3 +140,4 @@ sha256sums=(036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 # u
|
|||
cb88ba5a2c9bdffd5867206a48841f638e2a7970e88cc009b90202bdca988b8b # unzip-6.0_CVE-2021-4217.patch
|
||||
a27efd8c4950fb3d942d602ad7846996e02aafd77a8ad1e26700e42ae6c1cd37) # 28-cve-2022-0529-and-cve-2022-0530.patch
|
||||
|
||||
## 3067c391fff990beaef416d8468a5c21baa37127802489d9491bef01a532351e unzip-6.0-020-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -6,13 +6,12 @@
|
|||
pkgname=unzip
|
||||
pkgver=6.0
|
||||
_pkgver=${pkgver/./}
|
||||
pkgrel=19
|
||||
pkgrel=20
|
||||
pkgdesc='For extracting and viewing files in .zip archives'
|
||||
url='http://infozip.sourceforge.net/UnZip.html'
|
||||
arch=('x86_64')
|
||||
license=('custom')
|
||||
depends=('bzip2' 'bash')
|
||||
options=('debug')
|
||||
source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-exec-shield.patch'
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-6.0-close.patch'
|
||||
|
|
@ -43,7 +42,7 @@ source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
|
|||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-zipbomb-part6.patch'
|
||||
'https://src.fedoraproject.org/rpms/unzip/raw/rawhide/f/unzip-zipbomb-switch.patch'
|
||||
'unzip-6.0_CVE-2021-4217.patch'
|
||||
'https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch')
|
||||
'28-cve-2022-0529-and-cve-2022-0530.patch')
|
||||
sha512sums=('0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d'
|
||||
'3c7f525687b198aaa8547a8b30e744f7f184943624279d5c70170d5b9bb3f0c0f27f3e69bc808dd0d144690107bc76a10c06e160bf99c54fd5684246208b7cff'
|
||||
'8423e32bbc1e1fe9366118bd10795bb8307f5a9a1afba1f0f62e46443d198b7f3cfcc41dedf57f31830f4c7328c9f5ae573982ca8664822b5f2a2ecdbc389df9'
|
||||
|
|
|
|||
10
zip/PKGBUILD
10
zip/PKGBUILD
|
|
@ -8,10 +8,9 @@
|
|||
pkgname=zip
|
||||
pkgver=3.0
|
||||
_pkgver=${pkgver/./}
|
||||
pkgrel=010
|
||||
pkgrel=011
|
||||
pkgdesc='Compressor/archiver for creating and modifying zipfiles'
|
||||
url='http://www.info-zip.org/Zip.html'
|
||||
arch=('x86_64')
|
||||
depends=('bzip2')
|
||||
options=('!makeflags')
|
||||
source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
|
||||
|
|
@ -49,7 +48,9 @@ package() {
|
|||
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('custom')
|
||||
|
||||
|
|
@ -58,3 +59,6 @@ sha256sums=(f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 # z
|
|||
10f0f3756a2415e33edf1455373b322404962b743b3a52a757b669e47dd7f1b2 # zip-3.0-exec-shield.patch
|
||||
3759134487afad9c63e2e9693aa05b9dcc67f55a9ef961e82074b587b094292a # zip-3.0-format-security.patch
|
||||
89249a3f1fdf838b795ce432a2d763fdbe913d6a146541e41b7a2e2769291ba0) # zipnote.patch
|
||||
|
||||
|
||||
## 21b8476229095646d86934717095a2823b5b600b2e67e6ed63292cdf5b7bc964 zip-3.0-011-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
pkgname=zip
|
||||
pkgver=3.0
|
||||
_pkgver=${pkgver/./}
|
||||
pkgrel=10
|
||||
pkgrel=11
|
||||
pkgdesc='Compressor/archiver for creating and modifying zipfiles'
|
||||
url='http://www.info-zip.org/Zip.html'
|
||||
arch=('x86_64')
|
||||
|
|
|
|||
Loading…
Reference in New Issue