summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Fix-linkage-against-shared-glapi.patch26
-rw-r--r--PKGBUILD11
-rw-r--r--clover-Fix-compiling-with-LLVM-r315871.patch29
4 files changed, 3 insertions, 69 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f86d5a7e356c..e67aea8677c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
- pkgver = 17.4.0_devel.96968.7a6c6e73a8
+ pkgver = 17.4.0_devel.97043.06a12f250f
pkgrel = 1
url = http://mesa3d.sourceforge.net
arch = x86_64
@@ -56,14 +56,10 @@ pkgbase = mesa-git
conflicts = libtxc_dxtn
source = mesa::git://anongit.freedesktop.org/mesa/mesa
source = LICENSE
- source = 0001-Fix-linkage-against-shared-glapi.patch
source = glvnd-fix-gl-dot-pc.patch
- source = clover-Fix-compiling-with-LLVM-r315871.patch
sha512sums = SKIP
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
- sha512sums = fdf973f0387997cee16936bc978f52d60719a1a8610fa96768e2cec42ad790da31f72c00783246f047fc496de01f9e22aec0d46577ded9c2353dd6e6193b4294
sha512sums = 75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028
- sha512sums = 6867fa2bafded7ffb00e97452b1044960c5b4c55dc306db8c4af8995cd5fe4a4fb26e7dada71d17bddf9d490659fbc83cf56a280cd5adbe02b9c45287033c62a
pkgname = mesa-git
diff --git a/0001-Fix-linkage-against-shared-glapi.patch b/0001-Fix-linkage-against-shared-glapi.patch
deleted file mode 100644
index 7f8f7164c763..000000000000
--- a/0001-Fix-linkage-against-shared-glapi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 12 Oct 2016 13:41:33 -0400
-Subject: [PATCH] Fix linkage against shared glapi
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- src/gallium/targets/osmesa/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
-index 5d39486..04add87 100644
---- a/src/gallium/targets/osmesa/Makefile.am
-+++ b/src/gallium/targets/osmesa/Makefile.am
-@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \
- $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
- $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
- $(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \
-- $(top_builddir)/src/mapi/glapi/libglapi.la \
-+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
- $(SHARED_GLAPI_LIB) \
- $(OSMESA_LIB_DEPS) \
- $(CLOCK_LIB)
---
-2.9.3
-
diff --git a/PKGBUILD b/PKGBUILD
index 039bfbe718a4..c26348ced54d 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=17.4.0_devel.96968.7a6c6e73a8
+pkgver=17.4.0_devel.97043.06a12f250f
pkgrel=1
arch=('x86_64')
makedepends=('git' 'python2-mako' 'llvm-svn' 'libclc' 'clang-svn' 'glproto'
@@ -28,25 +28,18 @@ url="http://mesa3d.sourceforge.net"
license=('custom')
source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
'LICENSE'
- '0001-Fix-linkage-against-shared-glapi.patch'
'glvnd-fix-gl-dot-pc.patch'
- 'clover-Fix-compiling-with-LLVM-r315871.patch'
)
sha512sums=('SKIP'
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
- 'fdf973f0387997cee16936bc978f52d60719a1a8610fa96768e2cec42ad790da31f72c00783246f047fc496de01f9e22aec0d46577ded9c2353dd6e6193b4294'
- '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
- '6867fa2bafded7ffb00e97452b1044960c5b4c55dc306db8c4af8995cd5fe4a4fb26e7dada71d17bddf9d490659fbc83cf56a280cd5adbe02b9c45287033c62a')
+ '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028')
prepare() {
cd ${srcdir}/mesa
# glvnd support patches - from Fedora
# non-upstreamed ones
- patch -Np1 -i ../0001-Fix-linkage-against-shared-glapi.patch
patch -Np1 -i ../glvnd-fix-gl-dot-pc.patch
- # see https://bugs.freedesktop.org/show_bug.cgi?id=103388 , patch downloaded from https://patchwork.freedesktop.org/patch/182916/
- patch -Np1 -i ../clover-Fix-compiling-with-LLVM-r315871.patch
}
diff --git a/clover-Fix-compiling-with-LLVM-r315871.patch b/clover-Fix-compiling-with-LLVM-r315871.patch
deleted file mode 100644
index 9ccfafb3924b..000000000000
--- a/clover-Fix-compiling-with-LLVM-r315871.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
-index 075183400a..8bb9e0e47a 100644
---- a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
-+++ b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
-@@ -128,8 +128,9 @@ namespace {
- const unsigned address_space =
- cast< ::llvm::PointerType>(actual_type)->getAddressSpace();
-
-- if (address_space == address_spaces[clang::LangAS::opencl_local
-- - compat::lang_as_offset]) {
-+ if (address_space == address_spaces[
-+ static_cast<unsigned>(clang::LangAS::opencl_local) -
-+ static_cast<unsigned>(compat::lang_as_offset)]) {
- args.emplace_back(module::argument::local, arg_api_size,
- target_size, target_align,
- module::argument::zero_ext);
-diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp b/src/gallium/state_trackers/clover/llvm/compat.hpp
-index f8b56516d5..ef173ea56f 100644
---- a/src/gallium/state_trackers/clover/llvm/compat.hpp
-+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
-@@ -70,7 +70,7 @@ namespace clover {
- #endif
-
- #if HAVE_LLVM >= 0x0500
-- const auto lang_as_offset = 0;
-+ const auto lang_as_offset = clang::LangAS::Default;
- const clang::InputKind ik_opencl = clang::InputKind::OpenCL;
- #else
- const auto lang_as_offset = clang::LangAS::Offset;