From f92a51cbbccfde62b92059463dc421486b6a5b0b Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Fri, 17 Mar 2017 08:52:14 -0300 Subject: add mesa package to [libre] and remove mesa-{git,vanilla} --- .../0001-Fix-linkage-against-shared-glapi.patch | 26 ++ ...1-glapi-Link-with-glapi-when-built-shared.patch | 82 ++++++ libre/mesa/LICENSE | 82 ++++++ libre/mesa/PKGBUILD | 276 +++++++++++++++++++++ libre/mesa/drirc | 18 ++ libre/mesa/remove-libpthread-stubs.patch | 13 + pcr/mesa-git/LICENSE | 82 ------ pcr/mesa-git/PKGBUILD | 174 ------------- .../0001-Fix-linkage-against-shared-glapi.patch | 26 -- ...1-glapi-Link-with-glapi-when-built-shared.patch | 82 ------ pcr/mesa-vanilla/LICENSE | 82 ------ pcr/mesa-vanilla/PKGBUILD | 264 -------------------- pcr/mesa-vanilla/drirc | 18 -- pcr/mesa-vanilla/remove-libpthread-stubs.patch | 13 - 14 files changed, 497 insertions(+), 741 deletions(-) create mode 100644 libre/mesa/0001-Fix-linkage-against-shared-glapi.patch create mode 100644 libre/mesa/0001-glapi-Link-with-glapi-when-built-shared.patch create mode 100644 libre/mesa/LICENSE create mode 100644 libre/mesa/PKGBUILD create mode 100644 libre/mesa/drirc create mode 100644 libre/mesa/remove-libpthread-stubs.patch delete mode 100644 pcr/mesa-git/LICENSE delete mode 100644 pcr/mesa-git/PKGBUILD delete mode 100644 pcr/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch delete mode 100644 pcr/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch delete mode 100644 pcr/mesa-vanilla/LICENSE delete mode 100644 pcr/mesa-vanilla/PKGBUILD delete mode 100644 pcr/mesa-vanilla/drirc delete mode 100644 pcr/mesa-vanilla/remove-libpthread-stubs.patch diff --git a/libre/mesa/0001-Fix-linkage-against-shared-glapi.patch b/libre/mesa/0001-Fix-linkage-against-shared-glapi.patch new file mode 100644 index 000000000..7f8f7164c --- /dev/null +++ b/libre/mesa/0001-Fix-linkage-against-shared-glapi.patch @@ -0,0 +1,26 @@ +From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Wed, 12 Oct 2016 13:41:33 -0400 +Subject: [PATCH] Fix linkage against shared glapi + +Signed-off-by: Adam Jackson +--- + 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/libre/mesa/0001-glapi-Link-with-glapi-when-built-shared.patch b/libre/mesa/0001-glapi-Link-with-glapi-when-built-shared.patch new file mode 100644 index 000000000..376828e67 --- /dev/null +++ b/libre/mesa/0001-glapi-Link-with-glapi-when-built-shared.patch @@ -0,0 +1,82 @@ +From 16875ea5b9170f2213fd486d763f27a9d6dfc1b5 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +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 + +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 +--- + 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/libre/mesa/LICENSE b/libre/mesa/LICENSE new file mode 100644 index 000000000..ae33d2709 --- /dev/null +++ b/libre/mesa/LICENSE @@ -0,0 +1,82 @@ +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/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD new file mode 100644 index 000000000..48390936f --- /dev/null +++ b/libre/mesa/PKGBUILD @@ -0,0 +1,276 @@ +# Maintainer (Arch): Jan de Groot +# Maintainer (Arch): Andreas Radke +# Maintainer: Márcio Silva + +pkgbase=mesa +pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa' + 'mesa-libgl' 'mesa-libcl-icd' 'vulkan-radeon') +[[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]] && pkgname+=('vulkan-intel') +pkgver=17.0.1 +pkgrel=2.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') +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=('96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c' + 'SKIP' + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' + '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f' + 'c68d1522f9bce4ce31c92aa7a688da49f13043f5bb2254795b76dea8f47130b7' + '064dcd5a3ab1b7c23383e2cafbd37859e4c353f8839671d9695c6f7c2ef3260b' + '2cc6f40076e07a2d4769557c1aa40e5b6fbbb59c38e551c1a1997ef0d3f3c5f2') +validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov + +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 + 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 + + ./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 + + # build mesa-libcl-icd + cd ${srcdir}/opencl-${pkgver} + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --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-gallium-extra-hud \ + --enable-lmsensors \ + --with-clang-libdir=/usr/lib + + make + + # fake mesa-libcl-icd installation + mkdir $srcdir/openclinstall + make DESTDIR=${srcdir}/openclinstall install +} + +package_opencl-mesa() { + pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" + depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors') + optdepends=('opencl-headers: headers necessary for OpenCL development') + provides=('opencl-driver') + + 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() { + pkgdesc="Intel's Vulkan mesa driver" + depends=('wayland' 'libx11' 'libxshmfence') + 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/ + + 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() { + 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/ + + 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() { + pkgdesc="VA-API implementation for gallium" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' '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/" +} + +package_mesa-vdpau() { + pkgdesc="Mesa VDPAU drivers" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' '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/" +} + +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') + 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' 'mesa-dri' 'opengl-driver') + conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + elif [[ "${CARCH}" = 'armv7h' ]]; then + provides=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'opengl-driver') + conflicts=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + replaces=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') + fi + + 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() { + pkgdesc="Mesa 3-D graphics library" + depends=('libdrm' 'libxdamage' 'libxshmfence' 'libxxf86vm' 'wayland') + provides=('libgl' 'libegl' 'libgles' 'libglvnd') + conflicts=('libglvnd') + + 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/" +} + +package_mesa-libcl-icd() { + pkgdesc="Mesa OpenCL ICD Bindings" + depends=('expat' 'gcc-libs' 'libdrm' 'libedit' 'libelf' 'libffi' 'llvm-libs' 'ncurses' 'zlib') + optdepends=('opencl-driver: packaged opencl driver') + provides=('opencl-icd-loader' 'ocl-icd' 'libcl') + conflicts=('ocl-icd' 'libcl') + + install -m755 -d ${pkgdir}/usr/lib + cp -rv ${srcdir}/openclinstall/usr/lib/libOpenCL* ${pkgdir}/usr/lib/ + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libcl-icd" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libcl-icd/" +} diff --git a/libre/mesa/drirc b/libre/mesa/drirc new file mode 100644 index 000000000..946cbc803 --- /dev/null +++ b/libre/mesa/drirc @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/libre/mesa/remove-libpthread-stubs.patch b/libre/mesa/remove-libpthread-stubs.patch new file mode 100644 index 000000000..efe8aaddd --- /dev/null +++ b/libre/mesa/remove-libpthread-stubs.patch @@ -0,0 +1,13 @@ +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" + ;; + * ) diff --git a/pcr/mesa-git/LICENSE b/pcr/mesa-git/LICENSE deleted file mode 100644 index ae33d2709..000000000 --- a/pcr/mesa-git/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/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD deleted file mode 100644 index c40851e43..000000000 --- a/pcr/mesa-git/PKGBUILD +++ /dev/null @@ -1,174 +0,0 @@ -# Maintainer (Arch): Jan de Groot -# Maintainer (Arch): Andreas Radke -# Maintainer: Márcio Silva - -_gitcommit=7ac946e5 - -pkgbase=mesa-git -pkgname=('opencl-mesa-git' 'libva-mesa-driver-git' 'mesa-vdpau-git' 'mesa-git' 'mesa-libgl-git') -pkgver=11.0.git1.$_gitcommit -pkgrel=1 -arch=('i686' 'x86_64') -makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' - 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm' - 'systemd' 'libomxil-bellagio' 'libclc' 'clang' 'git') -url="http://mesa3d.sourceforge.net" -license=('custom') -source=("$pkgbase-$pkgver::git://anongit.freedesktop.org/mesa/mesa#commit=$_gitcommit" - LICENSE) -sha256sums=('SKIP' - '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2') -validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov - -build() { - #cd ${srcdir}/?esa-* - cd $pkgbase-$pkgver - - autoreconf -vfi # our automake is far too new for their build system :) - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ - --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --with-egl-platforms=x11,drm,wayland \ - --enable-llvm-shared-libs \ - --enable-egl \ - --enable-gbm \ - --enable-gallium-llvm \ - --enable-shared-glapi \ - --enable-glx \ - --enable-glx-tls \ - --enable-dri \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ - --enable-texture-float \ - --enable-xa \ - --enable-vdpau \ - --enable-omx \ - --enable-nine \ - --enable-opencl --enable-opencl-icd \ - --with-clang-libdir=/usr/lib - - # --help - - make - - # fake installation - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall install -} - -package_opencl-mesa-git() { - pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" - depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'opencl-icd-loader' 'libclc' 'clang') - optdepends=('opencl-headers: headers necessary for OpenCL development') - provides=('opencl-mesa') - conflicts=('opencl-mesa') - - install -m755 -d ${pkgdir}/etc - mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/ - - install -m755 -d ${pkgdir}/usr/lib/gallium-pipe - mv -v ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/ - mv -v ${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_libva-mesa-driver-git() { - pkgdesc="VA-API implementation for gallium" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils') - provides=('libva-mesa-driver') - conflicts=('libva-mesa-driver') - - install -m755 -d ${pkgdir}/usr/lib - mv -v ${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-git() { - pkgdesc="Mesa VDPAU drivers" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils') - provides=('mesa-vdpau') - conflicts=('mesa-vdpau') - - install -m755 -d ${pkgdir}/usr/lib - mv -v ${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-git() { - pkgdesc="an open-source implementation of the OpenGL specification" - depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' - 'libomxil-bellagio' 'expat' 'libtxc_dxtn' 'llvm-libs') - optdepends=('opengl-man-pages: for the OpenGL API man pages' - 'mesa-vdpau-git: for accelerated video playback' - 'libva-mesa-driver-git: for accelerated video playback') - provides=('mesa' 'libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' - 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') - conflicts=('mesa' 'libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' - 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') - replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' - 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') - - install -m755 -d ${pkgdir}/etc - mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc - - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri - # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast - mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri - - mv -v ${srcdir}/fakeinstall/usr/lib/bellagio ${pkgdir}/usr/lib - mv -v ${srcdir}/fakeinstall/usr/lib/d3d ${pkgdir}/usr/lib - mv -v ${srcdir}/fakeinstall/usr/lib/*.so* ${pkgdir}/usr/lib/ - - mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr - mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/ - - install -m755 -d ${pkgdir}/usr/lib/mesa - # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ? - mv -v ${pkgdir}/usr/lib/libGL.so* ${pkgdir}/usr/lib/mesa/ - mv -v ${pkgdir}/usr/lib/libEGL.so* ${pkgdir}/usr/lib/mesa/ - mv -v ${pkgdir}/usr/lib/libGLES*.so* ${pkgdir}/usr/lib/mesa/ - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} - -package_mesa-libgl-git() { - pkgdesc="Mesa 3-D graphics library" - depends=('mesa') - provides=('mesa-libgl' 'libgl') - conflicts=('mesa-libgl') - replaces=('libgl') - - # See FS#26284 - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" - ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" - - ln -s /usr/lib/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0 - ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1 - ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so - - ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0 - ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1 - ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so - - ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0 - ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1 - ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so - - ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0 - ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2 - ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/" -} diff --git a/pcr/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch b/pcr/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch deleted file mode 100644 index 7f8f7164c..000000000 --- a/pcr/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 -Date: Wed, 12 Oct 2016 13:41:33 -0400 -Subject: [PATCH] Fix linkage against shared glapi - -Signed-off-by: Adam Jackson ---- - 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/pcr/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch b/pcr/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch deleted file mode 100644 index 376828e67..000000000 --- a/pcr/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 -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 - -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 ---- - 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/pcr/mesa-vanilla/LICENSE b/pcr/mesa-vanilla/LICENSE deleted file mode 100644 index ae33d2709..000000000 --- a/pcr/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/pcr/mesa-vanilla/PKGBUILD b/pcr/mesa-vanilla/PKGBUILD deleted file mode 100644 index 45c654dc8..000000000 --- a/pcr/mesa-vanilla/PKGBUILD +++ /dev/null @@ -1,264 +0,0 @@ -# Maintainer (Arch): Jan de Groot -# Maintainer (Arch): Andreas Radke -# Maintainer: Márcio Silva - -pkgbase=mesa -pkgname=('opencl-mesa-vanilla' 'vulkan-vanilla-intel' 'vulkan-vanilla-radeon' 'libva-mesa-vanilla-driver' - 'mesa-vanilla-vdpau' 'mesa-vanilla' 'mesa-vanilla-libgl' 'mesa-vanilla-libcl-icd') -pkgver=17.0.1 -pkgrel=1 -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') -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=('96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c' - 'SKIP' - '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' - '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f' - 'c68d1522f9bce4ce31c92aa7a688da49f13043f5bb2254795b76dea8f47130b7' - '064dcd5a3ab1b7c23383e2cafbd37859e4c353f8839671d9695c6f7c2ef3260b' - '2cc6f40076e07a2d4769557c1aa40e5b6fbbb59c38e551c1a1997ef0d3f3c5f2') -validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov - -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} - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \ - --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --with-egl-platforms=x11,drm,wayland \ - --with-vulkan-drivers=intel,radeon \ - --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 - - # build mesa-libcl-icd - cd ${srcdir}/opencl-${pkgver} - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \ - --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --with-egl-platforms=x11,drm,wayland \ - --with-vulkan-drivers=intel,radeon \ - --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-gallium-extra-hud \ - --enable-lmsensors \ - --with-clang-libdir=/usr/lib - - make - - # fake mesa-libcl-icd installation - mkdir $srcdir/openclinstall - make DESTDIR=${srcdir}/openclinstall install -} - -package_opencl-mesa-vanilla() { - pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" - depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors') - optdepends=('opencl-headers: headers necessary for OpenCL development') - provides=('opencl-driver' 'opencl-mesa') - conflicts=('opencl-mesa') - - 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-vanilla" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa-vanilla/" -} - -package_vulkan-vanilla-intel() { - pkgdesc="Intel's Vulkan mesa driver" - depends=('wayland' 'libx11' 'libxshmfence') - provides=('vulkan-driver' 'vulkan-intel') - 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-vanilla-intel" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-vanilla-intel/" -} - -package_vulkan-vanilla-radeon() { - pkgdesc="Radeon's Vulkan mesa driver" - depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs') - provides=('vulkan-driver' 'vulkan-radeon') - 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-vanilla-radeon" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-vanilla-radeon/" -} - -package_libva-mesa-vanilla-driver() { - pkgdesc="VA-API implementation for gallium" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors') - provides=('libva-mesa-driver') - 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-vanilla-driver" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-vanilla-driver/" -} - -package_mesa-vanilla-vdpau() { - pkgdesc="Mesa VDPAU drivers" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors') - provides=('mesa-vdpau') - 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-vanilla-vdpau" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vanilla-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-vanilla-libgl' 'lm_sensors') - optdepends=('opengl-man-pages: for the OpenGL API man pages' - 'mesa-vanilla-vdpau: for accelerated video playback' - 'libva-mesa-vanilla-driver: for accelerated video playback') - provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'opengl-driver' 'mesa') - conflicts=('mesa') - - 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-vanilla" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vanilla/" -} - -package_mesa-vanilla-libgl() { - pkgdesc="Mesa 3-D graphics library" - depends=('libdrm' 'libxdamage' 'libxshmfence' 'libxxf86vm' 'wayland') - provides=('libgl' 'libegl' 'libgles' 'libglvnd' 'mesa-libgl') - conflicts=('libglvnd' 'mesa-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-vanilla-libgl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vanilla-libgl/" -} - -package_mesa-vanilla-libcl-icd() { - pkgdesc="Mesa OpenCL ICD Bindings" - depends=('expat' 'gcc-libs' 'libdrm' 'libedit' 'libelf' 'libffi' 'llvm-libs' 'ncurses' 'zlib') - optdepends=('opencl-driver: packaged opencl driver') - provides=('opencl-icd-loader' 'ocl-icd' 'libcl' 'mesa-libcl') - conflicts=('ocl-icd' 'libcl' 'mesa-libcl') - - install -m755 -d ${pkgdir}/usr/lib - cp -rv ${srcdir}/openclinstall/usr/lib/libOpenCL* ${pkgdir}/usr/lib/ - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vanilla-libcl-icd" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vanilla-libcl-icd/" -} diff --git a/pcr/mesa-vanilla/drirc b/pcr/mesa-vanilla/drirc deleted file mode 100644 index 946cbc803..000000000 --- a/pcr/mesa-vanilla/drirc +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - diff --git a/pcr/mesa-vanilla/remove-libpthread-stubs.patch b/pcr/mesa-vanilla/remove-libpthread-stubs.patch deleted file mode 100644 index efe8aaddd..000000000 --- a/pcr/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" - ;; - * ) -- cgit v1.2.3