diff --git a/.SRCINFO b/.SRCINFO index 4da12ce..62730b8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = mesa-git pkgdesc = an open-source implementation of the OpenGL specification, git version - pkgver = 19.0.0_devel.106192.5088ba2aeb + pkgver = 19.0.0_devel.106254.e4f9a37ace pkgrel = 1 url = https://www.mesa3d.org arch = x86_64 @@ -53,10 +53,8 @@ pkgbase = mesa-git conflicts = mesa-vdpau source = mesa::git://anongit.freedesktop.org/mesa/mesa source = LICENSE - source = clang-moved-CodeGenOptions.h.patch sha512sums = SKIP sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2 - sha512sums = b74216c5fee849f00d45e3fbaf68ca44fc89a3d6195aeed7778a862c28f7bb1d19ba762201079e32c1ed6636fd6d63272d9b162f1e2db0c0fcd3bb847b8c858c pkgname = mesa-git diff --git a/PKGBUILD b/PKGBUILD index c9dae53..e68ab39 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=mesa-git pkgname=('mesa-git') pkgdesc="an open-source implementation of the OpenGL specification, git version" -pkgver=19.0.0_devel.106192.5088ba2aeb +pkgver=19.0.0_devel.106254.e4f9a37ace pkgrel=1 arch=('x86_64') makedepends=('git' 'python-mako' 'llvm-svn' 'clang-svn' 'xorgproto' @@ -27,11 +27,9 @@ url="https://www.mesa3d.org" license=('custom') source=('mesa::git://anongit.freedesktop.org/mesa/mesa' 'LICENSE' - 'clang-moved-CodeGenOptions.h.patch' ) sha512sums=('SKIP' - '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2' - 'b74216c5fee849f00d45e3fbaf68ca44fc89a3d6195aeed7778a862c28f7bb1d19ba762201079e32c1ed6636fd6d63272d9b162f1e2db0c0fcd3bb847b8c858c') + '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2') pkgver() { cd mesa @@ -39,11 +37,6 @@ pkgver() { echo ${_ver/-/_}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD) } -prepare() { - cd mesa - patch -Np1 -i "$srcdir"/clang-moved-CodeGenOptions.h.patch -} - build () { if [ -d _build ]; then rm -rf _build diff --git a/clang-moved-CodeGenOptions.h.patch b/clang-moved-CodeGenOptions.h.patch deleted file mode 100644 index 444d25b..0000000 --- a/clang-moved-CodeGenOptions.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ura mesa.orig/src/gallium/state_trackers/clover/llvm/compat.hpp mesa.new/src/gallium/state_trackers/clover/llvm/compat.hpp ---- mesa.orig/src/gallium/state_trackers/clover/llvm/compat.hpp 2018-12-13 13:16:18.000000000 +0100 -+++ mesa.new/src/gallium/state_trackers/clover/llvm/compat.hpp 2018-12-13 14:14:09.682660842 +0100 -@@ -58,7 +58,7 @@ - #include - - #include --#include -+#include - #include - - namespace clover {