From c21461635f79d78b704f0f0228088ecac30cc267 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 18 Oct 2019 00:58:04 +0000
Subject: Fri Oct 18 00:58:04 UTC 2019

a/kernel-generic-4.19.80-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.19.80-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.19.80-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.19.80-x86-1.txz:  Upgraded.
k/kernel-source-4.19.80-noarch-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/l/orc/orc.SlackBuild | 38 +++++++++++++++++++++-----------------
 source/l/orc/slack-desc     |  2 +-
 2 files changed, 22 insertions(+), 18 deletions(-)

(limited to 'source/l')

diff --git a/source/l/orc/orc.SlackBuild b/source/l/orc/orc.SlackBuild
index d8ca27206..fa5905516 100755
--- a/source/l/orc/orc.SlackBuild
+++ b/source/l/orc/orc.SlackBuild
@@ -93,26 +93,30 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Configure:
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
-./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 \
-  --disable-static \
-  --build=$TARGET || exit 1
-
-# Build and install:
-make || 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 ..
+
+# No static libraries:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.a
 
 # Strip binaries:
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
diff --git a/source/l/orc/slack-desc b/source/l/orc/slack-desc
index a9ee320fd..2f9dc07f5 100644
--- a/source/l/orc/slack-desc
+++ b/source/l/orc/slack-desc
@@ -14,6 +14,6 @@ orc: a generic assembly language that represents many of the features
 orc: available in SIMD architectures, including saturated addition and
 orc: subtraction, and many arithmetic operations.
 orc:
-orc:
 orc: Homepage: https://gstreamer.freedesktop.org/src/orc/
 orc:
+orc:
-- 
cgit v1.2.3-65-gdbad