[arch-commits] Commit in mesa/repos (4 files)
Felix Yan
felixonmars at archlinux.org
Wed Apr 15 20:13:42 UTC 2020
Date: Wednesday, April 15, 2020 @ 20:13:42
Author: felixonmars
Revision: 380393
archrelease: copy trunk to community-staging-x86_64
Added:
mesa/repos/community-staging-x86_64/
mesa/repos/community-staging-x86_64/0001-iris-handle-the-failure-of-converting-unsupported-yu.patch
(from rev 380392, mesa/trunk/0001-iris-handle-the-failure-of-converting-unsupported-yu.patch)
mesa/repos/community-staging-x86_64/LICENSE
(from rev 380392, mesa/trunk/LICENSE)
mesa/repos/community-staging-x86_64/PKGBUILD
(from rev 380392, mesa/trunk/PKGBUILD)
-----------------------------------------------------------------+
0001-iris-handle-the-failure-of-converting-unsupported-yu.patch | 54 ++
LICENSE | 83 ++++
PKGBUILD | 193 ++++++++++
3 files changed, 330 insertions(+)
Copied: mesa/repos/community-staging-x86_64/0001-iris-handle-the-failure-of-converting-unsupported-yu.patch (from rev 380392, mesa/trunk/0001-iris-handle-the-failure-of-converting-unsupported-yu.patch)
===================================================================
--- community-staging-x86_64/0001-iris-handle-the-failure-of-converting-unsupported-yu.patch (rev 0)
+++ community-staging-x86_64/0001-iris-handle-the-failure-of-converting-unsupported-yu.patch 2020-04-15 20:13:42 UTC (rev 380393)
@@ -0,0 +1,54 @@
+From 4d3f535ebb341ddce05e5b1750fcf17c6c4166c9 Mon Sep 17 00:00:00 2001
+From: James Xiong <james.xiong at intel.com>
+Date: Wed, 20 Nov 2019 15:59:00 -0800
+Subject: [PATCH] iris: handle the failure of converting unsupported yuv
+ formats to isl
+
+Signed-off-by: James Xiong <james.xiong at intel.com>
+Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
+(cherry picked from commit d8569baaed1a38cf3da9e45375fa2267d9a1eeb0)
+
+Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3898>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3898>
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ src/gallium/drivers/iris/iris_formats.c | 6 +++++-
+ src/gallium/drivers/iris/iris_resource.c | 3 ++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/drivers/iris/iris_formats.c b/src/gallium/drivers/iris/iris_formats.c
+index f6344cc7543..a35b663a53c 100644
+--- a/src/gallium/drivers/iris/iris_formats.c
++++ b/src/gallium/drivers/iris/iris_formats.c
+@@ -338,9 +338,13 @@ iris_format_for_usage(const struct gen_device_info *devinfo,
+ isl_surf_usage_flags_t usage)
+ {
+ enum isl_format format = iris_isl_format_for_pipe_format(pformat);
+- const struct isl_format_layout *fmtl = isl_format_get_layout(format);
+ struct isl_swizzle swizzle = ISL_SWIZZLE_IDENTITY;
+
++ if (format == ISL_FORMAT_UNSUPPORTED)
++ return (struct iris_format_info) { .fmt = format, .swizzle = swizzle };
++
++ const struct isl_format_layout *fmtl = isl_format_get_layout(format);
++
+ if (!util_format_is_srgb(pformat)) {
+ if (util_format_is_intensity(pformat)) {
+ swizzle = ISL_SWIZZLE(RED, RED, RED, RED);
+diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
+index bdd715df2c9..7ca6097840a 100644
+--- a/src/gallium/drivers/iris/iris_resource.c
++++ b/src/gallium/drivers/iris/iris_resource.c
+@@ -85,7 +85,8 @@ modifier_is_supported(const struct gen_device_info *devinfo,
+
+ enum isl_format linear_format = isl_format_srgb_to_linear(rt_format);
+
+- if (!isl_format_supports_ccs_e(devinfo, linear_format))
++ if (linear_format == ISL_FORMAT_UNSUPPORTED ||
++ !isl_format_supports_ccs_e(devinfo, linear_format))
+ return false;
+
+ return devinfo->gen >= 9 && devinfo->gen <= 11;
+--
+2.25.1
+
Copied: mesa/repos/community-staging-x86_64/LICENSE (from rev 380392, mesa/trunk/LICENSE)
===================================================================
--- community-staging-x86_64/LICENSE (rev 0)
+++ community-staging-x86_64/LICENSE 2020-04-15 20:13:42 UTC (rev 380393)
@@ -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/community-staging-x86_64/PKGBUILD (from rev 380392, mesa/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2020-04-15 20:13:42 UTC (rev 380393)
@@ -0,0 +1,193 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at 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=20.0.4
+pkgrel=2
+arch=('x86_64')
+makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
+ 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd'
+ '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}
+ mesa-llvm-10.patch::https://github.com/mesa3d/mesa/commit/ff1a3a00cb37d84ab9a563f0aa241714876f56b4.patch
+ LICENSE)
+sha512sums=('17d8bc3b56779a8e5648d81da9ee97b66bcec015710801edce4e8055fbb314cd9ebc1d112e3035480ba844c7d9ae6b5b1f1eac0cc0817e69e9253a7748451a55'
+ 'SKIP'
+ 'e6c1812816ed6251959400a9f6824b604b69d4ce057b677baff8c4c2c41de8edc1571ce13f0cc9ec87eb0e9d007a305b6a1727d820a8632f482c7a8629bd6fb8'
+ 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov at gmail.com>
+ '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty at igalia.com>
+ 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>
+ 'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez Romero <jasuarez at igalia.com>
+ '71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <dylan at pnwbakers.com>
+ '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric at engestrom.ch>
+
+prepare() {
+ cd mesa-$pkgver
+ patch -p1 -i ../mesa-llvm-10.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 fakeinstall/usr/bin/mesa-overlay-control.py
+
+ 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' 'zstd')
+ 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' 'zstd')
+ 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' 'zstd' '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' 'zstd')
+
+ _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' 'zstd')
+
+ _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=('mesa-libgl' 'opengl-driver')
+ conflicts=('mesa-libgl')
+ replaces=('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
+}
More information about the arch-commits
mailing list