From 3c05327be70d55249017f007cbe4062e9655261c Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 9 May 2019 16:02:09 +0200
Subject: Deps: update mlt (kdenlive needs that) and wayland

---
 deps/wayland/.url               |  2 +-
 deps/wayland/wayland.SlackBuild | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'deps/wayland')

diff --git a/deps/wayland/.url b/deps/wayland/.url
index f32621e..060b3d0 100644
--- a/deps/wayland/.url
+++ b/deps/wayland/.url
@@ -1,2 +1,2 @@
-https://wayland.freedesktop.org/releases/wayland-1.14.0.tar.xz
+https://wayland.freedesktop.org/releases/wayland-1.17.0.tar.xz
 
diff --git a/deps/wayland/wayland.SlackBuild b/deps/wayland/wayland.SlackBuild
index 2563450..d1b51cd 100755
--- a/deps/wayland/wayland.SlackBuild
+++ b/deps/wayland/wayland.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2015  Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2015, 2017  Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2017, 2019  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -24,10 +24,10 @@
 
 
 PKGNAM=wayland
-VERSION=${VERSION:-1.14.0}
+VERSION=${VERSION:-1.17.0}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:-" -j4 "}
+NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -36,7 +36,7 @@ PKG=$TMP/package-$PKGNAM
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
     *) ARCH=$(uname -m) ;;
@@ -103,6 +103,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 # Strip binaries:
 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