From be35adbd1160550e441ead585a97faba68a83f27 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 25 Dec 2019 19:00:02 +0000
Subject: Wed Dec 25 19:00:02 UTC 2019

d/ruby-2.7.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
d/subversion-1.13.0-x86_64-2.txz:  Rebuilt.
  Recompiled against ruby-2.7.0.
kde/korundum-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against ruby-2.7.0.
kde/qtruby-4.14.3-x86_64-11.txz:  Rebuilt.
  Recompiled against ruby-2.7.0.
n/epic5-2.1.1-x86_64-3.txz:  Rebuilt.
  Ruby support won't build, so we'll skip it for now.
x/libva-2.6.0-x86_64-1.txz:  Upgraded.
x/libva-utils-2.6.0-x86_64-1.txz:  Upgraded.
---
 source/x/libva-utils/libva-utils.SlackBuild | 38 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'source/x/libva-utils/libva-utils.SlackBuild')

diff --git a/source/x/libva-utils/libva-utils.SlackBuild b/source/x/libva-utils/libva-utils.SlackBuild
index 9eaaae538..d07c0bea2 100755
--- a/source/x/libva-utils/libva-utils.SlackBuild
+++ b/source/x/libva-utils/libva-utils.SlackBuild
@@ -75,29 +75,27 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-# These fix a mandatory check for wayland-scanner:
-mkdir -p m4
-autoreconf -fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$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 \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --enable-shared \
-  --disable-static \
-  --enable-dummy-driver \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+  --buildtype=release \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-- 
cgit v1.2.3