From ec86cffd8eec12d657afec63d5da1ad84b43d510 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Thu, 14 Jan 2021 20:36:17 +0000
Subject: Thu Jan 14 20:36:17 UTC 2021

a/gptfdisk-1.0.6-x86_64-1.txz:  Upgraded.
a/usb_modeswitch-2.6.1-x86_64-1.txz:  Upgraded.
ap/nano-5.5-x86_64-1.txz:  Upgraded.
l/Mako-1.1.4-x86_64-1.txz:  Upgraded.
l/gst-plugins-base-1.18.3-x86_64-1.txz:  Upgraded.
l/gst-plugins-good-1.18.3-x86_64-1.txz:  Upgraded.
l/gst-plugins-libav-1.18.3-x86_64-1.txz:  Upgraded.
l/gstreamer-1.18.3-x86_64-1.txz:  Upgraded.
l/system-config-printer-1.5.15-x86_64-1.txz:  Upgraded.
l/wavpack-5.4.0-x86_64-1.txz:  Upgraded.
  WavPack 5.4.0 fixes an issue where a specially crafted WAV file could cause
  the wavpack command-line program to crash with an out-of-bounds write.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-35738
  (* Security fix *)
l/xapian-core-1.4.18-x86_64-1.txz:  Upgraded.
tcl/tk-8.6.11.1-x86_64-1.txz:  Upgraded.
x/mesa-20.3.3-x86_64-1.txz:  Upgraded.
  Added options: -Dvulkan-device-select-layer=true -Dopengl=true -Dglx=dri
  Add a symlink for libGLX_system.so.0.
  Use a more complete patch for converting from drmPciDeviceInfo to uint32_t
  in device_select.h and device_select_layer.c.
xfce/thunar-4.16.2-x86_64-1.txz:  Upgraded.
---
 source/x/mesa/mesa.SlackBuild | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'source/x/mesa/mesa.SlackBuild')

diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 578024903..8cbc8b6fd 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -124,6 +124,7 @@ meson setup \
   -Dosmesa=gallium \
   -Ddri-drivers=$DRI_DRIVERS \
   -Dgallium-drivers=$GALLIUM_DRIVERS \
+  -Dvulkan-device-select-layer=true \
   -Dglvnd=true \
   -Dllvm=enabled \
   -Dshared-llvm=enabled \
@@ -131,6 +132,8 @@ meson setup \
   -Degl=enabled \
   -Dgles1=enabled \
   -Dgles2=enabled \
+  -Dopengl=true \
+  -Dglx=dri \
   .. || exit 1
   "${NINJA:=ninja}" $NUMJOBS || exit 1
   DESTDIR=$PKG $NINJA install || exit 1
@@ -141,6 +144,13 @@ if [ -r $PKG/etc/drirc ]; then
   mv $PKG/etc/drirc $PKG/etc/drirc.new
 fi
 
+# Add a default provider for glvnd when the vendor cannot be determined:
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  if [ ! -r libGLX_system.so.0 ]; then
+    ln -sf libGLX_mesa.so.0 libGLX_system.so.0
+  fi
+)
+
 if [ "$BUILD_DEMOS" = "YES" ]; then
   # Now build/install a small subset of the demos:
   export CWD SLKCFLAGS NUMJOBS PKG
-- 
cgit v1.2.3