ci/pkg-mesa-qcom-git
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patch added from https://bugs.freedesktop.org/show_bug.cgi?id=103388

Browse Source
This commit is contained in:
LW-archlinux 2017-10-24 17:38:28 +02:00
parent eab6a5930f
commit 3b372bfb44
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.SRCINFO
View File

@ -1,7 +1,7 @@
pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
pkgver = 17.3.0_devel.96241.2d4b57fc3e
pkgrel = 2
pkgver = 17.4.0_devel.96968.7a6c6e73a8
pkgrel = 1
url = http://mesa3d.sourceforge.net
arch = x86_64
license = custom
@ -58,10 +58,12 @@ pkgbase = mesa-git
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

10
PKGBUILD
View File

@ -12,8 +12,8 @@
pkgbase=mesa-git
pkgname=('mesa-git')
pkgdesc="an open-source implementation of the OpenGL specification, git version"
pkgver=17.3.0_devel.96241.2d4b57fc3e
pkgrel=2
pkgver=17.4.0_devel.96968.7a6c6e73a8
pkgrel=1
arch=('x86_64')
makedepends=('git' 'python2-mako' 'llvm-svn' 'libclc' 'clang-svn' 'glproto'
'dri2proto' 'dri3proto' 'presentproto' 'libxml2' 'libx11'
@ -30,11 +30,13 @@ 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')
'75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
'6867fa2bafded7ffb00e97452b1044960c5b4c55dc306db8c4af8995cd5fe4a4fb26e7dada71d17bddf9d490659fbc83cf56a280cd5adbe02b9c45287033c62a')
prepare() {
cd ${srcdir}/mesa
@ -43,6 +45,8 @@ prepare() {
# 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
}

29
clover-Fix-compiling-with-LLVM-r315871.patch Normal file
View File

@ -0,0 +1,29 @@
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;