Date: Saturday, October 5, 2019 @ 15:09:19
Author: lcarlier
Revision: 363847
archrelease: copy trunk to staging-x86_64
Added:
mesa/repos/staging-x86_64/
mesa/repos/staging-x86_64/LICENSE
(from rev 363846, mesa/trunk/LICENSE)
mesa/repos/staging-x86_64/PKGBUILD
(from rev 363846, mesa/trunk/PKGBUILD)
mesa/repos/staging-x86_64/glvnd.patch
(from rev 363846, mesa/trunk/glvnd.patch)
mesa/repos/staging-x86_64/intel-topology-query-fix-old-gens.patch
(from rev 363846, mesa/trunk/intel-topology-query-fix-old-gens.patch)
-----------------------------------------+
LICENSE | 83 ++++++++++++
PKGBUILD | 197 ++++++++++++++++++++++++++++++
glvnd.patch | 148 ++++++++++++++++++++++
intel-topology-query-fix-old-gens.patch | 39 +++++
4 files changed, 467 insertions(+)
Copied: mesa/repos/staging-x86_64/LICENSE (from rev 363846, mesa/trunk/LICENSE)
===================================================================
--- staging-x86_64/LICENSE (rev 0)
+++ staging-x86_64/LICENSE 2019-10-05 15:09:19 UTC (rev 363847)
@@ -0,0 +1,83 @@
+The Mesa 3D Graphics Library
+
+Disclaimer
+
+ Mesa is a 3-D graphics library with an API which is very similar to
+ that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ [2]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 [3]Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+ The Mesa distribution consists of several components. Different
+ copyrights and licenses apply to different components. For example, the
+ GLX client code uses the SGI Free Software License B, and 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
+THE AUTHORS OR COPYRIGHT HOLDERS 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 License
+------------------------------------------------------------------
+Main Mesa code src/mesa/ MIT
+
+Device drivers src/mesa/drivers/* MIT, generally
+
+Gallium code src/gallium/ MIT
+
+Ext headers include/GL/glext.h Khronos
+ include/GL/glxext.h
+
+GLX client code src/glx/ SGI Free Software License B
+
+C11 thread include/c11/threads*.h Boost (permissive) emulation
+
+ In general, consult the source files for license terms.
+
+References
+
+ 1. https://www.opengl.org/
+ 2. https://www.sgi.com/
+ 3. https://www.sgi.com/
Copied: mesa/repos/staging-x86_64/PKGBUILD (from rev 363846,
mesa/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-10-05 15:09:19 UTC (rev 363847)
@@ -0,0 +1,197 @@
+# Maintainer: Jan de Groot <j...@archlinux.org>
+# Maintainer: Andreas Radke <andy...@archlinux.org>
+
+pkgbase=mesa
+pkgname=('vulkan-mesa-layer' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon'
'libva-mesa-driver' 'mesa-vdpau' 'mesa')
+pkgdesc="An open-source implementation of the OpenGL specification"
+pkgver=19.2.0
+pkgrel=3
+arch=('x86_64')
+makedepends=('python-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto'
'dri3proto' 'presentproto'
+ 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva'
'wayland' 'wayland-protocols'
+ 'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd'
'libunwind' 'lm_sensors'
+ 'libxrandr' 'valgrind' 'glslang' 'meson')
+url="https://www.mesa3d.org/";
+license=('custom')
+source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+ LICENSE
+ glvnd.patch
+ intel-topology-query-fix-old-gens.patch)
+sha512sums=('7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0'
+ 'SKIP'
+
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
+
'3e5746dcd493bff3f04b26de6168b15d0f161de62c1c6657106b61cbb1ad4925cbf3a691d5055491e759f88dbe0362dc909e7d726f87528980662f26ceb6dcbc'
+
'a5e2ccef20edc81859255c66cb838c5244774d9d6c56dcfce2e462b6ddaa66ef7847242b050402305621c9c9e706629af30dd27c8466b6bd32d1be40cb3e53a0')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov
<emil.l.veli...@gmail.com>
+ '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez
<ta...@igalia.com>
+ 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio
Suárez Romero (Igalia, S.L.) <jasua...@igalia.com>
+ 'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez
Romero <jasua...@igalia.com>
+ '71C4B75620BC75708B4BDB254C95FAAB3EB073EC') # Dylan Baker
<dy...@pnwbakers.com>
+
+prepare() {
+ cd mesa-$pkgver
+
+ # libglvnd-1.2.0 support
+ patch -Np1 -i ${srcdir}/glvnd.patch
+ # Fix FS#63945
+ patch -Np1 -i ${srcdir}/intel-topology-query-fix-old-gens.patch
+}
+
+build() {
+ arch-meson mesa-$pkgver build \
+ -D b_lto=false \
+ -D b_ndebug=true \
+ -D platforms=x11,wayland,drm,surfaceless \
+ -D dri-drivers=i915,i965,r100,r200,nouveau \
+ -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr,iris \
+ -D vulkan-drivers=amd,intel \
+ -D vulkan-overlay-layer=true \
+ -D swr-arches=avx,avx2 \
+ -D dri3=true \
+ -D egl=true \
+ -D gallium-extra-hud=true \
+ -D gallium-nine=true \
+ -D gallium-omx=bellagio \
+ -D gallium-opencl=icd \
+ -D gallium-va=true \
+ -D gallium-vdpau=true \
+ -D gallium-xa=true \
+ -D gallium-xvmc=false \
+ -D gbm=true \
+ -D gles1=false \
+ -D gles2=true \
+ -D glvnd=true \
+ -D glx=dri \
+ -D libunwind=true \
+ -D llvm=true \
+ -D lmsensors=true \
+ -D osmesa=gallium \
+ -D shared-glapi=true \
+ -D valgrind=true
+
+ # Print config
+ meson configure build
+
+ ninja -C build
+
+ # fake installation to be seperated into packages
+ # outside of fakeroot but mesa doesn't need to chown/mod
+ DESTDIR="${srcdir}/fakeinstall" ninja -C build install
+}
+
+_install() {
+ local src f dir
+ for src; do
+ f="${src#fakeinstall/}"
+ dir="${pkgdir}/${f%/*}"
+ install -m755 -d "${dir}"
+ mv -v "${src}" "${dir}/"
+ done
+}
+
+package_vulkan-mesa-layer() {
+ pkgdesc="Vulkan overlay layer to display information about the application"
+
+ _install fakeinstall/usr/share/vulkan/explicit_layer.d
+ _install fakeinstall/usr/lib/libVkLayer_MESA_overlay.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_opencl-mesa() {
+ pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
+ depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang')
+ optdepends=('opencl-headers: headers necessary for OpenCL development')
+ provides=('opencl-driver')
+
+ _install fakeinstall/etc/OpenCL
+ _install fakeinstall/usr/lib/lib*OpenCL*
+ _install fakeinstall/usr/lib/gallium-pipe
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_vulkan-intel() {
+ pkgdesc="Intel's Vulkan mesa driver"
+ depends=('wayland' 'libx11' 'libxshmfence' 'libdrm')
+ optdepends=('vulkan-mesa-layer: a vulkan layer to display information using
an overlay')
+ provides=('vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
+ _install fakeinstall/usr/lib/libvulkan_intel.so
+ _install fakeinstall/usr/include/vulkan/vulkan_intel.h
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_vulkan-radeon() {
+ pkgdesc="Radeon's Vulkan mesa driver"
+ depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs')
+ optdepends=('vulkan-mesa-layer: a vulkan layer to display information using
an overlay')
+ provides=('vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
+ _install fakeinstall/usr/lib/libvulkan_radeon.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_libva-mesa-driver() {
+ pkgdesc="VA-API implementation for gallium"
+ depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
+
+ _install fakeinstall/usr/lib/dri/*_drv_video.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_mesa-vdpau() {
+ pkgdesc="Mesa VDPAU drivers"
+ depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
+
+ _install fakeinstall/usr/lib/vdpau
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_mesa() {
+ depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence'
'libelf'
+ 'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages'
+ 'mesa-vdpau: for accelerated video playback'
+ 'libva-mesa-driver: for accelerated video playback')
+ 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 fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
+ _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
+
+ # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
+ _install fakeinstall/usr/lib/dri/*_dri.so
+
+ _install fakeinstall/usr/lib/bellagio
+ _install fakeinstall/usr/lib/d3d
+ _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
+ _install fakeinstall/usr/lib/libOSMesa.so*
+ _install fakeinstall/usr/lib/libxatracker.so*
+ _install fakeinstall/usr/lib/libswrAVX*.so*
+
+ # in vulkan-headers
+ rm -rv fakeinstall/usr/include/vulkan
+
+ _install fakeinstall/usr/include
+ _install fakeinstall/usr/lib/pkgconfig
+
+ # libglvnd support
+ _install fakeinstall/usr/lib/libGLX_mesa.so*
+ _install fakeinstall/usr/lib/libEGL_mesa.so*
+
+ # indirect rendering
+ ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
+
+ # make sure there are no files left to install
+ find fakeinstall -depth -print0 | xargs -0 rmdir
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
Copied: mesa/repos/staging-x86_64/glvnd.patch (from rev 363846,
mesa/trunk/glvnd.patch)
===================================================================
--- staging-x86_64/glvnd.patch (rev 0)
+++ staging-x86_64/glvnd.patch 2019-10-05 15:09:19 UTC (rev 363847)
@@ -0,0 +1,148 @@
+From fafd20f67dec9f5891838435ecde1dedb77ab742 Mon Sep 17 00:00:00 2001
+From: Dylan Baker <dy...@pnwbakers.com>
+Date: Wed, 25 Sep 2019 23:25:27 +0000
+Subject: [PATCH] meson: fix logic for generating .pc files with old glvnd
+
+We want to generate PC files for non-glvnd builds and for builds with
+old glvnd, but the current logic doesn't do that, it builds them
+unconditionally, and for GLES it builds the shared libraries, which is
+also not what we want. This does not generate .pc files for gles1 or
+gles2. Which it we weren't doing before either, making this not a
+regression but a return to status-quo.o
+
+Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1838
+Fixes: 93df862b6affb6b8507e40601212a58012bfa873
+ ("meson: re-add incorrect pkg-config files with GLVND for backward
compatibility")
+Reviewed-by: Matt Turner <matts...@gmail.com>
+---
+ meson.build | 9 +++++----
+ src/egl/meson.build | 30 ++++++++++++++++--------------
+ src/mapi/meson.build | 2 +-
+ src/meson.build | 4 ++--
+ 4 files changed, 24 insertions(+), 21 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 0e46fde5edc..da4a07538df 100644
+--- a/meson.build
++++ b/meson.build
+@@ -100,7 +100,7 @@ endif
+
+ # shared-glapi is required if at least two OpenGL APIs are being built
+ if not with_shared_glapi
+- if ((with_gles1 == 'true' and with_gles2 == 'true') or
++ if ((with_gles1 == 'true' and with_gles2 == 'true') or
+ (with_gles1 == 'true' and with_opengl) or
+ (with_gles2 == 'true' and with_opengl))
+ error('shared-glapi required for building two or more of OpenGL, OpenGL
ES 1.x, OpenGL ES 2.x')
+@@ -397,7 +397,7 @@ endif
+ if with_glx != 'disabled'
+ if not (with_platform_x11 and with_any_opengl)
+ error('Cannot build GLX support without X11 platform support and at least
one OpenGL API')
+- elif with_glx == 'gallium-xlib'
++ elif with_glx == 'gallium-xlib'
+ if not with_gallium
+ error('Gallium-xlib based GLX requires at least one gallium driver')
+ elif not with_gallium_softpipe
+@@ -405,7 +405,7 @@ if with_glx != 'disabled'
+ elif with_dri
+ error('gallium-xlib conflicts with any dri driver')
+ endif
+- elif with_glx == 'xlib'
++ elif with_glx == 'xlib'
+ if with_dri
+ error('xlib conflicts with any dri driver')
+ endif
+@@ -1326,6 +1326,7 @@ else
+ endif
+
+ dep_glvnd = null_dep
++glvnd_missing_pc_files = false
+ if with_glvnd
+ dep_glvnd = dependency('libglvnd', version : '>= 0.2.0')
+ # GLVND until commit 0dfaea2bcb7cdcc785f9 ("Add pkg-config files for EGL,
GL,
+@@ -1462,7 +1463,7 @@ if with_platform_x11
+ if with_glx == 'dri' or with_glx == 'gallium-xlib'
+ dep_glproto = dependency('glproto', version : '>= 1.4.14')
+ endif
+- if with_glx == 'dri'
++ if with_glx == 'dri'
+ if with_dri_platform == 'drm'
+ dep_dri2proto = dependency('dri2proto', version : '>= 2.8')
+ dep_xxf86vm = dependency('xxf86vm')
+diff --git a/src/egl/meson.build b/src/egl/meson.build
+index 7038a68e955..7d738e2ebd1 100644
+--- a/src/egl/meson.build
++++ b/src/egl/meson.build
+@@ -176,21 +176,23 @@ libegl = shared_library(
+ # If using glvnd the pkg-config header should not point to EGL_mesa, it should
+ # point to EGL. glvnd is only available on unix like platforms so adding -l
+ # should be safe here
+-if with_glvnd and glvnd_missing_pc_files
+- _egl = '-L${libdir} -lEGL'
+-else
+- _egl = libegl
+-endif
++if not with_glvnd or glvnd_missing_pc_files
++ if glvnd_missing_pc_files
++ _egl = '-L${libdir} -lEGL'
++ else
++ _egl = libegl
++ endif
+
+-pkg.generate(
+- name : 'egl',
+- description : 'Mesa EGL Library',
+- version : meson.project_version(),
+- libraries : _egl,
+- libraries_private: gl_priv_libs,
+- requires_private : gl_priv_reqs,
+- extra_cflags : gl_pkgconfig_c_flags,
+-)
++ pkg.generate(
++ name : 'egl',
++ description : 'Mesa EGL Library',
++ version : meson.project_version(),
++ libraries : _egl,
++ libraries_private: gl_priv_libs,
++ requires_private : gl_priv_reqs,
++ extra_cflags : gl_pkgconfig_c_flags,
++ )
++endif
+
+ if with_tests and prog_nm.found()
+ if with_glvnd
+diff --git a/src/mapi/meson.build b/src/mapi/meson.build
+index 39c1dba7ce0..2c79a04f1df 100644
+--- a/src/mapi/meson.build
++++ b/src/mapi/meson.build
+@@ -35,7 +35,7 @@ if with_shared_glapi
+ else
+ libglapi = []
+ endif
+-if not with_glvnd or glvnd_missing_pc_files
++if not with_glvnd
+ if with_gles1
+ subdir('es1api')
+ endif
+diff --git a/src/meson.build b/src/meson.build
+index ddbcd7f3ae4..d01f84c0d46 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -111,12 +111,12 @@ endif
+
+ # This must be after at least mesa, glx, and gallium, since libgl will be
+ # defined in one of those subdirs depending on the glx provider.
+-if with_glx != 'disabled'
++if with_glx != 'disabled' and (not with_glvnd or glvnd_missing_pc_files)
+ # If using glvnd the pkg-config header should not point to GL_mesa, it
should
+ # point to GL. glvnd is only available on unix like platforms so adding -l
+ # should be safe here
+ # TODO: in the glvnd case glvnd itself should really be providing this.
+- if with_glvnd and glvnd_missing_pc_files
++ if glvnd_missing_pc_files
+ _gl = '-L${libdir} -lGL'
+ else
+ _gl = libgl
+--
+2.22.0
+
Copied: mesa/repos/staging-x86_64/intel-topology-query-fix-old-gens.patch (from
rev 363846, mesa/trunk/intel-topology-query-fix-old-gens.patch)
===================================================================
--- staging-x86_64/intel-topology-query-fix-old-gens.patch
(rev 0)
+++ staging-x86_64/intel-topology-query-fix-old-gens.patch 2019-10-05
15:09:19 UTC (rev 363847)
@@ -0,0 +1,39 @@
+From 712268730ec05897a6add995444123ac2af54382 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <lionel.g.landwer...@intel.com>
+Date: Wed, 2 Oct 2019 17:13:06 +0300
+Subject: [PATCH] intel: fix topology query
+
+i915 will report ENODEV on generations prior to Haswell because there
+is no point in reporting values on those. This is prior any fusing
+could happen on parts with identical PCI ids.
+
+This query call was previously only triggered on generation that
+support performance queries, which happens to match generation for
+which i915 reports topology, but the commit pointed below started
+using it on all generations.
+
+Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
+Gitlab: https://gitlab.freedesktop.org/mesa/mesa/issues/1860
+Cc: <mesa-sta...@lists.freedesktop.org>
+Fixes: 96e1c945f2 ("i965: Move device info initialization to common code")
+---
+ src/intel/dev/gen_device_info.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
+index 3953a1f4af3..85fa978f9c1 100644
+--- a/src/intel/dev/gen_device_info.c
++++ b/src/intel/dev/gen_device_info.c
+@@ -1320,6 +1320,9 @@ query_topology(struct gen_device_info *devinfo, int fd)
+ if (gen_ioctl(fd, DRM_IOCTL_I915_QUERY, &query))
+ return false;
+
++ if (item.length < 0)
++ return false;
++
+ struct drm_i915_query_topology_info *topo_info =
+ (struct drm_i915_query_topology_info *) calloc(1, item.length);
+ item.data_ptr = (uintptr_t) topo_info;
+--
+2.22.0
+
