From 8e1a1df2220dc767925557b454cde117fa009a25 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 31 Mar 2017 04:55:36 -0400 Subject: Have [libre/mesa] more closely reflect Arch's mesa, re-add [pcr/mesa] fixup mesa --- libre/mesa/PKGBUILD | 217 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 128 insertions(+), 89 deletions(-) (limited to 'libre/mesa/PKGBUILD') diff --git a/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD index ca678522c..a2752002d 100644 --- a/libre/mesa/PKGBUILD +++ b/libre/mesa/PKGBUILD @@ -1,32 +1,73 @@ # Maintainer (Arch): Jan de Groot # Maintainer (Arch): Andreas Radke # Maintainer: Márcio Silva +# Contributor: Luke Shumaker + +# Some short notes on package names +# +# The general notion of graphics APIs is that there is one loader +# package that programs depend on; the loader package depends on a +# psuedo-package that is provided by any number of driver packages. +# +# One software $VENDOR may support multiple hardware $FAMILYs. The +# driver package name is just convention. +# +# Loader-package : Pseudo-package : Driver-package : Provided files +# ------------------:----------------:----------------------:-------------------------------------------------- +# ocl-icd : opencl-driver : opencl-$VENDOR : /etc/OpenCL/vendors/$VENDOR.icd +# vulkan-icd-loader : vulkan-driver : vulkan-$FAMILY : /usr/share/vulkan/icd.d/${FAMILY}_icd.$CARCH.json +# libglvnd : opengl-driver : (mesa) : /usr/lib/libGLX_${VENDOR}.so libEGL_${VENDOR}.so +# libva : : libva-$VENDOR-driver : /usr/lib/dri/${FAMILY}_drv_video.so +# libvdpau : : (mesa-vdpau) : /usr/lib/vdpau/libvdpau_${FAMILY}.so +# xorg-server : : (mesa) : /usr/lib/xorg/modules/dri/${FAMILY}_dri.so +# +# libca, libvdpau, and Xorg DRI don't have a pseudo-package name +# because the loader package ships with a default implementation; +# whereas ocl-icd, vulkan-icd-loader, and libglvnd are useless without +# an external backend. +# +# Historically, it was the convention that the Xorg DRI provider was +# named "$FAMILY-dri", or "$VENDOR-dri", but this has fallen out of +# style. However, for historical compatibility, providing packages +# might provide "$VENDOR-dri" packages for packages that used to +# exist. + +# XXX: We --enable-lmsensors, while Arch/ALARM mesa does not. Is +# there a reason for this? pkgbase=mesa -pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' - 'mesa-libgl' 'vulkan-radeon') -[[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]] && pkgname+=('vulkan-intel') +pkgname=("opencl-${pkgbase}" "vulkan-radeon${pkgbase#mesa}" "libva-${pkgbase}-driver" "${pkgbase}-vdpau" "${pkgbase}") +case "$CARCH" in + x86_64|i686) pkgname+=("vulkan-intel${pkgbase#mesa}");; +esac pkgver=17.0.2 -pkgrel=2.parabola4 +pkgrel=3.parabola1 arch=('i686' 'x86_64' 'armv7h') makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm' - 'libomxil-bellagio' 'libclc' 'clang' 'lm_sensors') + 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd') +makedepends+=('lm_sensors') url="http://mesa3d.sourceforge.net" license=('custom') source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} LICENSE + drirc remove-libpthread-stubs.patch + 0001-EGL-Implement-the-libglvnd-interface-for-EGL-v2.patch 0001-Fix-linkage-against-shared-glapi.patch 0001-glapi-Link-with-glapi-when-built-shared.patch - drirc) + 0002-fixup-EGL-Implement-the-libglvnd-interface-for-EGL-v.patch + glvnd-fix-gl-dot-pc.patch) sha256sums=('f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4' 'SKIP' '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' + '2cc6f40076e07a2d4769557c1aa40e5b6fbbb59c38e551c1a1997ef0d3f3c5f2' '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f' + '1d3475dc2f4f3e450cf313130d3ce965f933f396058828fa843c0df8115feeb9' 'c68d1522f9bce4ce31c92aa7a688da49f13043f5bb2254795b76dea8f47130b7' '064dcd5a3ab1b7c23383e2cafbd37859e4c353f8839671d9695c6f7c2ef3260b' - '2cc6f40076e07a2d4769557c1aa40e5b6fbbb59c38e551c1a1997ef0d3f3c5f2') + '81d0ced62f61677ea0cf5f69a491093409fa1370f2ef045c41106ca8bf9c46f6' + '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov prepare() { @@ -34,8 +75,13 @@ prepare() { # Now mesa checks for libpthread-stubs - so remove the check patch -Np1 -i ../remove-libpthread-stubs.patch - + + # glvnd support patches - from Fedora + # https://patchwork.freedesktop.org/series/12354/, v3 & v4 + patch -Np1 -i ../0001-EGL-Implement-the-libglvnd-interface-for-EGL-v2.patch + patch -Np1 -i ../0002-fixup-EGL-Implement-the-libglvnd-interface-for-EGL-v.patch # non-upstreamed ones + patch -Np1 -i ../glvnd-fix-gl-dot-pc.patch patch -Np1 -i ../0001-Fix-linkage-against-shared-glapi.patch patch -Np1 -i ../0001-glapi-Link-with-glapi-when-built-shared.patch @@ -43,22 +89,33 @@ prepare() { } build() { - # copy source to build mesa-libcl-icd package - cp -a ${srcdir}/{mesa,opencl}-${pkgver} - cd ${srcdir}/mesa-${pkgver} - # softpipe,llvmpipe - if [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]]; then - DRI=i915,i965,r200,radeon,nouveau,swrast - GALLIUM=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr - VULKAN=intel,radeon - elif [[ "${CARCH}" = 'armv7h' ]]; then - DRI=r200,radeon,nouveau,swrast - GALLIUM=freedreno,etnaviv,vc4,imx,r300,r600,radeonsi,nouveau,svga,swrast,virgl - VULKAN=radeon - fi - + case "$CARCH" in + x86_64|i686) + # XXX: We enable the 'swr' Gallium driver, while Arch does not. + # Why? + GALLIUM=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr + DRI=i915,i965,r200,radeon,nouveau,swrast + VULKAN=intel,radeon + ;; + armv7h) + # XXX: We enable the 'svga', 'r300', 'r600', and 'radionsi' + # Gallium drivers, while ALARM does not. Why? + GALLIUM=freedreno,nouveau,swrast,virgl,vc4,etnaviv,imx,svga,r300,r600,radeonsi + # XXX: We enable the 'r200' and 'radeon' DRI drivers, while + # ALARM does not. Why? + DRI=r200,radeon,nouveau,swrast + # XXX: We enable the 'radeon' Vulkan driver, while ALARM does + # not. Why? + VULKAN=radeon + ;; + esac + + # XXX: We ---enable-gallium-extra-hud, while Arch/ALARM mesa does + # not. Why? + # + # NB: ALARM builds mesa without xa, vdpau, or opencl. ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ @@ -70,7 +127,7 @@ build() { --enable-gallium-llvm \ --enable-llvm-shared-libs \ --enable-shared-glapi \ - --disable-libglvnd \ + --enable-libglvnd \ --enable-egl \ --enable-glx \ --enable-glx-tls \ @@ -89,6 +146,7 @@ build() { --enable-gallium-extra-hud \ --enable-lmsensors \ --with-clang-libdir=/usr/lib + #--with-sha1=libgcrypt \ make @@ -99,21 +157,20 @@ build() { package_opencl-mesa() { pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" - depends=('ocl-icd' 'expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors') + depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang') + depends+=('lm_sensors') optdepends=('opencl-headers: headers necessary for OpenCL development') provides=('opencl-driver') - conflicts=('opencl-nvidia' 'opencl-nvidia-340xx' 'opencl-nvidia-304xx' 'opencl-catalyst') - replaces=('opencl-nvidia' 'opencl-nvidia-340xx' 'opencl-nvidia-304xx' 'opencl-catalyst') install -m755 -d ${pkgdir}/etc cp -rv ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/ - + install -m755 -d ${pkgdir}/usr/lib/gallium-pipe - cp -rv ${srcdir}/fakeinstall/usr/lib/libMesaOpenCL* ${pkgdir}/usr/lib/ + cp -rv ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/ cp -rv ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so ${pkgdir}/usr/lib/gallium-pipe/ - install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/" + install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" } package_vulkan-intel() { @@ -122,87 +179,79 @@ package_vulkan-intel() { provides=('vulkan-driver') install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d - cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ + mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ install -m755 -d ${pkgdir}/usr/{include/vulkan,lib} - cp -rv ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/ - cp -rv ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan + mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/ + mv -v ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan - install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-intel" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/" + install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" } package_vulkan-radeon() { pkgdesc="Radeon's Vulkan mesa driver" depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs') provides=('vulkan-driver') - + install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d - cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ + mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ install -m755 -d ${pkgdir}/usr/lib - cp -rv ${srcdir}/fakeinstall/usr/lib/libvulkan_radeon.so ${pkgdir}/usr/lib/ + mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_radeon.so ${pkgdir}/usr/lib/ - install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-radeon" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-radeon/" + install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" } package_libva-mesa-driver() { pkgdesc="VA-API implementation for gallium" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors') + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence') + depends+=('lm_sensors') install -m755 -d ${pkgdir}/usr/lib cp -rv ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib - - install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/" + + install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" } package_mesa-vdpau() { pkgdesc="Mesa VDPAU drivers" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors') + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence') + depends+=('lm_sensors') install -m755 -d ${pkgdir}/usr/lib cp -rv ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/" + + install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" } package_mesa() { pkgdesc="A free implementation of the OpenGL specification" depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' - 'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs' 'mesa-libgl' 'lm_sensors') + 'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs' 'libglvnd') + depends+=('lm_sensors') optdepends=('opengl-man-pages: for the OpenGL API man pages' - 'mesa-vdpau: for accelerated video playback' - 'libva-mesa-driver: for accelerated video playback') - if [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]]; then - provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'opengl-driver') - conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' - 'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils') - replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' - 'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils') - elif [[ "${CARCH}" = 'armv7h' ]]; then - provides=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' 'opengl-driver') - conflicts=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' - 'nvidia-utils' 'catalyst-utils') - replaces=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' - 'nvidia-utils' 'catalyst-utils') - fi + "$pkgbase-vdpau: for accelerated video playback" + "libva-$pkgbase-driver: for accelerated video playback") + # The "$FAMILY-dri" bits are for historical compatibility, the list + # of DRI families provided does not need to be updated. + provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl' 'opengl-driver') + conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl') + replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl') install -m755 -d ${pkgdir}/etc cp -rv ${srcdir}/drirc ${pkgdir}/etc + + install -m755 -d ${pkgdir}/usr/share/glvnd/egl_vendor.d + cp -rv ${srcdir}/fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json ${pkgdir}/usr/share/glvnd/egl_vendor.d/ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast cp -av ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri - + cp -rv ${srcdir}/fakeinstall/usr/lib/bellagio ${pkgdir}/usr/lib cp -rv ${srcdir}/fakeinstall/usr/lib/d3d ${pkgdir}/usr/lib cp -rv ${srcdir}/fakeinstall/usr/lib/lib{gbm,glapi}.so* ${pkgdir}/usr/lib/ @@ -212,26 +261,16 @@ package_mesa() { cp -rv ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr cp -rv ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/ - + # remove vulkan headers rm -rf ${pkgdir}/usr/include/vulkan - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} - -package_mesa-libgl() { - pkgdesc="Mesa 3-D graphics library" - depends=('libdrm' 'libxdamage' 'libxshmfence' 'libxxf86vm' 'wayland') - provides=('libgl' 'libegl' 'libgles' 'libglvnd') - conflicts=('libglvnd' 'nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl') - replaces=('libglvnd' 'nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl') - - install -m755 -d "${pkgdir}/usr/lib/" - cp -rv ${srcdir}/fakeinstall/usr/lib/libGL.so* ${pkgdir}/usr/lib/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL.so* ${pkgdir}/usr/lib/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libGLES*.so* ${pkgdir}/usr/lib/ + # libglvnd support + cp -rv ${srcdir}/fakeinstall/usr/lib/libGLX_mesa.so* ${pkgdir}/usr/lib/ + cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL_mesa.so* ${pkgdir}/usr/lib/ + # indirect rendering + ln -s /usr/lib/libGLX_mesa.so.0 ${pkgdir}/usr/lib/libGLX_indirect.so.0 - install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/" + install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" } -- cgit v1.2.3