diff options
| -rw-r--r-- | pcr/mesa-vanilla/PKGBUILD | 262 | ||||
| -rw-r--r-- | ~coadde/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch | 26 | ||||
| -rw-r--r-- | ~coadde/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch | 82 | ||||
| -rw-r--r-- | ~coadde/mesa-vanilla/LICENSE | 82 | ||||
| -rw-r--r-- | ~coadde/mesa-vanilla/PKGBUILD | 261 | ||||
| -rw-r--r-- | ~coadde/mesa-vanilla/drirc | 18 | ||||
| -rw-r--r-- | ~coadde/mesa-vanilla/remove-libpthread-stubs.patch | 13 |
7 files changed, 109 insertions, 635 deletions
diff --git a/pcr/mesa-vanilla/PKGBUILD b/pcr/mesa-vanilla/PKGBUILD index 28714d962..c928211a7 100644 --- a/pcr/mesa-vanilla/PKGBUILD +++ b/pcr/mesa-vanilla/PKGBUILD @@ -1,57 +1,17 @@ -# Maintainer (Arch): Jan de Groot <jgc@archlinux.org> -# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> # Maintainer: Márcio Silva <coadde@parabola.nu> -# Contributor: Luke Shumaker <lukeshu@parabola.nu> - -# 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. -# -# Because this package is refusing to apply libglvnd support patches -# to mesa, "libglvnd" is replaced by "mesa-libgl", which is very -# similar, but is unable to load any opengl-driver other than mesa. - -# XXX: We --enable-lmsensors, while Arch/ALARM mesa does not. Is -# there a reason for this? - -pkgbase=mesa-vanilla -pkgname=("opencl-${pkgbase}" "vulkan-radeon${pkgbase#mesa}" "libva-${pkgbase}-driver" "${pkgbase}-vdpau" "${pkgbase}") -pkgname+=("${pkgbase}-libgl") -case "$CARCH" in - x86_64|i686) pkgname+=("vulkan-intel${pkgbase#mesa}");; -esac + +# Based on mesa package from Arch and Arch ARM + +pkgbase=mesa +pkgname=('opencl-mesa-vanilla' 'libva-mesa-driver-vanilla' 'mesa-vdpau-vanilla' 'mesa-vanilla' + 'mesa-libgl-vanilla' 'vulkan-radeon-vanilla') +[[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]] && pkgname+=('vulkan-intel-vanilla') pkgver=17.0.2 -pkgrel=3.parabola2 +pkgrel=2 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') -makedepends+=('lm_sensors') + 'libomxil-bellagio' 'libclc' 'clang' 'lm_sensors') # Implement 'lm_sensors' extra functionality, for i2c on video drivers url="http://mesa3d.sourceforge.net" license=('custom') source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} @@ -75,7 +35,7 @@ prepare() { # Now mesa checks for libpthread-stubs - so remove the check patch -Np1 -i ../remove-libpthread-stubs.patch - # I'm not sure if these are nescessary for non-libglvnd builds + # non-upstreamed ones patch -Np1 -i ../0001-Fix-linkage-against-shared-glapi.patch patch -Np1 -i ../0001-glapi-Link-with-glapi-when-built-shared.patch @@ -83,33 +43,37 @@ prepare() { } build() { + # copy source to build mesa-libcl-icd package + cp -a ${srcdir}/{mesa,opencl}-${pkgver} + cd ${srcdir}/mesa-${pkgver} - 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. + # softpipe,llvmpipe + if [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]]; then + DRI=i915,i965,r200,radeon,nouveau,swrast + # Implement 'swr' (OpenSWR) software driver (only support x86 hardware with AVX extension, see: http://openswr.org/) + GALLIUM=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr + VULKAN=intel,radeon + elif [[ "${CARCH}" = 'armv7h' ]]; then + DRI=r200,radeon,nouveau,swrast + # Implement PCI and PCI-e drivers, due some ARM hardware does suport PCI and PCIe drivers, see: + https://lwn.net/Articles/586802/ + https://www.linaro.org/blog/core-dump/kvm-pciemsi-passthrough-armarm64/ + # nVidia, are avaliable on Tegra hardware and AMD will support K12 hardware, see: + https://en.wikipedia.org/wiki/Tegra + https://en.wikipedia.org/wiki/AMD_K12 + GALLIUM=freedreno,etnaviv,vc4,imx,r300,r600,radeonsi,nouveau,svga,swrast,virgl + VULKAN=radeon + fi + + # Implement 'gallium-extra-hud' extra functionality + # Implement opencl/vaapi/vdpau/xa on ARM archictecture, does support it and easy to maintain the PKGBUILD + ARM archictecture support PCI and PCIe drivers, see: + https://lwn.net/Articles/586802/ + https://www.linaro.org/blog/core-dump/kvm-pciemsi-passthrough-armarm64/ + Some ARM video drivers like freedreno/nouveau does support OpenCL, see: + Mali (Lima) : https://en.wikipedia.org/wiki/Mali_(GPU)#Variants + Adreno (Freedreno, is not avaliable on mesa) : https://en.wikipedia.org/wiki/Adreno#Variants ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ @@ -140,7 +104,6 @@ build() { --enable-gallium-extra-hud \ --enable-lmsensors \ --with-clang-libdir=/usr/lib - #--with-sha1=libgcrypt \ make @@ -151,114 +114,111 @@ build() { package_opencl-mesa-vanilla() { pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" - depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang') - depends+=('lm_sensors') + depends=('mesa-vanilla' 'opencl-icd-loader' 'expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors') optdepends=('opencl-headers: headers necessary for OpenCL development') provides=('opencl-driver') - - pkgdesc+=" (without libglvnd patches)" - provides+=("${pkgname%$suffix}=$pkgver") - conflicts+=("${pkgname%$suffix}") + conflicts=('opencl-mesa' '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/lib*OpenCL* ${pkgdir}/usr/lib/ + cp -rv ${srcdir}/fakeinstall/usr/lib/libMesaOpenCL* ${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/$pkgname" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" + install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/" } package_vulkan-intel-vanilla() { pkgdesc="Intel's Vulkan mesa driver" - depends=('wayland' 'libx11' 'libxshmfence') + depends=('mesa-vanilla' 'wayland' 'libx11' 'libxshmfence') provides=('vulkan-driver') - - pkgdesc+=" (without libglvnd patches)" - provides+=("${pkgname%$suffix}=$pkgver") - conflicts+=("${pkgname%$suffix}") + conflicts=('vulkan-intel') install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d - mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ + cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ install -m755 -d ${pkgdir}/usr/{include/vulkan,lib} - 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 + 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 - install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" + install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-intel" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/" } package_vulkan-radeon-vanilla() { pkgdesc="Radeon's Vulkan mesa driver" - depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs') + depends=('mesa-vanilla' 'wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs') provides=('vulkan-driver') - - pkgdesc+=" (without libglvnd patches)" - provides+=("${pkgname%$suffix}=$pkgver") - conflicts+=("${pkgname%$suffix}") + conflicts=('vulkan-radeon') install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d - mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ + cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ install -m755 -d ${pkgdir}/usr/lib - mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_radeon.so ${pkgdir}/usr/lib/ + cp -rv ${srcdir}/fakeinstall/usr/lib/libvulkan_radeon.so ${pkgdir}/usr/lib/ - install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" + install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-radeon" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-radeon/" } -package_libva-mesa-vanilla-driver() { +package_libva-mesa-driver-vanilla() { pkgdesc="VA-API implementation for gallium" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence') - depends+=('lm_sensors') - - pkgdesc+=" (without libglvnd patches)" - provides+=("${pkgname%$suffix}=$pkgver") - conflicts+=("${pkgname%$suffix}") + depends=('mesa-vanilla' 'libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors') + conflicts=('libva-mesa-driver') install -m755 -d ${pkgdir}/usr/lib cp -rv ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib - - install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" + + install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/" } -package_mesa-vanilla-vdpau() { +package_mesa-vdpau-vanilla() { pkgdesc="Mesa VDPAU drivers" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence') - depends+=('lm_sensors') - - pkgdesc+=" (without libglvnd patches)" - provides+=("${pkgname%$suffix}=$pkgver") - conflicts+=("${pkgname%$suffix}") + depends=('mesa-vanilla' 'libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors') + conflicts=('mesa-vdpau') install -m755 -d ${pkgdir}/usr/lib cp -rv ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib - - install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/" } package_mesa-vanilla() { pkgdesc="A free implementation of the OpenGL specification" depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' - 'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs' "$pkgbase-libgl") - depends+=('lm_sensors') + 'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs' 'mesa-libgl-vanilla' 'lm_sensors') optdepends=('opengl-man-pages: for the OpenGL API man pages' - "$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') - conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') - replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') - - pkgdesc+=" (without libglvnd patches)" - provides+=("${pkgname%$suffix}=$pkgver") - conflicts+=("${pkgname%$suffix}") + 'mesa-vdpau: for accelerated video playback' + 'libva-mesa-driver: for accelerated video playback') + provides_x86_64=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'opengl-driver') + conflicts_x86_64=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'mesa' + 'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils') + replaces_x86_64=('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') + provides_i686=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'opengl-driver') + conflicts_i686=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'mesa' + 'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils') + replaces_i686=('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') + provides_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' 'opengl-driver') + conflicts_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' 'mesa' + 'nvidia-utils' 'catalyst-utils') + replaces_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' + 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' + 'nvidia-utils' 'catalyst-utils') install -m755 -d ${pkgdir}/etc cp -rv ${srcdir}/drirc ${pkgdir}/etc @@ -266,7 +226,7 @@ package_mesa-vanilla() { 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/ @@ -276,30 +236,26 @@ package_mesa-vanilla() { 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/$pkgname" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" + install -m755 -d "${pkgdir}/usr/share/licenses/mesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" } -package_mesa-vanilla-libgl() { +package_mesa-libgl-vanilla() { pkgdesc="Mesa 3-D graphics library" - depends=("$pkgbase") - provides=('libgl' 'libegl' 'libgles') - conflicts=('libgl' 'libegl' 'libgles') - - pkgdesc+=" (without libglvnd patches)" - provides+=("${pkgname%$suffix}=$pkgver") - conflicts+=("${pkgname%$suffix}") - replaces=('mesa-libgl') # A hack to make -Syu from the vanilla libre/mesa work + depends=('libdrm' 'libxdamage' 'libxshmfence' 'libxxf86vm' 'wayland') + provides=('libgl' 'libegl' 'libgles' 'mesa-libgl' 'libglvnd') + conflicts=('mesa-libgl' 'libglvnd' 'nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl') + replaces=('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/ - install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/" + install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/" } diff --git a/~coadde/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch b/~coadde/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch deleted file mode 100644 index 7f8f7164c..000000000 --- a/~coadde/mesa-vanilla/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/~coadde/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch b/~coadde/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch deleted file mode 100644 index 376828e67..000000000 --- a/~coadde/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 16875ea5b9170f2213fd486d763f27a9d6dfc1b5 Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet <kwizart@gmail.com> -Date: Tue, 25 Oct 2016 09:35:13 +0200 -Subject: [PATCH 1/3] glapi: Link with glapi when built shared - -This patch explicitly links to libglapi when built shared. -This was specially needed to avoid undefined non-weak-symbol as shown -with: - -ldd -r /usr/lib64/dri/i915_dri.so - linux-vdso.so.1 (0x00007fff821f4000) - libdrm_intel.so.1 => /lib64/libdrm_intel.so.1 (0x00007f6adf2c7000) - libdrm_nouveau.so.2 => /lib64/libdrm_nouveau.so.2 (0x00007f6adf0be000) - libdrm_radeon.so.1 => /lib64/libdrm_radeon.so.1 (0x00007f6adeeb2000) - libselinux.so.1 => /lib64/libselinux.so.1 (0x00007f6adec8b000) - libdrm.so.2 => /lib64/libdrm.so.2 (0x00007f6adea7c000) - libexpat.so.1 => /lib64/libexpat.so.1 (0x00007f6ade84f000) - libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f6ade633000) - libdl.so.2 => /lib64/libdl.so.2 (0x00007f6ade42f000) - libm.so.6 => /lib64/libm.so.6 (0x00007f6ade125000) - libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007f6addf0e000) - libc.so.6 => /lib64/libc.so.6 (0x00007f6addb4c000) - /lib64/ld-linux-x86-64.so.2 (0x000056274e913000) - libpciaccess.so.0 => /lib64/libpciaccess.so.0 (0x00007f6add941000) - libpcre.so.1 => /lib64/libpcre.so.1 (0x00007f6add6ce000) -undefined symbol: _glapi_get_dispatch_table_size (/usr/lib64/dri/i915_dri.so) -undefined symbol: _glapi_get_context (/usr/lib64/dri/i915_dri.so) -undefined symbol: _glapi_add_dispatch (/usr/lib64/dri/i915_dri.so) -undefined symbol: _glapi_check_multithread (/usr/lib64/dri/i915_dri.so) -undefined symbol: _glapi_tls_Context (/usr/lib64/dri/i915_dri.so) -undefined symbol: _glapi_set_context (/usr/lib64/dri/i915_dri.so) -undefined symbol: _glapi_set_dispatch (/usr/lib64/dri/i915_dri.so) -undefined symbol: _glapi_tls_Dispatch (/usr/lib64/dri/i915_dri.so) - -v3: Add gallium counterpart for radeon cases -Reported-by: Jonathan Dieter <jdieter@lesbg.com> - -v2: Add Bugzilla and Signed-off - -Fixes: 0cbc90c57c ("mesa: dri: Add shared glapi to LIBADD on Android") -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98428 -Signed-off-by: Nicolas Chauvet <kwizart@gmail.com> ---- - src/gallium/targets/dri/Makefile.am | 2 -- - src/mesa/drivers/dri/Makefile.am | 3 --- - 2 files changed, 5 deletions(-) - -diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am -index bca747f..05f6c8c 100644 ---- a/src/gallium/targets/dri/Makefile.am -+++ b/src/gallium/targets/dri/Makefile.am -@@ -1,10 +1,8 @@ - include $(top_srcdir)/src/gallium/Automake.inc - --if HAVE_ANDROID - if HAVE_SHARED_GLAPI - SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la - endif --endif - - AM_CFLAGS = \ - -I$(top_srcdir)/src/mapi \ -diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am -index 1c6dd08..8e68fc0 100644 ---- a/src/mesa/drivers/dri/Makefile.am -+++ b/src/mesa/drivers/dri/Makefile.am -@@ -6,12 +6,9 @@ MEGADRIVERS_DEPS = - - SUBDIRS+=common - --# On Android, we need to explicitly link to libglapi.so. --if HAVE_ANDROID - if HAVE_SHARED_GLAPI - SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la - endif --endif - - if HAVE_I915_DRI - SUBDIRS += i915 --- -2.7.4 - diff --git a/~coadde/mesa-vanilla/LICENSE b/~coadde/mesa-vanilla/LICENSE deleted file mode 100644 index ae33d2709..000000000 --- a/~coadde/mesa-vanilla/LICENSE +++ /dev/null @@ -1,82 +0,0 @@ -Disclaimer - -Mesa is a 3-D graphics library with an API which is very similar to -that of OpenGL* -To the extent that Mesa utilizes the OpenGL command syntax or state -machine, it is being used with authorization from Silicon Graphics, -Inc.(SGI). However, the author does not possess an OpenGL license -from SGI, and makes no claim that Mesa is in any way a compatible -replacement for OpenGL or associated with SGI. Those who want a -licensed implementation of OpenGL should contact a licensed -vendor. - -Please do not refer to the library as MesaGL (for legal -reasons). It's just Mesa or The Mesa 3-D graphics -library - -* OpenGL is a trademark of Silicon Graphics Incorporated. - -License / Copyright Information - -The Mesa distribution consists of several components. Different copyrights -and licenses apply to different components. For example, GLUT is copyrighted -by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa -device drivers are copyrighted by their authors. See below for a list of -Mesa's main components and the license for each. - -The core Mesa library is licensed according to the terms of the MIT license. -This allows integration with the XFree86, Xorg and DRI projects. - -The default Mesa license is as follows: - -Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Attention, Contributors - -When contributing to the Mesa project you must agree to the licensing terms -of the component to which you're contributing. -The following section lists the primary components of the Mesa distribution -and their respective licenses. - - -Mesa Component Licenses - -Component Location Primary Author License ----------------------------------------------------------------------------- -Main Mesa code src/mesa/ Brian Paul Mesa (MIT) - -Device drivers src/mesa/drivers/* See drivers See drivers - -Ext headers include/GL/glext.h SGI SGI Free B - include/GL/glxext.h - -GLUT src/glut/ Mark Kilgard Mark's copyright - -Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL - -SGI GLU library src/glu/sgi/ SGI SGI Free B - -demo programs progs/demos/ various see source files - -X demos progs/xdemos/ Brian Paul see source files - -SGI demos progs/samples/ SGI SGI copyright - -RedBook demos progs/redbook/ SGI SGI copyright diff --git a/~coadde/mesa-vanilla/PKGBUILD b/~coadde/mesa-vanilla/PKGBUILD deleted file mode 100644 index ad64e2742..000000000 --- a/~coadde/mesa-vanilla/PKGBUILD +++ /dev/null @@ -1,261 +0,0 @@ -# Maintainer: Márcio Silva <coadde@parabola.nu> - -# Based on mesa package from Arch and Arch ARM - -pkgbase=mesa -pkgname=('opencl-mesa-vanilla' 'libva-mesa-driver-vanilla' 'mesa-vdpau-vanilla' 'mesa-vanilla' - 'mesa-libgl-vanilla' 'vulkan-radeon-vanilla') -[[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]] && pkgname+=('vulkan-intel-vanilla') -pkgver=17.0.2 -pkgrel=2 -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') # Implement 'lm_sensors' extra functionality, for i2c on video drivers -url="http://mesa3d.sourceforge.net" -license=('custom') -source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} - LICENSE - remove-libpthread-stubs.patch - 0001-Fix-linkage-against-shared-glapi.patch - 0001-glapi-Link-with-glapi-when-built-shared.patch - drirc) -sha256sums=('f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4' - 'SKIP' - '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' - '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f' - 'c68d1522f9bce4ce31c92aa7a688da49f13043f5bb2254795b76dea8f47130b7' - '064dcd5a3ab1b7c23383e2cafbd37859e4c353f8839671d9695c6f7c2ef3260b' - '2cc6f40076e07a2d4769557c1aa40e5b6fbbb59c38e551c1a1997ef0d3f3c5f2') -validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> - -prepare() { - cd ${srcdir}/mesa-${pkgver} - - # Now mesa checks for libpthread-stubs - so remove the check - patch -Np1 -i ../remove-libpthread-stubs.patch - - # non-upstreamed ones - patch -Np1 -i ../0001-Fix-linkage-against-shared-glapi.patch - patch -Np1 -i ../0001-glapi-Link-with-glapi-when-built-shared.patch - - autoreconf -fiv -} - -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 - # Implement 'swr' (OpenSWR) software driver (only support x86 hardware with AVX extension, see: http://openswr.org/) - GALLIUM=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr - VULKAN=intel,radeon - elif [[ "${CARCH}" = 'armv7h' ]]; then - DRI=r200,radeon,nouveau,swrast - # Implement PCI and PCI-e drivers, due some ARM hardware does suport PCI and PCIe drivers, see: - https://lwn.net/Articles/586802/ - https://www.linaro.org/blog/core-dump/kvm-pciemsi-passthrough-armarm64/ - # nVidia, are avaliable on Tegra hardware and AMD will support K12 hardware, see: - https://en.wikipedia.org/wiki/Tegra - https://en.wikipedia.org/wiki/AMD_K12 - GALLIUM=freedreno,etnaviv,vc4,imx,r300,r600,radeonsi,nouveau,svga,swrast,virgl - VULKAN=radeon - fi - - # Implement 'gallium-extra-hud' extra functionality - # Implement opencl/vaapi/vdpau/xa on ARM archictecture, does support it and easy to maintain the PKGBUILD - ARM archictecture support PCI and PCIe drivers, see: - https://lwn.net/Articles/586802/ - https://www.linaro.org/blog/core-dump/kvm-pciemsi-passthrough-armarm64/ - Some ARM video drivers like freedreno/nouveau does support OpenCL, see: - Mali (Lima) : https://en.wikipedia.org/wiki/Mali_(GPU)#Variants - Adreno (Freedreno, is not avaliable on mesa) : https://en.wikipedia.org/wiki/Adreno#Variants - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=${GALLIUM} \ - --with-dri-drivers=${DRI} \ - --with-egl-platforms=x11,drm,wayland \ - --with-vulkan-drivers=${VULKAN} \ - --disable-xvmc \ - --enable-gallium-llvm \ - --enable-llvm-shared-libs \ - --enable-shared-glapi \ - --disable-libglvnd \ - --enable-egl \ - --enable-glx \ - --enable-glx-tls \ - --enable-gles1 \ - --enable-gles2 \ - --enable-gbm \ - --enable-dri \ - --enable-gallium-osmesa \ - --enable-texture-float \ - --enable-xa \ - --enable-vdpau \ - --enable-omx \ - --enable-nine \ - --enable-opencl \ - --enable-opencl-icd \ - --enable-gallium-extra-hud \ - --enable-lmsensors \ - --with-clang-libdir=/usr/lib - - make - - # fake installation - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall install -} - -package_opencl-mesa-vanilla() { - pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" - depends=('mesa-vanilla' 'opencl-icd-loader' 'expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors') - optdepends=('opencl-headers: headers necessary for OpenCL development') - provides=('opencl-driver') - conflicts=('opencl-mesa' '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/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/" -} - -package_vulkan-intel-vanilla() { - pkgdesc="Intel's Vulkan mesa driver" - depends=('mesa-vanilla' 'wayland' 'libx11' 'libxshmfence') - provides=('vulkan-driver') - conflicts=('vulkan-intel') - - 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/ - - 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 - - install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-intel" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/" -} - -package_vulkan-radeon-vanilla() { - pkgdesc="Radeon's Vulkan mesa driver" - depends=('mesa-vanilla' 'wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs') - provides=('vulkan-driver') - conflicts=('vulkan-radeon') - - 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/ - - install -m755 -d ${pkgdir}/usr/lib - cp -rv ${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/" -} - -package_libva-mesa-driver-vanilla() { - pkgdesc="VA-API implementation for gallium" - depends=('mesa-vanilla' 'libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors') - conflicts=('libva-mesa-driver') - - 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/" -} - -package_mesa-vdpau-vanilla() { - pkgdesc="Mesa VDPAU drivers" - depends=('mesa-vanilla' 'libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors') - conflicts=('mesa-vdpau') - - 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/" -} - -package_mesa-vanilla() { - pkgdesc="A free implementation of the OpenGL specification" - depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' - 'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs' 'mesa-libgl-vanilla' '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') - provides_x86_64=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'opengl-driver') - conflicts_x86_64=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'mesa' - 'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils') - replaces_x86_64=('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') - provides_i686=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'opengl-driver') - conflicts_i686=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'virgl-dri' 'swr-dri' 'mesa-dri' 'mesa' - 'nvidia-utils' 'nvidia-340xx-utils' 'nvidia-304xx-utils' 'catalyst-utils') - replaces_i686=('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') - provides_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' 'opengl-driver') - conflicts_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' 'mesa' - 'nvidia-utils' 'catalyst-utils') - replaces_armv7h=('ati-dri' 'freedreno-dri' 'etnaviv-dri' 'imx-dri' 'nouveau-dri' 'svga-dri' - 'swrast-dri' 'vc4-dri' 'virgl-dri' 'mesa-dri' - 'nvidia-utils' 'catalyst-utils') - - install -m755 -d ${pkgdir}/etc - cp -rv ${srcdir}/drirc ${pkgdir}/etc - - 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/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libOSMesa.so* ${pkgdir}/usr/lib/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libwayland*.so* ${pkgdir}/usr/lib/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libxatracker.so* ${pkgdir}/usr/lib/ - - 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-vanilla() { - pkgdesc="Mesa 3-D graphics library" - depends=('libdrm' 'libxdamage' 'libxshmfence' 'libxxf86vm' 'wayland') - provides=('libgl' 'libegl' 'libgles' 'mesa-libgl' 'libglvnd') - conflicts=('mesa-libgl' 'libglvnd' 'nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' 'nvidia-cg-toolkit' 'catalyst-libgl') - replaces=('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/ - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/" -} diff --git a/~coadde/mesa-vanilla/drirc b/~coadde/mesa-vanilla/drirc deleted file mode 100644 index 946cbc803..000000000 --- a/~coadde/mesa-vanilla/drirc +++ /dev/null @@ -1,18 +0,0 @@ -<driconf> - <!-- Please always enable app-specific workarounds for all drivers and - screens. --> - <device> - <application name="Warsow (32-bit)" executable="warsow.i386"> - <option name="allow_glsl_extension_directive_midshader" value="true" /> - </application> - - <application name="Warsow (64-bit)" executable="warsow.x86_64"> - <option name="allow_glsl_extension_directive_midshader" value="true" /> - </application> - - <application name="Rust" executable="rust"> - <option name="glsl_zero_init" value="true"/> - </application> - </application> - </device> -</driconf> diff --git a/~coadde/mesa-vanilla/remove-libpthread-stubs.patch b/~coadde/mesa-vanilla/remove-libpthread-stubs.patch deleted file mode 100644 index efe8aaddd..000000000 --- a/~coadde/mesa-vanilla/remove-libpthread-stubs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 54416b4..8a708d3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -824,7 +824,7 @@ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread" - - dnl pthread-stubs is mandatory on targets where it exists - case "$host_os" in --cygwin* ) -+cygwin* | linux* ) - pthread_stubs_possible="no" - ;; - * ) |