diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-06-12 19:39:00 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-06-12 19:39:00 -0400 |
commit | c1916898c6013a63501f1e6a807aedd67aafef22 (patch) | |
tree | de3cd03f10a65455f6ade627df3611180c9847bb /libre | |
parent | 1374df47b9fcdeb3844d96c0355b202deaa695b0 (diff) | |
download | abslibre-c1916898c6013a63501f1e6a807aedd67aafef22.tar.gz abslibre-c1916898c6013a63501f1e6a807aedd67aafef22.tar.bz2 abslibre-c1916898c6013a63501f1e6a807aedd67aafef22.zip |
rm -rf libre/mesa
Diffstat (limited to 'libre')
-rw-r--r-- | libre/mesa/0001-glvnd-fix-gl.pc.patch | 26 | ||||
-rw-r--r-- | libre/mesa/0002-meson-Add-library-versions-to-swr-drivers.patch | 71 | ||||
-rw-r--r-- | libre/mesa/0003-meson-Version-libMesaOpenCL-like-autotools-does.patch | 43 | ||||
-rw-r--r-- | libre/mesa/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch | 73 | ||||
-rw-r--r-- | libre/mesa/LICENSE | 83 | ||||
-rw-r--r-- | libre/mesa/PKGBUILD | 192 | ||||
-rw-r--r-- | libre/mesa/drirc | 18 |
7 files changed, 0 insertions, 506 deletions
diff --git a/libre/mesa/0001-glvnd-fix-gl.pc.patch b/libre/mesa/0001-glvnd-fix-gl.pc.patch deleted file mode 100644 index fd4507e23..000000000 --- a/libre/mesa/0001-glvnd-fix-gl.pc.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a9554de2a6028540fa12a7ebdab4daf2b46010fa Mon Sep 17 00:00:00 2001 -Message-Id: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steffens@gmail.com> -From: Unknown <> -Date: Tue, 15 May 2018 20:10:53 +0200 -Subject: [PATCH 1/4] glvnd: fix gl.pc - ---- - src/mesa/gl.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in -index 181724b97b..8c7b7da8d7 100644 ---- a/src/mesa/gl.pc.in -+++ b/src/mesa/gl.pc.in -@@ -7,7 +7,7 @@ Name: gl - Description: Mesa OpenGL library - Requires.private: @GL_PC_REQ_PRIV@ - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -l@GL_LIB@ -+Libs: -L${libdir} -lGL - Libs.private: @GL_PC_LIB_PRIV@ - Cflags: -I${includedir} @GL_PC_CFLAGS@ - glx_tls: @GLX_TLS@ --- -2.17.0 - diff --git a/libre/mesa/0002-meson-Add-library-versions-to-swr-drivers.patch b/libre/mesa/0002-meson-Add-library-versions-to-swr-drivers.patch deleted file mode 100644 index ef7d21fe6..000000000 --- a/libre/mesa/0002-meson-Add-library-versions-to-swr-drivers.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4edc0c6290ea4e848c5142b6807ebc5c809fecef Mon Sep 17 00:00:00 2001 -Message-Id: <4edc0c6290ea4e848c5142b6807ebc5c809fecef.1526409254.git.jan.steffens@gmail.com> -In-Reply-To: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steffens@gmail.com> -References: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Sat, 14 Apr 2018 18:43:23 +0200 -Subject: [PATCH 2/4] meson: Add library versions to swr drivers - -This is for parity with autotools. - -Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> ---- - src/gallium/drivers/swr/meson.build | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build -index 43e1c5cc50..a6dbd7a3f6 100644 ---- a/src/gallium/drivers/swr/meson.build -+++ b/src/gallium/drivers/swr/meson.build -@@ -198,6 +198,7 @@ if with_swr_arches.contains('avx') - link_args : [ld_args_gc_sections], - include_directories : [swr_incs], - dependencies : [dep_thread, dep_llvm], -+ version : '0.0.0', - install : true, - ) - endif -@@ -230,6 +231,7 @@ if with_swr_arches.contains('avx2') - link_args : [ld_args_gc_sections], - include_directories : [swr_incs], - dependencies : [dep_thread, dep_llvm], -+ version : '0.0.0', - install : true, - ) - endif -@@ -257,30 +259,32 @@ if with_swr_arches.contains('knl') - link_args : [ld_args_gc_sections], - include_directories : [swr_incs], - dependencies : [dep_thread, dep_llvm], -+ version : '0.0.0', - install : true, - ) - endif - - if with_swr_arches.contains('skx') - swr_skx_args = cpp.first_supported_argument( - '-target-cpu=x86-skylake', '-march=skylake-avx512', '-xCORE-AVX512', - prefix : ''' - #if !defined(__AVX512F__) || !defined(__AVX512BW__) - # error - #endif ''', - ) - if swr_skx_args == [] - error('Cannot find SKX support for swr.') - endif - - swr_arch_defines += '-DHAVE_SWR_SKX' - swr_arch_libs += shared_library( - 'swrSKX', - [files_swr_common, files_swr_arch], - cpp_args : [swr_cpp_args, swr_skx_args, '-DKNOB_ARCH=KNOB_ARCH_AVX512'], - link_args : [ld_args_gc_sections], - include_directories : [swr_incs], - dependencies : [dep_thread, dep_llvm], -+ version : '0.0.0', - install : true, - ) - endif --- -2.17.0 - diff --git a/libre/mesa/0003-meson-Version-libMesaOpenCL-like-autotools-does.patch b/libre/mesa/0003-meson-Version-libMesaOpenCL-like-autotools-does.patch deleted file mode 100644 index bb0bac74e..000000000 --- a/libre/mesa/0003-meson-Version-libMesaOpenCL-like-autotools-does.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7bafcb1b39b03110ba5a375635d7b6b5ecf98bc4 Mon Sep 17 00:00:00 2001 -Message-Id: <7bafcb1b39b03110ba5a375635d7b6b5ecf98bc4.1526409254.git.jan.steffens@gmail.com> -In-Reply-To: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steffens@gmail.com> -References: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Sat, 14 Apr 2018 18:49:14 +0200 -Subject: [PATCH 3/4] meson: Version libMesaOpenCL like autotools does - -This is for parity with autotools. It names the library -libMesaOpenCL.so.1.0.0 and points mesa.icd to the .1 symlink. - -opencl_version now matches configure.ac's OPENCL_VERSION. - -Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> ---- - src/gallium/targets/opencl/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build -index bebe0547d4..317ad8dab4 100644 ---- a/src/gallium/targets/opencl/meson.build -+++ b/src/gallium/targets/opencl/meson.build -@@ -20,7 +20,7 @@ - - opencl_link_args = [] - opencl_link_deps = [] --opencl_version = '1.0' -+opencl_version = '1' - - if with_ld_version_script - opencl_link_args += [ -@@ -55,7 +55,7 @@ libopencl = shared_library( - cpp.find_library('clangLex', dirs : llvm_libdir), - cpp.find_library('clangBasic', dirs : llvm_libdir), - ], -- version : opencl_version, -+ version : '@0@.0.0'.format(opencl_version), - install : true, - ) - --- -2.17.0 - diff --git a/libre/mesa/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch b/libre/mesa/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch deleted file mode 100644 index 683b025d7..000000000 --- a/libre/mesa/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 5abc129c70cac08104fb7f8c757bc30afe8e8803 Mon Sep 17 00:00:00 2001 -Message-Id: <5abc129c70cac08104fb7f8c757bc30afe8e8803.1526409254.git.jan.steffens@gmail.com> -In-Reply-To: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steffens@gmail.com> -References: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steffens@gmail.com> -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net> -Date: Tue, 8 May 2018 11:42:05 +0200 -Subject: [PATCH 4/4] loader_dri3: Variant 2: Wait for pending swaps to - complete before drawable_fini. - -On 2018-05-05 06:25 AM, Mario Kleiner wrote: -> On Sat, May 5, 2018 at 4:08 AM, Mike Lothian <mike@fireburn.co.uk> wrote: ->> I definately saw the steam bug with patch 1 but not with plasmashell, ->> I started seeing it with patch 2 but it seemed to fix itself -> -> I had two hangs of kwin_x11 within the last 6 hours when alt-tabbing -> between windows, where it got stuck in the -> loader_dri3_swapbuffer_barrier() from patch 1/2. Not sure how that is -> possible, or if the stacktrace was misleading, because i had to VT -> switch to a text console to attach the debugger and this might be just -> a side effect of that. But if it is true, then patch 1/2 would not be -> it. Also 1/2 has a potential performance impact, whereas 2/2 doesn't. -> However 2/2 would also need more work, as i can think of more complex -> scenarios where it would filter the wrong events, although not in the -> case of plasmashell or steam. Probably we'd need to sacrifice a few -> sbc bits in the Present events serial field to transport a unique tag -> for each incarnation of the loader_dri3_drawable, like a mini-hash of -> the draw->eid. Ugly ugly... - -How about the below? - -Idle notify events shouldn't need special treatment, since the pixmap -XIDs of the buffers will be different between loader_dri3_drawable -incarnations, aren't they? - -This still leaves the issue that the SBC moves backwards, which could -theoretically result in hangs with apps using glXWaitForSbcOML. Fixing -that would probably require changing the loader_dri3_drawable lifetime -cycle, which would probably be very invasive, if feasible at all. Maybe -we don't need to care about that for the time being, until there's a -real world app running into it. ---- - src/loader/loader_dri3_helper.c | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c -index 2e3b6c619e..e1eecb70a9 100644 ---- a/src/loader/loader_dri3_helper.c -+++ b/src/loader/loader_dri3_helper.c -@@ -365,9 +365,18 @@ dri3_handle_present_event(struct loader_dri3_drawable *draw, - * checking for wrap. - */ - if (ce->kind == XCB_PRESENT_COMPLETE_KIND_PIXMAP) { -- draw->recv_sbc = (draw->send_sbc & 0xffffffff00000000LL) | ce->serial; -- if (draw->recv_sbc > draw->send_sbc) -- draw->recv_sbc -= 0x100000000; -+ uint64_t recv_sbc = (draw->send_sbc & 0xffffffff00000000LL) | ce->serial; -+ -+ /* Only assume wraparound if that results in exactly the previous -+ * SBC + 1, otherwise ignore received SBC > sent SBC (those are -+ * probably from a previous loader_dri3_drawable instance) to avoid -+ * calculating bogus target MSC values in loader_dri3_swap_buffers_msc -+ */ -+ if (recv_sbc <= draw->send_sbc) -+ draw->recv_sbc = recv_sbc; -+ else if (recv_sbc == (draw->recv_sbc + 0x100000001ULL)) -+ draw->recv_sbc = recv_sbc - 0x100000000ULL; -+ - switch (ce->mode) { - case XCB_PRESENT_COMPLETE_MODE_FLIP: - draw->flipping = true; --- -2.17.0 - diff --git a/libre/mesa/LICENSE b/libre/mesa/LICENSE deleted file mode 100644 index 060f4a925..000000000 --- a/libre/mesa/LICENSE +++ /dev/null @@ -1,83 +0,0 @@ -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/ diff --git a/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD deleted file mode 100644 index a3fc4c627..000000000 --- a/libre/mesa/PKGBUILD +++ /dev/null @@ -1,192 +0,0 @@ -# Maintainer (Arch): Jan de Groot <jgc@archlinux.org> -# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -pkgbase=mesa -pkgname=("${pkgbase}") -pkgdesc="A free implementation of the OpenGL specification, without nonfree software recommendations in drirc" -pkgver=18.0.4 -pkgrel=1.parabola2 -arch=('i686' 'x86_64' 'armv7h') -makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' - 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' - 'elfutils' 'llvm' 'libomxil-bellagio' 'clang' 'libglvnd' 'lm_sensors' - 'meson') -makedepends_x86_64=('libclc' 'libunwind') -makedepends_i686=("${makedepends_x86_64[@]}") -url="https://www.mesa3d.org/" -license=('custom') -source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} - LICENSE - 0001-glvnd-fix-gl.pc.patch - 0002-meson-Add-library-versions-to-swr-drivers.patch - 0003-meson-Version-libMesaOpenCL-like-autotools-does.patch - 0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch - drirc) -source_armv7h=("atomic.patch::https://cgit.freedesktop.org/mesa/mesa/patch/?id=498faea103aa7966b435f21d8ff5e36172389b1e") -sha512sums=('f9a14be46c209661ceb318add1611481445d13b47e95c7a5d2a5e5ecfdd5d2c3fa9c2b16b30035bbb8d61ccc7cb65bfa6698ac8b040273e5ab045a951a67752c' - 'SKIP' - 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7' - '2f40198eff47664c831c56e8a63f60a4d1b815cf697e6bdb0be39e6d9c5df043857f6264b7cd2ccf46c07626186c565144e80f4214b5f7936ef7024c47201437' - 'c3f3baf8a5f480ce64b321c031e31c0d5819732ca34647ac545d0fd7fafa40ad4dcf1e1ec8d574754e0a44bf0cdc462ed8709c8d9b58a17e01c6ba5b4c5e91c6' - 'a2062f8a5259aabed1aa20df6a8510f0f3e914cb6bba72751249b3295285596bb7615063a7a7b7870f9f4489d0e6b774f0bced2bdde49a1aa9df6a44976462d1' - '572901a1e9cacfacfc8c4cc3cd077a626d4aeda8c8a58f6085bae827cba8a2d4d99af1dafbb5a9296b6ebf3120e2b05a084fe1c96093074befe62597319384a1' - '7d949d1f45e68b8ec71ca0192569eeb6fc98b540e9696fea437894db02d98a78724ae4021f244137dd2ed2c8c167e96016f20306b4cf83c2defc8acd10170a1e') -sha512sums_armv7h=('75cd21bccc84a6b6b0de39c6d209c8bee0e5143b486433184ca078e8bc6797d30746be3ce5f7a89eea9bc3c7e2d68880412511fd6b9946252c7c7638523c6caa') -validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov@gmail.com> - '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty@igalia.com> - 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>" - 'A5CC9FEC93F2F837CB044912336909B6B25FADFA') # Juan A. Suarez Romero <jasuarez@igalia.com> - -prepare() { - cd mesa-${pkgver} - - # glvnd support patches - from Fedora - # non-upstreamed ones - patch -Np1 -i ../0001-glvnd-fix-gl.pc.patch - - # Upstreamed meson fixes - patch -Np1 -i ../0002-meson-Add-library-versions-to-swr-drivers.patch - patch -Np1 -i ../0003-meson-Version-libMesaOpenCL-like-autotools-does.patch - - # experimental patch, should fix FS#58549 - # variant 2 patch should fix FS#58605 - # see https://bugs.freedesktop.org/show_bug.cgi?id=106351 - # and https://patchwork.freedesktop.org/series/42687/ - patch -Np1 -i ../0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch -} - -build() { - case "$CARCH" in - x86_64|i686) - DRI=i915,i965,r100,r200,nouveau - GALLIUM=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr - VULKAN=amd,intel - SWR_ARCHES=avx,avx2 - OPENCL=icd - GALLIUM_XA=true - LIBUNWIND=true - ;; - armv7h) - DRI=nouveau - GALLIUM=freedreno,nouveau,swrast,virgl,etnaviv,imx,vc4 - VULKAN= - SWR_ARCHES= - OPENCL=disabled - GALLIUM_XA=false - LIBUNWIND=false - ;; - esac - - arch-meson mesa-$pkgver build \ - -D b_lto=false \ - -D b_ndebug=true \ - -D platforms=x11,wayland,drm,surfaceless \ - -D dri-drivers=${DRI} \ - -D gallium-drivers=${GALLIUM} \ - -D vulkan-drivers=${VULKAN} \ - -D swr-arches=${SWR_ARCHES} \ - -D dri3=true \ - -D egl=true \ - -D gallium-extra-hud=true \ - -D gallium-nine=true \ - -D gallium-omx=true \ - -D gallium-opencl=${OPENCL} \ - -D gallium-va=true \ - -D gallium-vdpau=true \ - -D gallium-xa=${GALLIUM_XA} \ - -D gallium-xvmc=false \ - -D gbm=true \ - -D gles1=true \ - -D gles2=true \ - -D glvnd=true \ - -D glx=dri \ - -D libunwind=${LIBUNWIND} \ - -D llvm=true \ - -D lmsensors=true \ - -D osmesa=gallium \ - -D shared-glapi=true \ - -D texture-float=true \ - -D valgrind=false - - # 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_mesa() { - depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' - 'libomxil-bellagio' 'llvm-libs' 'lm_sensors' 'libglvnd') - depends_x86_64=('libunwind') - depends_i686=("${depends_x86_64[@]}") - 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') - backup=('etc/drirc') - - install -m755 -d ${pkgdir}/etc - cp -v ${srcdir}/drirc ${pkgdir}/etc - - _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json - - # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast - _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* - if [ "$CARCH" = "i686" ]; then - _install fakeinstall/usr/lib/libwayland*.so* - fi - - if [ "$CARCH" != "armv7h" ]; then - _install fakeinstall/usr/lib/libxatracker.so* - _install fakeinstall/usr/lib/libswrAVX*.so* - fi - - # in libglvnd - rm -v fakeinstall/usr/lib/libGLESv{1_CM,2}.so* - - # in vulkan-headers - rm -rfv fakeinstall/usr/include/vulkan - - if [ "$CARCH" != "i686" ]; then - # in wayland - rm -v fakeinstall/usr/lib/libwayland-egl.so* - rm -v fakeinstall/usr/lib/pkgconfig/wayland-egl.pc - fi - - _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 -} diff --git a/libre/mesa/drirc b/libre/mesa/drirc deleted file mode 100644 index 946cbc803..000000000 --- a/libre/mesa/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> |