Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=llvmmesabump.git;a=commitdiff;h=1105d9dc7c5f03ffb2268cfb345c42d6427d39ed
commit 1105d9dc7c5f03ffb2268cfb345c42d6427d39ed Author: DeX77 <[email protected]> Date: Fri Nov 11 19:53:11 2016 +0100 mesa-13.0.0-1-x86_64 * version bump + add RADV Vulkan driver for Radeon * reenable OpenCL diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index 3936aed..5131cee 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -17,7 +17,7 @@ : ${USE_GLES1="y"} : ${USE_GLES2="y"} : ${USE_GLX="y"} -: ${USE_OPENCL="n"} +: ${USE_OPENCL="y"} : ${USE_OSMESA="y"} : ${USE_VDPAU="y"} : ${USE_VAAPI="y"} @@ -33,20 +33,19 @@ if Fuse WAYLAND_EGL; then fi pkgname=mesa -pkgver=12.0.3 -pkgrel=9 +pkgver=13.0.0 +pkgrel=1 pkgdesc="Mesa is a 3D graphics library" url="http://mesa3d.sourceforge.net/"; up2date="lynx --dump 'ftp://ftp.freedesktop.org/pub/mesa/' | grep "pub/mesa/[0-9\.]" | tail -n1 | sed 's|.*/\([0-9\.]\)|\1|'" # libgl: provided by libgl, fglrx and nvidia packages depends=() -makedepends=('makedepend>=1.0.5-3' 'mako>=1.0.4-2' 'x11-protos>=0.1-3' 'systemd>=231-6' 'llvm' 'lib32-llvm' 'lib32-clang') +makedepends=('makedepend>=1.0.5-3' 'mako>=1.0.4-2' 'x11-protos>=0.1-3' 'systemd>=231-6' 'llvm' 'lib32-llvm' 'clang' 'lib32-clang') # should be mesa-*=$pkgver but apps should not depends on mesa anymore first, unless specific to mesa rodepends=('libgl') archs=('x86_64') groups=('x11' 'xorg-core' 'xorg-libs') -_F_cross32_delete=("usr/share") Finclude cross32 if Fuse DEVEL; then @@ -57,8 +56,9 @@ if Fuse DEVEL; then _F_scm_url="git://anongit.freedesktop.org/mesa/mesa" Finclude scm else - source=("ftp://ftp.freedesktop.org/pub/mesa/$pkgver/$pkgname-$pkgver.tar.xz";) - signatures=("${source[0]}".sig) + source=("ftp://ftp.freedesktop.org/pub/mesa/$pkgver/$pkgname-$pkgver.tar.xz"; \ + add_host_suffix_to_radeon_icd.patch) + signatures=("${source[0]}".sig '') fi subpkgs=('libgl' 'mesa-libgl-headers') @@ -83,14 +83,14 @@ subrodepends+=("lib32-mesa-libgl-headers>=$pkgver-$pkgrel lib32-libglapi lib32-m subgroups+=('lib32-extra' 'lib32-extra') subarchs+=("${archs[*]}" "${archs[*]}") subbackup+=('' '') -suboptions+=('force' 'force') +suboptions+=('' '') subpkgs=("${subpkgs[@]}" 'mesa-dri-drivers') subdescs=("${subdescs[@]}" 'Mesa OpenGL DRI drivers.') subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') -subdepends=("${subdepends[@]}" "nettle>=3.2-2 expat>=2.1.0-6 libdrm>=2.4.71 elfutils>=0.167-2 llvm-libs>=3.8.1-4 libffi>=3.2.1-2") +subdepends=("${subdepends[@]}" "nettle>=3.2-2 expat>=2.1.0-6 libdrm>=2.4.71 elfutils>=0.167-2 llvm-libs>=3.9.0 libffi>=3.2.1-2") subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") @@ -102,12 +102,12 @@ subdescs=("${subdescs[@]}" 'Mesa OpenGL DRI drivers. (32-Bit)') subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') -subdepends=("${subdepends[@]}" "lib32-nettle>=3.3-2 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.71 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2") +subdepends=("${subdepends[@]}" "lib32-nettle>=3.3-2 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.71 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.9.0 lib32-libffi>=3.2.1-2") subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') -suboptions+=('force') +suboptions+=('') subpkgs=("${subpkgs[@]}" 'libgbm') subdescs=("${subdescs[@]}" 'Mesa gbm library.') @@ -131,7 +131,7 @@ subrodepends+=('lib32-libglapi') subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') -suboptions+=('force') +suboptions+=('') subpkgs=("${subpkgs[@]}" 'libglapi') subdescs=("${subdescs[@]}" 'Mesa OpenGL API library.') @@ -155,7 +155,7 @@ subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') -suboptions+=('force') +suboptions+=('') subpkgs=("${subpkgs[@]}" 'libgles') subdescs=("${subdescs[@]}" 'Mesa OpenGL ES1/ES2 libraries.') @@ -179,7 +179,7 @@ subrodepends=("${subrodepends[@]}" 'lib32-libglapi lib32-khr-headers') subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') -suboptions+=('force') +suboptions+=('') subpkgs=("${subpkgs[@]}" 'khr-headers') subdescs=("${subdescs[@]}" 'Khronos generic header.') @@ -203,7 +203,7 @@ subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') -suboptions+=('force') +suboptions+=('') if Fuse EGL; then @@ -229,7 +229,7 @@ if Fuse EGL; then subgroups+=('lib32-extra') subarchs+=("${archs[*]}") subbackup+=('') - suboptions+=('force') + suboptions+=('') fi @@ -239,7 +239,7 @@ if Fuse OPENCL; then subprovides+=('mesa-libcl') subreplaces+=('') subconflicts+=('') - subdepends+=('expat>=2.1.0-6 libdrm>=2.4.71 nettle>=3.2-2 elfutils>=0.167-2 llvm-libs>=3.8.1-4 libffi>=3.2.1-2') + subdepends+=('expat>=2.1.0-6 libdrm>=2.4.71 nettle>=3.2-2 elfutils>=0.167-2 llvm-libs>=3.9.0 libffi>=3.2.1-2 libclc') subrodepends+=('') subgroups+=('x11') subarchs+=("${archs[*]}") @@ -251,19 +251,19 @@ if Fuse OPENCL; then subprovides+=('mesa-libcl') subreplaces+=('') subconflicts+=('') - subdepends+=('lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.71 lib32-nettle>=3.3-2 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2') + subdepends+=('lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.71 lib32-nettle>=3.3-2 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.9.0 lib32-libffi>=3.2.1-2 lib32-libclc') subrodepends+=('') subgroups+=('lib32-extra') subarchs+=("${archs[*]}") subbackup+=('') - suboptions+=('force') + suboptions+=('') subpkgs+=('mesa-pipe-drivers') subdescs+=('Mesa gallium pipe drivers.') subprovides+=('') subreplaces+=('') subconflicts+=('') - subdepends+=("libdrm>=2.4.70 llvm-libs>=3.8.1-4 elfutils>=0.167-2 nettle>=3.2-2 libffi>=3.2.1-2") + subdepends+=("libdrm>=2.4.70 llvm-libs>=3.9.0 elfutils>=0.167-2 nettle>=3.2-2 libffi>=3.2.1-2") subrodepends+=('') subgroups+=('x11') subarchs+=("${archs[*]}") @@ -275,12 +275,12 @@ if Fuse OPENCL; then subprovides+=('') subreplaces+=('') subconflicts+=('') - subdepends+=("lib32-libdrm>=2.4.70 lib32-llvm-libs>=3.8.1-4 lib32-elfutils>=0.167-2 lib32-nettle>=3.2-2 lib32-libffi>=3.2.1-2") + subdepends+=("lib32-libdrm>=2.4.70 lib32-llvm-libs>=3.9.0 lib32-elfutils>=0.167-2 lib32-nettle>=3.2-2 lib32-libffi>=3.2.1-2") subrodepends+=('') subgroups+=('lib32-extra') subarchs+=("${archs[*]}") subbackup+=('') - suboptions+=('force') + suboptions+=('') fi @@ -290,7 +290,7 @@ if Fuse XA; then subprovides+=('') subreplaces+=('') subconflicts+=('') - subdepends+=('nettle>=3.2-2 expat>=2.1.0-6 libdrm>=2.4.71 llvm-libs>=3.8.1-4 libffi>=3.2.1-2 zlib>=1.2.8-8') + subdepends+=('nettle>=3.2-2 expat>=2.1.0-6 libdrm>=2.4.71 llvm-libs>=3.9.0 libffi>=3.2.1-2 zlib>=1.2.8-8') subrodepends+=('') subgroups+=('x11') subarchs+=("${archs[*]}") @@ -302,12 +302,12 @@ if Fuse XA; then subprovides+=('') subreplaces+=('') subconflicts+=('') - subdepends+=('lib32-nettle>=3.3-2 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.71 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2 lib32-zlib>=1.2.8-8') + subdepends+=('lib32-nettle>=3.3-2 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.71 lib32-llvm-libs>=3.9.0 lib32-libffi>=3.2.1-2 lib32-zlib>=1.2.8-8') subrodepends+=('') subgroups+=('lib32-extra') subarchs+=("${archs[*]}") subbackup+=('') - suboptions+=('force') + suboptions+=('') fi @@ -317,7 +317,7 @@ if Fuse VDPAU; then subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends+=('nettle>=3.2-2 libx11>=1.6.3-4 expat>=2.1.0-6 libdrm>=2.4.70-2 elfutils>=0.167-2 llvm-libs>=3.8.1-4 libffi>=3.2.1-2') + subdepends+=('nettle>=3.2-2 libx11>=1.6.3-4 expat>=2.1.0-6 libdrm>=2.4.70-2 elfutils>=0.167-2 llvm-libs>=3.9.0 libffi>=3.2.1-2') makedepends+=('libvdpau>=1.1.1-2') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') @@ -331,13 +331,13 @@ if Fuse VDPAU; then subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends+=('lib32-nettle>=3.3-2 lib32-libx11>=1.6.3-4 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70-2 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2') + subdepends+=('lib32-nettle>=3.3-2 lib32-libx11>=1.6.3-4 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70-2 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.9.0 lib32-libffi>=3.2.1-2') makedepends+=('lib32-libvdpau>=1.1.1-2') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') - suboptions+=('force') + suboptions+=('') fi @@ -347,7 +347,7 @@ if Fuse OSMESA; then subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends+=('nettle>=3.2-2 libx11>=1.6.3-4 expat>=2.1.0-6 libdrm>=2.4.70-2 elfutils>=0.167-2 llvm-libs>=3.8.1-4 libffi>=3.2.1-2') + subdepends+=('nettle>=3.2-2 libx11>=1.6.3-4 expat>=2.1.0-6 libdrm>=2.4.70-2 elfutils>=0.167-2 llvm-libs>=3.9.0 libffi>=3.2.1-2') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") @@ -359,12 +359,12 @@ if Fuse OSMESA; then subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends+=('lib32-nettle>=3.2-2 lib32-libx11>=1.6.3-4 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70-2 lib32-elfutils>=0.167-2 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2') + subdepends+=('lib32-nettle>=3.2-2 lib32-libx11>=1.6.3-4 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70-2 lib32-elfutils>=0.167-2 lib32-llvm-libs>=3.9.0 lib32-libffi>=3.2.1-2') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') - suboptions+=('force') + suboptions+=('') fi @@ -374,7 +374,7 @@ if Fuse VAAPI; then subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends+=('nettle>=3.2-2 libx11>=1.6.3-4 expat>=2.1.0-6 libdrm>=2.4.70-2 elfutils>=0.167-2 llvm-libs>=3.8.1-4 libffi>=3.2.1-2') + subdepends+=('nettle>=3.2-2 libx11>=1.6.3-4 expat>=2.1.0-6 libdrm>=2.4.70-2 elfutils>=0.167-2 llvm-libs>=3.9.0 libffi>=3.2.1-2') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") @@ -388,13 +388,13 @@ if Fuse VAAPI; then subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends+=('lib32-nettle>=3.3-2 lib32-libx11>=1.6.3-4 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70-2 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2') + subdepends+=('lib32-nettle>=3.3-2 lib32-libx11>=1.6.3-4 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70-2 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.9.0 lib32-libffi>=3.2.1-2') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') makedepends+=('libva>=1.7.1') - suboptions+=('force') + suboptions+=('') fi @@ -422,7 +422,7 @@ if Fuse WAYLAND_EGL; then subgroups=("${subgroups[@]}" ' lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') - suboptions+=('force') + suboptions+=('') fi @@ -432,7 +432,7 @@ if Fuse NINE; then subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends+=('nettle>=3.2-2 expat>=2.1.0-6 libdrm>=2.4.70 elfutils>=0.167-2 llvm-libs>=3.8.1-4 libffi>=3.2.1-2') + subdepends+=('nettle>=3.2-2 expat>=2.1.0-6 libdrm>=2.4.70 elfutils>=0.167-2 llvm-libs>=3.9.0 libffi>=3.2.1-2') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") @@ -444,12 +444,12 @@ if Fuse NINE; then subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends+=('lib32-nettle>=3.3-2 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2') + subdepends+=('lib32-nettle>=3.3-2 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.9.0 lib32-libffi>=3.2.1-2') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') - suboptions+=('force') + suboptions+=('') fi @@ -459,7 +459,7 @@ if Fuse OMX; then subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends+=('nettle>=3.2-2 libomxil-bellagio>=0.9.3-3 libx11>=1.6.3-4 expat>=2.1.0-6 libdrm>=2.4.70-2 elfutils>=0.167-2 llvm-libs>=3.8.1-4 libffi>=3.2.1-2') + subdepends+=('nettle>=3.2-2 libomxil-bellagio>=0.9.3-3 libx11>=1.6.3-4 expat>=2.1.0-6 libdrm>=2.4.70-2 elfutils>=0.167-2 llvm-libs>=3.9.0 libffi>=3.2.1-2') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") @@ -471,17 +471,41 @@ if Fuse OMX; then subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends+=('lib32-nettle>=3.3-2 lib32-libomxil-bellagio>=0.9.3-3 lib32-libx11>=1.6.3-4 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70-2 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.8.1-4 lib32-libffi>=3.2.1-2') + subdepends+=('lib32-nettle>=3.3-2 lib32-libomxil-bellagio>=0.9.3-3 lib32-libx11>=1.6.3-4 lib32-expat>=2.1.0-6 lib32-libdrm>=2.4.70-2 lib32-elfutils>=0.167-3 lib32-llvm-libs>=3.9.0 lib32-libffi>=3.2.1-2') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') - suboptions+=('force') + suboptions+=('') fi if Fuse VULKAN; then - subpkgs=("${subpkgs[@]}" 'mesa-vulkan') - subdescs=("${subdescs[@]}" 'Mesa Support for Vulkan') + subpkgs=("${subpkgs[@]}" 'mesa-vulkan-intel') + subdescs=("${subdescs[@]}" 'Intel Mesa Support for Vulkan') + subprovides=("${subprovides[@]}" 'mesa-vulkan') + subreplaces=("${subreplaces[@]}" 'mesa-vulkan') + subconflicts=("${subconflicts[@]}" 'mesa-vulkan') + subdepends+=('') + subrodepends=("${subrodepends[@]}" '') + subgroups=("${subgroups[@]}" 'x11') + subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') + suboptions+=('') + + subpkgs=("${subpkgs[@]}" 'lib32-mesa-vulkan-intel') + subdescs=("${subdescs[@]}" 'Intel Mesa Support for Vulkan (32-bit)') + subprovides=("${subprovides[@]}" 'lib32-mesa-vulkan') + subreplaces=("${subreplaces[@]}" 'lib32-mesa-vulkan') + subconflicts=("${subconflicts[@]}" 'lib32-mesa-vulkan') + subdepends+=('') + subrodepends=("${subrodepends[@]}" '') + subgroups=("${subgroups[@]}" 'lib32-extra') + subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') + suboptions+=('') + + subpkgs=("${subpkgs[@]}" 'mesa-vulkan-amd') + subdescs=("${subdescs[@]}" 'AMD Mesa Support for Vulkan') subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') @@ -490,10 +514,10 @@ if Fuse VULKAN; then subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') - suboptions+=('') + suboptions+=('') - subpkgs=("${subpkgs[@]}" 'lib32-mesa-vulkan') - subdescs=("${subdescs[@]}" 'Mesa Support for Vulkan (32-bit)') + subpkgs=("${subpkgs[@]}" 'lib32-mesa-vulkan-amd') + subdescs=("${subdescs[@]}" 'AMD Mesa Support for Vulkan (32-bit)') subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') @@ -502,7 +526,8 @@ if Fuse VULKAN; then subgroups=("${subgroups[@]}" 'lib32-extra') subarchs=("${subarchs[@]}" "${archs[*]}") subbackup=("${subbackup[@]}" '') - suboptions+=('force') + suboptions+=('') + fi if Fuse DETECTDEPENDS; then @@ -629,9 +654,8 @@ if Fuse OMX; then Fconfopts+=" --enable-omx" fi -## TODO: amdgpu but this need LLVM >=3.9 if Fuse VULKAN; then - Fconfopts+=" --with-vulkan-drivers=intel" + Fconfopts+=" --with-vulkan-drivers=intel,radeon" fi build() { @@ -656,7 +680,7 @@ build() { Fsplit lib32-libgl usr/lib32/libGL.\* Fsplit lib32-libgl usr/lib32/pkgconfig/gl.pc - Fsplit lib32-mesa-libgl-headers usr/i686-frugalware-linux/include/GL/{gl.h,glext.h,glx.h,glxext.h,glx_mangle.h,mesa_glinterop.h,wglext.h,glcorearb.h,gl_mangle.h} + Fsplit lib32-mesa-libgl-headers usr/i686-frugalware-linux/include/GL/{gl.h,glext.h,glx.h,glxext.h,glx_mangle.h,glcorearb.h,gl_mangle.h} Fsplit lib32-mesa-libgl-headers usr/i686-frugalware-linux/include/GL/internal # Must be before mesa-dri-drivers @@ -690,8 +714,12 @@ build() { fi if Fuse VULKAN; then - Fsplit lib32-mesa-vulkan usr/i686-frugalware-linux/include/vulkan - Fsplit lib32-mesa-vulkan usr/lib32/libvulkan* + Fsplit lib32-mesa-vulkan-amd usr/lib32/libvulkan_radeon* + Fsplit lib32-mesa-vulkan-amd usr/share/vulkan/icd.d/radeon_icd*.json + + Fsplit lib32-mesa-vulkan-intel usr/i686-frugalware-linux/include/vulkan/vulkan_intel.h + Fsplit lib32-mesa-vulkan-intel usr/lib32/libvulkan* + Fsplit lib32-mesa-vulkan-intel usr/share/vulkan/icd.d/intel_icd*.json fi if Fuse OSMESA; then @@ -747,7 +775,7 @@ build() { Fsplit libgl usr/lib/libGL.* Fsplit libgl usr/lib/pkgconfig/gl.pc - Fsplit mesa-libgl-headers usr/include/GL/{gl.h,glext.h,glx.h,glxext.h,glx_mangle.h,mesa_glinterop.h,wglext.h,glcorearb.h,gl_mangle.h} + Fsplit mesa-libgl-headers usr/include/GL/{gl.h,glext.h,glx.h,glxext.h,glx_mangle.h,glcorearb.h,gl_mangle.h} Fsplit mesa-libgl-headers usr/include/GL/internal # Must be before mesa-dri-drivers @@ -815,9 +843,13 @@ build() { fi if Fuse VULKAN; then - Fsplit mesa-vulkan usr/include/vulkan - Fsplit mesa-vulkan usr/lib/libvulkan* - Fsplit mesa-vulkan usr/share/vulkan/ + Fsplit mesa-vulkan-amd usr/lib/libvulkan_radeon* + Fsplit mesa-vulkan-amd usr/share/vulkan/icd.d/radeon_icd*.json + + Fsplit mesa-vulkan-intel usr/include/vulkan + Fsplit mesa-vulkan-intel usr/lib/libvulkan* + Fsplit mesa-vulkan-intel usr/share/vulkan/icd.d/intel_icd*.json + fi # empty dirs diff --git a/source/x11/mesa/add_host_suffix_to_radeon_icd.patch b/source/x11/mesa/add_host_suffix_to_radeon_icd.patch new file mode 100644 index 0000000..18d0473 --- /dev/null +++ b/source/x11/mesa/add_host_suffix_to_radeon_icd.patch @@ -0,0 +1,78 @@ +From 0f434a68a39f391795dff92c317349d28dd2e638 Mon Sep 17 00:00:00 2001 +From: Emil Velikov <[email protected]> +Date: Wed, 9 Nov 2016 18:11:27 +0000 +Subject: radv: Suffix the radeon_icd file with the host CPU +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Port of the anv commit d96345de989 ("anv: Suffix the intel_icd file with +the host CPU"). + +v2: s/intel_icd/radeon_icd/ in commit summary (Gražvydas) + +Cc: "13.0" <[email protected]> +Signed-off-by: Emil Velikov <[email protected]> +Reviewed-by: Dave Airlie <[email protected]> (IRC) + +diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am +index 44d2a66..190be8d 100644 +--- a/src/amd/vulkan/Makefile.am ++++ b/src/amd/vulkan/Makefile.am +@@ -131,7 +131,7 @@ vk_format_table.c: vk_format_table.py \ + $(PYTHON2) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@ + + BUILT_SOURCES = $(VULKAN_GENERATED_FILES) +-CLEANFILES = $(BUILT_SOURCES) dev_icd.json radv_timestamp.h ++CLEANFILES = $(BUILT_SOURCES) dev_icd.json radeon_icd.@[email protected] + EXTRA_DIST = \ + $(top_srcdir)/include/vulkan/vk_icd.h \ + dev_icd.json.in \ +@@ -155,7 +155,7 @@ libvulkan_radeon_la_LDFLAGS = \ + + + icdconfdir = @VULKAN_ICD_INSTALL_DIR@ +-icdconf_DATA = radeon_icd.json ++icdconf_DATA = radeon_icd.@[email protected] + # The following is used for development purposes, by setting VK_ICD_FILENAMES. + noinst_DATA = dev_icd.json + +@@ -164,4 +164,9 @@ dev_icd.json : dev_icd.json.in + -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ + < $(srcdir)/dev_icd.json.in > $@ + ++radeon_icd.@[email protected] : radeon_icd.json.in ++ $(AM_V_GEN) $(SED) \ ++ -e "s#@install_libdir@#${libdir}#" \ ++ < $(srcdir)/radeon_icd.json.in > $@ ++ + include $(top_srcdir)/install-lib-links.mk +diff --git a/src/amd/vulkan/radeon_icd.json b/src/amd/vulkan/radeon_icd.json +deleted file mode 100644 +index cbb4aab..0000000 +--- a/src/amd/vulkan/radeon_icd.json ++++ /dev/null +@@ -1,7 +0,0 @@ +-{ +- "file_format_version": "1.0.0", +- "ICD": { +- "library_path": "libvulkan_radeon.so", +- "api_version": "1.0.3" +- } +-} +diff --git a/src/amd/vulkan/radeon_icd.json.in b/src/amd/vulkan/radeon_icd.json.in +new file mode 100644 +index 0000000..a8b441d +--- /dev/null ++++ b/src/amd/vulkan/radeon_icd.json.in +@@ -0,0 +1,7 @@ ++{ ++ "file_format_version": "1.0.0", ++ "ICD": { ++ "library_path": "@install_libdir@/libvulkan_radeon.so", ++ "api_version": "1.0.3" ++ } ++} +-- +cgit v0.10.2 +
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
