From df9b2cc1642e4d976aa5f9dbcd3e953d8717a265 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 3 Apr 2020 23:07:16 +0000
Subject: Fri Apr  3 23:07:16 UTC 2020

ap/lsof-4.93.2-x86_64-2.txz:  Rebuilt.
  Fixed the manpage. Thanks to kaott.
ap/sc-7.16-x86_64-7.txz:  Rebuilt.
  Brought back the classic SC. Thanks to dive.
d/Cython-0.29.16-x86_64-1.txz:  Upgraded.
d/mercurial-5.3.2-x86_64-1.txz:  Upgraded.
l/gtk+3-3.24.17-x86_64-1.txz:  Upgraded.
n/dhcpcd-8.1.7-x86_64-1.txz:  Upgraded.
n/iproute2-5.6.0-x86_64-1.txz:  Upgraded.
x/libdrm-2.4.101-x86_64-1.txz:  Upgraded.
x/mesa-20.0.4-x86_64-1.txz:  Upgraded.
xap/mozilla-firefox-68.6.1esr-x86_64-1.txz:  Upgraded.
  This release contains critical security fixes and improvements.
  "Under certain conditions, when running the nsDocShell destructor, a race
  condition can cause a use-after-free. We are aware of targeted attacks in
  the wild abusing this flaw."
  "Under certain conditions, when handling a ReadableStream, a race condition
  can cause a use-after-free. We are aware of targeted attacks in the wild
  abusing this flaw."
  For more information, see:
    https://www.mozilla.org/en-US/firefox/68.6.1/releasenotes/
    https://www.mozilla.org/en-US/security/advisories/mfsa2020-11/
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-6819
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-6820
  (* Security fix *)
---
 source/x/libdrm/libdrm.SlackBuild | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'source/x')

diff --git a/source/x/libdrm/libdrm.SlackBuild b/source/x/libdrm/libdrm.SlackBuild
index c2590ef78..e8b6ee28d 100755
--- a/source/x/libdrm/libdrm.SlackBuild
+++ b/source/x/libdrm/libdrm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2006-2010, 2014, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2010, 2014, 2015, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -80,21 +80,28 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Configure:
-CFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
   --mandir=/usr/man \
-  --enable-udev \
-  --build=$ARCH-slackware-linux || exit 1
-
-# Build and install:
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --buildtype=release \
+  -Dudev=true \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-- 
cgit v1.2.3