From e7ba54a3297a5b1b35454968648e2270bdb52fcb Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Tue, 9 Jun 2020 19:04:29 +0200
Subject: libraries/lilv: Updated for version 0.24.6, changed maintainer.

Added the new dependency numpy3

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/lilv/README          |  3 ---
 libraries/lilv/lilv.SlackBuild | 24 ++++++++----------------
 libraries/lilv/lilv.info       | 12 ++++++------
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/libraries/lilv/README b/libraries/lilv/README
index a0fe1622b3..4ea88690c0 100644
--- a/libraries/lilv/README
+++ b/libraries/lilv/README
@@ -3,6 +3,3 @@ possible for applications. Lilv is the successor to SLV2, rewritten
 to be significantly faster and have minimal dependencies. It is
 stable, well-tested software (the included test suite covers over
 90% of the code) in use by several applications.
-
-If you want to build language bindings for lilv, pass BINDINGS=yes
-to the script. This additionally requires numpy.
diff --git a/libraries/lilv/lilv.SlackBuild b/libraries/lilv/lilv.SlackBuild
index 2e1bb84911..0c00226ba2 100644
--- a/libraries/lilv/lilv.SlackBuild
+++ b/libraries/lilv/lilv.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for lilv
 
 # Copyright 2012-2016 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2020 Matteo Bernardini, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lilv
-VERSION=${VERSION:-0.22.0}
+VERSION=${VERSION:-0.24.6}
 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 +41,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"
@@ -54,13 +55,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ "${BINDINGS:-no}" = "no" ]; then
-  bindings=""
-else
-  bindings="--bindings"
-  SLKCFLAGS="$SLKCFLAGS -I/usr/lib$LIBDIRSUFFIX/python2.7/site-packages/numpy/core/include/"
-fi
-
 set -e
 
 rm -rf $PKG
@@ -74,11 +68,9 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Fix python bindings
-patch -p1 -i $CWD/fix-python-bindings.patch
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+export PYTHON=python3
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./waf configure \
@@ -101,7 +93,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README \
+cp -a AUTHORS COPYING INSTALL NEWS README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/lilv/lilv.info b/libraries/lilv/lilv.info
index 8c89f38119..51273fe121 100644
--- a/libraries/lilv/lilv.info
+++ b/libraries/lilv/lilv.info
@@ -1,10 +1,10 @@
 PRGNAM="lilv"
-VERSION="0.22.0"
+VERSION="0.24.6"
 HOMEPAGE="http://drobilla.net/software/lilv/"
-DOWNLOAD="http://download.drobilla.net/lilv-0.22.0.tar.bz2"
-MD5SUM="fd3a14fdaeaba4716b4fef526548a747"
+DOWNLOAD="http://download.drobilla.net/lilv-0.24.6.tar.bz2"
+MD5SUM="26768e5bdf3601f280e97c86dcbda79f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="sratom"
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+REQUIRES="numpy3 sratom"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
-- 
cgit v1.2.3