summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/lilv/lilv.SlackBuild7
-rw-r--r--libraries/lilv/lilv.info6
-rw-r--r--libraries/lilv/lilvmm.patch40
3 files changed, 48 insertions, 5 deletions
diff --git a/libraries/lilv/lilv.SlackBuild b/libraries/lilv/lilv.SlackBuild
index d8f6c551be..0f26d1bc43 100644
--- a/libraries/lilv/lilv.SlackBuild
+++ b/libraries/lilv/lilv.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for lilv
-# Copyright 2012 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2012-2013 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.14.2
+VERSION=0.16.0
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -65,6 +65,9 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
+# Fix building python bindings
+patch -p2 -i $CWD/lilvmm.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./waf configure \
diff --git a/libraries/lilv/lilv.info b/libraries/lilv/lilv.info
index 26b634426e..d02534202c 100644
--- a/libraries/lilv/lilv.info
+++ b/libraries/lilv/lilv.info
@@ -1,8 +1,8 @@
PRGNAM="lilv"
-VERSION="0.14.2"
+VERSION="0.16.0"
HOMEPAGE="http://drobilla.net/software/lilv/"
-DOWNLOAD="http://download.drobilla.net/lilv-0.14.2.tar.bz2"
-MD5SUM="1aea6761f3e44007c0fb4eb20630655d"
+DOWNLOAD="http://download.drobilla.net/lilv-0.16.0.tar.bz2"
+MD5SUM="12eb71f2b5b8a68e15c1c816896bcb9f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="sratom"
diff --git a/libraries/lilv/lilvmm.patch b/libraries/lilv/lilvmm.patch
new file mode 100644
index 0000000000..410aac5e32
--- /dev/null
+++ b/libraries/lilv/lilvmm.patch
@@ -0,0 +1,40 @@
+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);
+ };
+