diff options
author | Vi0L0 | 2018-04-29 18:02:23 +0200 |
---|---|---|
committer | Vi0L0 | 2018-04-29 18:02:23 +0200 |
commit | 832eb1bcc29f4f40528a58e4142cebea4e26d477 (patch) | |
tree | c40e702cc6487ce1e9bf094a94730c6fac1f11b0 | |
parent | 07554c04ee3fd9b95cd6797fc6abf226e7fe5ac6 (diff) | |
download | aur-832eb1bcc29f4f40528a58e4142cebea4e26d477.tar.gz |
18.0.2
-rw-r--r-- | .SRCINFO | 35 | ||||
-rw-r--r-- | 0004-meson-Add-library-versions-to-swr-drivers.patch | 71 | ||||
-rw-r--r-- | 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch | 43 | ||||
-rw-r--r-- | LICENSE | 87 | ||||
-rw-r--r-- | PKGBUILD | 228 | ||||
-rw-r--r-- | swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch | 14 |
6 files changed, 290 insertions, 188 deletions
@@ -1,8 +1,9 @@ +# Generated by mksrcinfo v8 +# Sun Apr 29 16:01:05 UTC 2018 pkgbase = mesa-noglvnd - pkgver = 17.2.2 + pkgver = 18.0.2 pkgrel = 1 url = https://www.mesa3d.org/ - arch = i686 arch = x86_64 license = custom makedepends = python2-mako @@ -26,24 +27,25 @@ pkgbase = mesa-noglvnd makedepends = clang makedepends = libunwind makedepends = lm_sensors - source = https://mesa.freedesktop.org/archive/mesa-17.2.2.tar.xz - source = https://mesa.freedesktop.org/archive/mesa-17.2.2.tar.xz.sig + makedepends = meson + source = https://mesa.freedesktop.org/archive/mesa-18.0.2.tar.xz + source = https://mesa.freedesktop.org/archive/mesa-18.0.2.tar.xz.sig source = LICENSE source = 0002-glvnd-fix-gl-dot-pc.patch - source = swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch - sha256sums = cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782 - sha256sums = SKIP - sha256sums = 7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2 - sha256sums = 64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966 - sha256sums = 2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b + source = 0004-meson-Add-library-versions-to-swr-drivers.patch + source = 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch + sha512sums = 77d24d01c4c22596d28421aeb74932ff232730a4f556ae1a2e8777ece2876e4e352679575385c065505df4a2a83d2c1cf30db92dcf88038417e36a2768332d7e + sha512sums = SKIP + sha512sums = f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7 + sha512sums = 75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028 + sha512sums = 0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff + sha512sums = d3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf pkgname = opencl-mesa-noglvnd pkgdesc = OpenCL support for AMD/ATI Radeon mesa drivers - non-libglvnd version depends = expat depends = libdrm depends = libelf - depends = lm_sensors - depends = libunwind depends = libclc depends = clang optdepends = opencl-headers: headers necessary for OpenCL development @@ -59,6 +61,7 @@ pkgname = vulkan-intel-noglvnd depends = wayland depends = libx11 depends = libxshmfence + depends = libdrm provides = vulkan-driver provides = vulkan-intel conflicts = vulkan-intel @@ -89,8 +92,6 @@ pkgname = libva-mesa-driver-noglvnd depends = expat depends = libelf depends = libxshmfence - depends = lm_sensors - depends = libunwind provides = libva-mesa-driver conflicts = libva-mesa-driver replaces = libva-mesa-driver @@ -102,10 +103,7 @@ pkgname = mesa-vdpau-noglvnd depends = llvm-libs depends = expat depends = libelf - depends = libgcrypt depends = libxshmfence - depends = lm_sensors - depends = libunwind provides = mesa-vdpau conflicts = mesa-vdpau replaces = mesa-vdpau @@ -119,8 +117,9 @@ pkgname = mesa-noglvnd depends = libxshmfence depends = libelf depends = libomxil-bellagio - depends = libtxc_dxtn + depends = libunwind depends = llvm-libs + depends = lm_sensors optdepends = opengl-man-pages: for the OpenGL API man pages optdepends = mesa-vdpau-noglvnd: for accelerated video playback optdepends = libva-mesa-driver-noglvnd: for accelerated video playback diff --git a/0004-meson-Add-library-versions-to-swr-drivers.patch b/0004-meson-Add-library-versions-to-swr-drivers.patch new file mode 100644 index 000000000000..b9ae485dfc30 --- /dev/null +++ b/0004-meson-Add-library-versions-to-swr-drivers.patch @@ -0,0 +1,71 @@ +From cd56731b2c63532d6ed97f7b39afa5977936b3bc Mon Sep 17 00:00:00 2001 +Message-Id: <cd56731b2c63532d6ed97f7b39afa5977936b3bc.1523725229.git.jan.steffens@gmail.com> +In-Reply-To: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steffens@gmail.com> +References: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.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 4/5] 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.16.2 + diff --git a/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch b/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch new file mode 100644 index 000000000000..de93fc31afff --- /dev/null +++ b/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch @@ -0,0 +1,43 @@ +From 064f328419936a8a5df2b0474ae76196d92e6fa0 Mon Sep 17 00:00:00 2001 +Message-Id: <064f328419936a8a5df2b0474ae76196d92e6fa0.1523725229.git.jan.steffens@gmail.com> +In-Reply-To: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steffens@gmail.com> +References: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.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 5/5] 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.16.2 + @@ -1,33 +1,34 @@ +The Mesa 3D Graphics Library + 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. + 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 + 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. + * 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, 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 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 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: + The default Mesa license is as follows: Copyright (C) 1999-2007 Brian Paul All Rights Reserved. @@ -44,39 +45,39 @@ 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. +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. - + 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) +Component Location License +------------------------------------------------------------------ +Main Mesa code src/mesa/ MIT -Device drivers src/mesa/drivers/* See drivers See drivers +Device drivers src/mesa/drivers/* MIT, generally -Ext headers include/GL/glext.h SGI SGI Free B - include/GL/glxext.h +Gallium code src/gallium/ MIT -GLUT src/glut/ Mark Kilgard Mark's copyright - -Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL +Ext headers include/GL/glext.h Khronos + include/GL/glxext.h -SGI GLU library src/glu/sgi/ SGI SGI Free B +GLX client code src/glx/ SGI Free Software License B -demo programs progs/demos/ various see source files +C11 thread include/c11/threads*.h Boost (permissive) emulation -X demos progs/xdemos/ Brian Paul see source files + In general, consult the source files for license terms. -SGI demos progs/samples/ SGI SGI copyright +References -RedBook demos progs/redbook/ SGI SGI copyright + 1. https://www.opengl.org/ + 2. https://www.sgi.com/ + 3. https://www.sgi.com/ @@ -5,26 +5,28 @@ pkgbase=mesa-noglvnd pkgname=('opencl-mesa-noglvnd' 'vulkan-intel-noglvnd' 'vulkan-radeon-noglvnd' 'libva-mesa-driver-noglvnd' 'mesa-vdpau-noglvnd' 'mesa-noglvnd' 'mesa-libgl-noglvnd') -pkgver=17.2.2 +pkgver=18.0.2 pkgrel=1 -arch=('i686' 'x86_64') +arch=('x86_64') makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm' - 'libomxil-bellagio' 'libclc' 'clang' 'libunwind' 'lm_sensors') # 'libglvnd') + 'libomxil-bellagio' 'libclc' 'clang' 'libunwind' 'lm_sensors' 'meson') # 'libglvnd') url="https://www.mesa3d.org/" license=('custom') source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} LICENSE 0002-glvnd-fix-gl-dot-pc.patch - swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch) -sha256sums=('cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782' + 0004-meson-Add-library-versions-to-swr-drivers.patch + 0005-meson-Version-libMesaOpenCL-like-autotools-does.patch) +sha512sums=('77d24d01c4c22596d28421aeb74932ff232730a4f556ae1a2e8777ece2876e4e352679575385c065505df4a2a83d2c1cf30db92dcf88038417e36a2768332d7e' 'SKIP' - '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' - '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966' - '2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b') -validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> -validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez <tanty@igalia.com> -validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>" + 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7' + '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028' + '0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff' + 'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf') +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>" prepare() { cd ${srcdir}/mesa-${pkgver} @@ -33,89 +35,90 @@ prepare() { # non-upstreamed ones patch -Np1 -i ../0002-glvnd-fix-gl-dot-pc.patch - # swr driver - patch -Np1 -i ../swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch - - autoreconf -fiv + # Upstreamed meson fixes + patch -Np1 -i ../0004-meson-Add-library-versions-to-swr-drivers.patch + patch -Np1 -i ../0005-meson-Version-libMesaOpenCL-like-autotools-does.patch } build() { - cd ${srcdir}/mesa-${pkgver} + 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 \ + -D vulkan-drivers=amd,intel \ + -D swr-arches=avx,avx2 \ + -D dri3=true \ + -D egl=true \ + -D gallium-extra-hud=true \ + -D gallium-nine=true \ + -D gallium-omx=true \ + -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=true \ + -D gles2=true \ + -D glvnd=false \ + -D glx=dri \ + -D libunwind=true \ + -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 +} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr \ - --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --with-platforms=x11,drm,wayland \ - --with-vulkan-drivers=intel,radeon \ - --disable-xvmc \ - --enable-llvm \ - --enable-llvm-shared-libs \ - --enable-shared-glapi \ - --disable-libglvnd \ - --enable-libunwind \ - --enable-lmsensors \ - --enable-egl \ - --enable-glx \ - --enable-glx-tls \ - --enable-gles1 \ - --enable-gles2 \ - --enable-gbm \ - --enable-dri \ - --enable-gallium-osmesa \ - --enable-gallium-extra-hud \ - --enable-texture-float \ - --enable-xa \ - --enable-vdpau \ - --enable-omx \ - --enable-nine \ - --enable-opencl \ - --enable-opencl-icd \ - --with-clang-libdir=/usr/lib - - make - - # fake installation - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall 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_opencl-mesa-noglvnd() { pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers - non-libglvnd version" - depends=('expat' 'libdrm' 'libelf' 'lm_sensors' 'libunwind' 'libclc' 'clang') + depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang') optdepends=('opencl-headers: headers necessary for OpenCL development') provides=('opencl-driver' 'opencl-mesa') conflicts=('opencl-mesa' 'opencl-mesa-git') replaces=('opencl-mesa' 'opencl-mesa-git') - install -m755 -d ${pkgdir}/etc - cp -rv ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/ + _install fakeinstall/etc/OpenCL + _install fakeinstall/usr/lib/lib*OpenCL* + _install fakeinstall/usr/lib/gallium-pipe - install -m755 -d ${pkgdir}/usr/lib/gallium-pipe - cp -rv ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/ - cp -rv ${srcdir}/fakeinstall/usr/lib/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/" + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE } package_vulkan-intel-noglvnd() { pkgdesc="Intel's Vulkan mesa driver - non-libglvnd version" - depends=('wayland' 'libx11' 'libxshmfence') + depends=('wayland' 'libx11' 'libxshmfence' 'libdrm') provides=('vulkan-driver' 'vulkan-intel') conflicts=('vulkan-intel' 'vulkan-intel-git') replaces=('vulkan-intel' 'vulkan-intel-git') - install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d - mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ - - install -m755 -d ${pkgdir}/usr/{include/vulkan,lib} - mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/ - mv -v ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan + _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 -m755 -d "${pkgdir}/usr/share/licenses/vulkan-intel" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/" + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE } package_vulkan-radeon-noglvnd() { @@ -125,48 +128,40 @@ package_vulkan-radeon-noglvnd() { conflicts=('vulkan-radeon' 'vulkan-radeon-git') replaces=('vulkan-radeon' 'vulkan-radeon-git') - install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d - mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/ + _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json + _install fakeinstall/usr/lib/libvulkan_radeon.so - install -m755 -d ${pkgdir}/usr/lib - mv -v ${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/" + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE } package_libva-mesa-driver-noglvnd() { pkgdesc="VA-API implementation for gallium - non-libglvnd version" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors' 'libunwind') + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence') provides=('libva-mesa-driver') conflicts=('libva-mesa-driver') replaces=('libva-mesa-driver') - install -m755 -d ${pkgdir}/usr/lib - cp -rv ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib + _install fakeinstall/usr/lib/dri/*_drv_video.so - install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/" + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE } package_mesa-vdpau-noglvnd() { pkgdesc="Mesa VDPAU drivers - non-libglvnd version" - depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libgcrypt' 'libxshmfence' 'lm_sensors' 'libunwind') + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence') provides=('mesa-vdpau') conflicts=('mesa-vdpau') replaces=('mesa-vdpau') - install -m755 -d ${pkgdir}/usr/lib - cp -rv ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib + _install fakeinstall/usr/lib/vdpau - install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/" + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE } package_mesa-noglvnd() { pkgdesc="an open-source implementation of the OpenGL specification - non-libglvnd version" depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' - 'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs') #'libglvnd') + 'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors') #'libglvnd') optdepends=('opengl-man-pages: for the OpenGL API man pages' 'mesa-vdpau-noglvnd: for accelerated video playback' 'libva-mesa-driver-noglvnd: for accelerated video playback') @@ -175,39 +170,46 @@ package_mesa-noglvnd() { replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa' 'mesa-git') #'mesa-libgl') backup=('etc/drirc') - install -m755 -d ${pkgdir}/etc - cp -rv ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc - - #install -m755 -d ${pkgdir}/usr/share/glvnd/egl_vendor.d/50_mesa.json - #mv -v ${srcdir}/fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json ${pkgdir}/usr/share/glvnd/egl_vendor.d/ + _install fakeinstall/etc/drirc +# _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json - 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/lib/libswrAVX*.so* ${pkgdir}/usr/lib/ + _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/libwayland*.so* + _install fakeinstall/usr/lib/libxatracker.so* + _install fakeinstall/usr/lib/libswrAVX*.so* - cp -rv ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr - cp -rv ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/ +# # in libglvnd +# rm -v fakeinstall/usr/lib/libGLESv{1_CM,2}.so* - # remove vulkan headers - rm -rf ${pkgdir}/usr/include/vulkan + # in vulkan-headers + rm -rv fakeinstall/usr/include/vulkan install -m755 -d ${pkgdir}/usr/lib/mesa # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ? - cp -rv ${srcdir}/fakeinstall/usr/lib/libGL.so* ${pkgdir}/usr/lib/mesa/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL.so* ${pkgdir}/usr/lib/mesa/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libGLES*.so* ${pkgdir}/usr/lib/mesa/ + mv -v ${srcdir}/fakeinstall/usr/lib/libGL.so* ${pkgdir}/usr/lib/mesa/ + mv -v ${srcdir}/fakeinstall/usr/lib/libEGL.so* ${pkgdir}/usr/lib/mesa/ + mv -v ${srcdir}/fakeinstall/usr/lib/libGLES*.so* ${pkgdir}/usr/lib/mesa/ + + _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 -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE } package_mesa-libgl-noglvnd() { diff --git a/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch b/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch deleted file mode 100644 index b9e81f9a32fe..000000000000 --- a/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/gallium/drivers/swr/rasterizer/core/utils.h b/src/gallium/drivers/swr/rasterizer/core/utils.h -index b096d2120cb..3c849e82d3b 100644 ---- a/src/gallium/drivers/swr/rasterizer/core/utils.h -+++ b/src/gallium/drivers/swr/rasterizer/core/utils.h -@@ -365,7 +365,8 @@ static INLINE std::string GetEnv(const std::string& variableName) - output.resize(valueSize - 1); // valueSize includes null, output.resize() does not - GetEnvironmentVariableA(variableName.c_str(), &output[0], valueSize); - #else -- output = getenv(variableName.c_str()); -+ char *o = getenv(variableName.c_str()); -+ output = o ? std::string(o) : std::string(); - #endif - - return output; |