added patch to solve opencl sypport buildfailure
This commit is contained in:
parent
51188ef280
commit
8f936a8ed1
7
.SRCINFO
7
.SRCINFO
@ -1,6 +1,6 @@
|
||||
pkgbase = mesa-git
|
||||
pkgdesc = an open-source implementation of the OpenGL specification, git version
|
||||
pkgver = 18.2.0_devel.101888.3db93f9128
|
||||
pkgver = 18.2.0_devel.102206.c879011c72
|
||||
pkgrel = 1
|
||||
url = http://mesa3d.sourceforge.net
|
||||
arch = x86_64
|
||||
@ -19,6 +19,7 @@ pkgbase = mesa-git
|
||||
makedepends = ocl-icd
|
||||
makedepends = vulkan-icd-loader
|
||||
makedepends = libgcrypt
|
||||
makedepends = libclc
|
||||
depends = libdrm
|
||||
depends = libxxf86vm
|
||||
depends = libxdamage
|
||||
@ -28,6 +29,7 @@ pkgbase = mesa-git
|
||||
depends = llvm-libs-svn
|
||||
depends = libunwind
|
||||
depends = libglvnd
|
||||
depends = libclc
|
||||
optdepends = opengl-man-pages: for the OpenGL API man pages
|
||||
provides = mesa
|
||||
provides = vulkan-intel
|
||||
@ -35,6 +37,7 @@ pkgbase = mesa-git
|
||||
provides = libva-mesa-driver
|
||||
provides = mesa-vdpau
|
||||
provides = vulkan-driver
|
||||
provides = opencl-mesa
|
||||
provides = opencl-driver
|
||||
provides = opengl-driver
|
||||
conflicts = mesa
|
||||
@ -46,8 +49,10 @@ pkgbase = mesa-git
|
||||
conflicts = wayland<1.14.93
|
||||
source = mesa::git://anongit.freedesktop.org/mesa/mesa
|
||||
source = LICENSE
|
||||
source = opencl-autotools-Fix-linking-order-for-OpenCL-target.patch
|
||||
sha512sums = SKIP
|
||||
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
|
||||
sha512sums = f23e31e902e05f9102fdc3f3c7cc96306e04e297785bdc46f955f668588256c8ebfeb530a47bea9e9fea16f5c4e4e75cc0dceb71b042bed6a17a0ce320e234f1
|
||||
|
||||
pkgname = mesa-git
|
||||
|
||||
|
17
PKGBUILD
17
PKGBUILD
@ -12,28 +12,31 @@
|
||||
pkgbase=mesa-git
|
||||
pkgname=('mesa-git')
|
||||
pkgdesc="an open-source implementation of the OpenGL specification, git version"
|
||||
pkgver=18.2.0_devel.101888.3db93f9128
|
||||
pkgver=18.2.0_devel.102206.c879011c72
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
makedepends=('git' 'python2-mako' 'llvm-svn' 'clang-svn' 'xorgproto'
|
||||
'libxml2' 'libx11' 'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio'
|
||||
'ocl-icd' 'vulkan-icd-loader' 'libgcrypt')
|
||||
'ocl-icd' 'vulkan-icd-loader' 'libgcrypt' 'libclc')
|
||||
depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
|
||||
'libomxil-bellagio' 'llvm-libs-svn' 'libunwind' 'libglvnd')
|
||||
'libomxil-bellagio' 'llvm-libs-svn' 'libunwind' 'libglvnd' 'libclc')
|
||||
optdepends=('opengl-man-pages: for the OpenGL API man pages')
|
||||
provides=('mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-driver' 'opencl-driver' 'opengl-driver')
|
||||
provides=('mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-driver' 'opencl-mesa' 'opencl-driver' 'opengl-driver')
|
||||
conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'wayland<1.14.93')
|
||||
url="http://mesa3d.sourceforge.net"
|
||||
license=('custom')
|
||||
source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
|
||||
'LICENSE'
|
||||
'opencl-autotools-Fix-linking-order-for-OpenCL-target.patch'
|
||||
)
|
||||
sha512sums=('SKIP'
|
||||
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
|
||||
)
|
||||
'f23e31e902e05f9102fdc3f3c7cc96306e04e297785bdc46f955f668588256c8ebfeb530a47bea9e9fea16f5c4e4e75cc0dceb71b042bed6a17a0ce320e234f1')
|
||||
|
||||
prepare() {
|
||||
cd mesa
|
||||
# fixes opencl build failure, see https://bugs.freedesktop.org/show_bug.cgi?id=106209 and https://patchwork.freedesktop.org/patch/219763/
|
||||
patch -Np1 -i ../opencl-autotools-Fix-linking-order-for-OpenCL-target.patch
|
||||
autoreconf -vfi
|
||||
}
|
||||
|
||||
@ -59,12 +62,12 @@ build () {
|
||||
--disable-xvmc \
|
||||
--enable-vdpau \
|
||||
--enable-omx-bellagio \
|
||||
--enable-opencl \
|
||||
--enable-opencl-icd \
|
||||
--enable-glx-tls \
|
||||
--enable-libglvnd
|
||||
|
||||
# broken, see https://bugs.freedesktop.org/show_bug.cgi?id=106209
|
||||
# --enable-opencl \
|
||||
# --enable-opencl-icd \
|
||||
|
||||
|
||||
# Used configure settings
|
||||
|
17
opencl-autotools-Fix-linking-order-for-OpenCL-target.patch
Normal file
17
opencl-autotools-Fix-linking-order-for-OpenCL-target.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
|
||||
index de68a93ad5..f0e1de7797 100644
|
||||
--- a/src/gallium/targets/opencl/Makefile.am
|
||||
+++ b/src/gallium/targets/opencl/Makefile.am
|
||||
@@ -23,11 +23,10 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \
|
||||
$(LIBELF_LIBS) \
|
||||
$(DLOPEN_LIBS) \
|
||||
-lclangCodeGen \
|
||||
- -lclangFrontendTool \
|
||||
-lclangFrontend \
|
||||
+ -lclangFrontendTool \
|
||||
-lclangDriver \
|
||||
-lclangSerialization \
|
||||
- -lclangCodeGen \
|
||||
-lclangParse \
|
||||
-lclangSema \
|
||||
-lclangAnalysis \
|
Loading…
Reference in New Issue
Block a user