diff options
| -rw-r--r-- | libraries/lilv/README | 3 | ||||
| -rw-r--r-- | libraries/lilv/lilv.SlackBuild | 18 | ||||
| -rw-r--r-- | libraries/lilv/lilv.info | 6 | ||||
| -rw-r--r-- | libraries/lilv/lilvmm.patch | 40 |
4 files changed, 17 insertions, 50 deletions
diff --git a/libraries/lilv/README b/libraries/lilv/README index 4ea88690c0..a0fe1622b3 100644 --- a/libraries/lilv/README +++ b/libraries/lilv/README @@ -3,3 +3,6 @@ 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 028db0ad97..aa121f8f71 100644 --- a/libraries/lilv/lilv.SlackBuild +++ b/libraries/lilv/lilv.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for lilv -# Copyright 2012-2013 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2012-2014 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lilv -VERSION=0.16.0 +VERSION=${VERSION:-0.18.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,6 +54,13 @@ 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 @@ -69,9 +76,6 @@ 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 {} \; -# Fix building python bindings -patch -p2 -i $CWD/lilvmm.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./waf configure \ @@ -80,8 +84,8 @@ CXXFLAGS="$SLKCFLAGS" \ --configdir=/etc \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --bindings \ - --dyn-manifest + --dyn-manifest \ + $bindings ./waf diff --git a/libraries/lilv/lilv.info b/libraries/lilv/lilv.info index d02534202c..c9e65e671d 100644 --- a/libraries/lilv/lilv.info +++ b/libraries/lilv/lilv.info @@ -1,8 +1,8 @@ PRGNAM="lilv" -VERSION="0.16.0" +VERSION="0.18.0" HOMEPAGE="http://drobilla.net/software/lilv/" -DOWNLOAD="http://download.drobilla.net/lilv-0.16.0.tar.bz2" -MD5SUM="12eb71f2b5b8a68e15c1c816896bcb9f" +DOWNLOAD="http://download.drobilla.net/lilv-0.18.0.tar.bz2" +MD5SUM="1d1232ea73b239551bb4f462b414a819" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="sratom" diff --git a/libraries/lilv/lilvmm.patch b/libraries/lilv/lilvmm.patch deleted file mode 100644 index 410aac5e32..0000000000 --- a/libraries/lilv/lilvmm.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: trunk/lilv/lilv/lilvmm.hpp
-===================================================================
---- trunk/lilv/lilv/lilvmm.hpp (revision 4975)
-+++ trunk/lilv/lilv/lilvmm.hpp (revision 5092)
-@@ -48,4 +48,9 @@
- inline RT name(T1 a1, T2 a2) { \
- return lilv_ ## prefix ## _ ## name(me, a1, a2); \
-+ }
-+
-+#define LILV_WRAP3(RT, prefix, name, T1, a1, T2, a2, T3, a3) \
-+ inline RT name(T1 a1, T2 a2, T3 a3) { \
-+ return lilv_ ## prefix ## _ ## name(me, a1, a2, a3); \
- }
-
-@@ -138,4 +143,25 @@
- LILV_WRAP1(bool, nodes, contains, const Node, node);
- LILV_WRAP0(Node, nodes, get_first);
-+};
-+
-+struct UI {
-+ inline UI(const LilvUI* c_obj) : me(c_obj) {}
-+ LILV_WRAP_CONVERSION(const LilvUI);
-+
-+ LILV_WRAP0(const LilvNode*, ui, get_uri);
-+ LILV_WRAP0(const LilvNode*, ui, get_bundle_uri);
-+ LILV_WRAP0(const LilvNode*, ui, get_binary_uri);
-+ LILV_WRAP0(const LilvNodes*, ui, get_classes);
-+ /*LILV_WRAP3(bool, ui, is_supported,
-+ LilvUISupportedFunc, supported_func,
-+ const LilvNode*, container_type,
-+ const LilvNode**, ui_type);*/
-+ LILV_WRAP1(bool, ui, is_a, const LilvNode*, class_uri);
-+
-+ const LilvUI* me;
-+};
-+
-+struct UIs {
-+ LILV_WRAP_COLL(UIs, UI, uis);
- };
-
|