summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLone_Wolf2023-05-17 11:53:48 +0200
committerLone_Wolf2023-05-17 11:53:48 +0200
commitaa18857501a39047a4f3e27d2fd4bf34988115ac (patch)
tree95c880ae69bfac442342fd85b924bba28b2cae0c
parent86ff1ad99b6b375b1d5ff226f4f569cabec6a016 (diff)
downloadaur-aa18857501a39047a4f3e27d2fd4bf34988115ac.tar.gz
removed patch that is no longer needed
-rw-r--r--.SRCINFO7
-rw-r--r--0001-gallivm-llvm17-deleted-includefiles.patch13
-rw-r--r--PKGBUILD15
3 files changed, 5 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 70a2beab48ad..b59b9a612f03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mesa-minimal-git
pkgdesc = an open-source implementation of the OpenGL specification, stripped down git version
- pkgver = 23.2.0_devel.171106.626669bab31
+ pkgver = 23.2.0_devel.171312.4d188e005bc
pkgrel = 2
url = https://www.mesa3d.org
arch = x86_64
@@ -49,13 +49,10 @@ pkgbase = mesa-minimal-git
options = !emptydirs
source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git
source = LICENSE
- source = 0001-gallivm-llvm17-deleted-includefiles.patch
md5sums = SKIP
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
- md5sums = 942f95c6f7e795abd9df755b43cf0239
sha512sums = SKIP
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
- sha512sums = ee81e9a1d23ff7265310da3231b7eebe1f6d49dd4c568781e2da0ac494e04ff074901cedc66e04c727eb120fad563db9693da509d69f738e3e2f108afc383c0a
pkgname = mesa-minimal-git
depends = libdrm
@@ -86,7 +83,7 @@ pkgname = rusticl-mesa-minimal-git
depends = spirv-llvm-translator-minimal-git
depends = libclc-minimal-git
depends = spirv-tools-git
- depends = mesa-minimal-git=23.2.0_devel.171106.626669bab31-2
+ depends = mesa-minimal-git=23.2.0_devel.171312.4d188e005bc-2
depends = llvm-libs-minimal-git
depends = clang-libs-minimal-git
depends = expat
diff --git a/0001-gallivm-llvm17-deleted-includefiles.patch b/0001-gallivm-llvm17-deleted-includefiles.patch
deleted file mode 100644
index 03d3856e5d8e..000000000000
--- a/0001-gallivm-llvm17-deleted-includefiles.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --unified --recursive --text mesa/src/gallium/auxiliary/gallivm/lp_bld_init.c mesa-new/src/gallium/auxiliary/gallivm/lp_bld_init.c
---- mesa/src/gallium/auxiliary/gallivm/lp_bld_init.c 2023-03-20 12:22:03.861856125 +0100
-+++ mesa-new/src/gallium/auxiliary/gallivm/lp_bld_init.c 2023-03-20 13:07:34.218833163 +0100
-@@ -42,8 +42,7 @@
-
- #include <llvm/Config/llvm-config.h>
- #include <llvm-c/Analysis.h>
--#include <llvm-c/Transforms/Scalar.h>
--#if LLVM_VERSION_MAJOR >= 7
-+#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR <17
- #include <llvm-c/Transforms/Utils.h>
- #endif
- #include <llvm-c/BitWriter.h>
diff --git a/PKGBUILD b/PKGBUILD
index 7ae4c5e20fd7..64217c676d45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
pkgbase=mesa-minimal-git
pkgname=(mesa-minimal-git rusticl-mesa-minimal-git)
pkgdesc="an open-source implementation of the OpenGL specification, stripped down git version"
-pkgver=23.2.0_devel.171106.626669bab31
+pkgver=23.2.0_devel.171312.4d188e005bc
pkgrel=2
arch=('x86_64')
makedepends=(git meson ninja libglvnd python-mako xorgproto libxml2 libx11 libva elfutils libxrandr
@@ -27,14 +27,11 @@ url="https://www.mesa3d.org"
license=('custom')
source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git'
'LICENSE'
- '0001-gallivm-llvm17-deleted-includefiles.patch'
)
md5sums=('SKIP'
- '5c65a0fe315dd347e09b1f2826a1df5a'
- '942f95c6f7e795abd9df755b43cf0239')
+ '5c65a0fe315dd347e09b1f2826a1df5a')
sha512sums=('SKIP'
- '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
- 'ee81e9a1d23ff7265310da3231b7eebe1f6d49dd4c568781e2da0ac494e04ff074901cedc66e04c727eb120fad563db9693da509d69f738e3e2f108afc383c0a')
+ '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
options=(!emptydirs)
# ninja grabs all available cores and leaves almost nothing for other processes.
@@ -48,12 +45,6 @@ pkgver() {
echo ${_ver/-/_}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
}
-prepare() {
-
- patch --directory="mesa" --forward --strip=1 --input="${srcdir}"/0001-gallivm-llvm17-deleted-includefiles.patch
-
-}
-
build () {
meson setup mesa _build \