From ce00f77117a9aa40c35896cbce8395999fd3c9a9 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 28 Oct 2019 00:39:04 +0000
Subject: Mon Oct 28 00:39:04 UTC 2019

a/btrfs-progs-5.3.1-x86_64-1.txz:  Upgraded.
a/eudev-3.2.9-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20191025_340e06e-noarch-1.txz:  Upgraded.
ap/mpg123-1.25.13-x86_64-1.txz:  Upgraded.
ap/xorriso-1.5.2-x86_64-1.txz:  Upgraded.
l/gegl-0.4.18-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.10_69-x86_64-1.txz:  Upgraded.
l/libedit-20191025_3.1-x86_64-1.txz:  Upgraded.
extra/pure-alsa-system/mpg123-1.25.13-x86_64-1_alsa.txz:  Upgraded.
---
 source/l/gegl/gegl.SlackBuild | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'source/l/gegl/gegl.SlackBuild')

diff --git a/source/l/gegl/gegl.SlackBuild b/source/l/gegl/gegl.SlackBuild
index 01d3dd012..e09167864 100755
--- a/source/l/gegl/gegl.SlackBuild
+++ b/source/l/gegl/gegl.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gegl
 VERSION=${VERSION:-$(echo gegl-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -77,24 +77,27 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-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} \
-  --docdir=/usr/doc/gegl-$VERSION \
-  --enable-gtk-doc \
-  --disable-docs \
-  --build=$ARCH-slackware-linux || exit 1
-
-# Trust defaults:
-#  --enable-mmx \
-#  --disable-sse \
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+  --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 \
+  --buildtype=release \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -118,4 +121,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/gegl-$VERSION-$ARCH-$BUILD.txz
-
-- 
cgit v1.2.3