libraries/wayland: Updated for version 1.12.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 38 insertions, 19 deletions

diff --git a/libraries/wayland/README b/libraries/wayland/README
index 9fcbe81b38..f6190360a2 100644
--- a/libraries/wayland/README
+++ b/libraries/wayland/README
@@ -1,8 +1,16 @@
 The Wayland display server
 
- Wayland is a project to define a protocol for a compositor to talk
- to its clients as well as a library implementation of the protocol.
- The compositor can be a standalone display server running on Linux
- kernel modesetting and evdev input devices, an X application, or a
- wayland client itself. The clients can be traditional applications,
- X servers (rootless or fullscreen) or other display servers.
+Wayland is a project to define a protocol for a compositor to talk
+to its clients as well as a library implementation of the protocol.
+The compositor can be a standalone display server running on Linux
+kernel modesetting and evdev input devices, an X application, or a
+wayland client itself. The clients can be traditional applications,
+X servers (rootless or fullscreen) or other display servers.
+
+Optional Dependency
+
+Building man and html documentation is optional. If you want to build
+that, install graphviz 2.38.0 (ATTENTION!! 2.40.1 is not working!)
+and execute the slackbuild with
+
+  GRAPHVIZ=yes ./wayland.SlackBuild
diff --git a/libraries/wayland/wayland.SlackBuild b/libraries/wayland/wayland.SlackBuild
index c7e40be841..2fce345824 100644
--- a/libraries/wayland/wayland.SlackBuild
+++ b/libraries/wayland/wayland.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# Slackware build script for wayland
+# Slackware build script for Wayland
 
-# Copyright 2014 Diniz Bortolotto
+# Copyright 2014-2017 Diniz Bortolotto <diniz.bortolotto@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wayland
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.12.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,16 +69,25 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Building man and html documentation is optional.
+# If you want to build that, install pre-req graphviz 2.38.0 (2.40.1 is failling)
+# and execute the slackbuild with "GRAPHVIZ=yes ./wayland.SlackBuild".
+GRAPHVIZ=${GRAPHVIZ:-no}
+case "$GRAPHVIZ" in
+  no) DISABLE_DOC="--disable-documentation" ;;
+   *) DISABLE_DOC="" ;;
+esac
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
+  $DISABLE_DOC \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-static=no \
   --build=$ARCH-slackware-linux
 
 make
@@ -87,8 +96,10 @@ make install DESTDIR=$PKG
 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
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+if [ -z "$DISABLE_DOC" ]; then
+  find $PKG/usr/man -type f -exec gzip -9 {} \;
+  for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING README TODO doc/Contributing $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/wayland/wayland.info b/libraries/wayland/wayland.info
index 87b66b50ce..78b6ba2600 100644
--- a/libraries/wayland/wayland.info
+++ b/libraries/wayland/wayland.info
@@ -1,8 +1,8 @@
 PRGNAM="wayland"
-VERSION="1.6.0"
-HOMEPAGE="http://wayland.freedesktop.org/"
-DOWNLOAD="http://wayland.freedesktop.org/releases/wayland-1.6.0.tar.xz"
-MD5SUM="d34c141c975084e4fb668e77b38f840e"
+VERSION="1.12.0"
+HOMEPAGE="https://wayland.freedesktop.org/"
+DOWNLOAD="https://wayland.freedesktop.org/releases/wayland-1.12.0.tar.xz"
+MD5SUM="ee615e2d1e205eec48b02f069327eb96"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""