From b34d35ccdc6282b4584693786980c8d6ed6708f8 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 11 Sep 2017 23:04:42 +0200
Subject: Updated deps for KDE 5_17.09

---
 deps/wayland/.url               |  2 +-
 deps/wayland/wayland.SlackBuild | 67 +++++++++++++++++++----------------------
 2 files changed, 32 insertions(+), 37 deletions(-)

(limited to 'deps/wayland')

diff --git a/deps/wayland/.url b/deps/wayland/.url
index 22ad4f9..f32621e 100644
--- a/deps/wayland/.url
+++ b/deps/wayland/.url
@@ -1,2 +1,2 @@
-https://wayland.freedesktop.org/releases/wayland-1.13.0.tar.xz
+https://wayland.freedesktop.org/releases/wayland-1.14.0.tar.xz
 
diff --git a/deps/wayland/wayland.SlackBuild b/deps/wayland/wayland.SlackBuild
index ca34b35..2563450 100755
--- a/deps/wayland/wayland.SlackBuild
+++ b/deps/wayland/wayland.SlackBuild
@@ -24,50 +24,45 @@
 
 
 PKGNAM=wayland
-VERSION=${VERSION:-1.13.0}
+VERSION=${VERSION:-1.14.0}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
-if [ -e $CWD/machine.conf ]; then
-  . $CWD/machine.conf ]
-elif [ -e /etc/slackbuild/machine.conf ]; then
-  . /etc/slackbuild/machine.conf ]
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    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) ;;
+  esac
+  export ARCH
+fi
+
+# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2 -march=armv5te"
+  LIBDIRSUFFIX=""
 else
-  # Automatically determine the architecture we're building on:
-  MARCH=$( uname -m )
-  if [ -z "$ARCH" ]; then
-    case "$MARCH" in
-      i?86)    export ARCH=i586 ;;
-      arm*)    export ARCH=arm ;;
-      # Unless $ARCH is already set, use uname -m for all other archs:
-      *)       export ARCH=$MARCH ;;
-    esac
-  fi
-  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
-  if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "i586" ]; then
-    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "s390" ]; then
-    SLKCFLAGS="-O2"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "x86_64" ]; then
-    SLKCFLAGS="-O2 -fPIC"
-    LIBDIRSUFFIX="64"
-  elif [ "$ARCH" = "arm" ]; then
-    SLKCFLAGS="-O2 -march=armv5te"
-    LIBDIRSUFFIX=""
-  else
-    SLKCFLAGS="-O2"
-    LIBDIRSUFFIX=""
-  fi
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 case "$ARCH" in
-- 
cgit v1.2.3