[arch-commits] Commit in lilv/repos/community-x86_64 (5 files)
David Runge
dvzrv at archlinux.org
Mon Jun 22 13:13:59 UTC 2020
Date: Monday, June 22, 2020 @ 13:13:58
Author: dvzrv
Revision: 650523
archrelease: copy trunk to community-x86_64
Added:
lilv/repos/community-x86_64/PKGBUILD
(from rev 650522, lilv/trunk/PKGBUILD)
lilv/repos/community-x86_64/lilv-0.24.8-fix_translations.patch
(from rev 650522, lilv/trunk/lilv-0.24.8-fix_translations.patch)
lilv/repos/community-x86_64/lilvmm.patch
(from rev 650522, lilv/trunk/lilvmm.patch)
Deleted:
lilv/repos/community-x86_64/PKGBUILD
lilv/repos/community-x86_64/lilvmm.patch
------------------------------------+
PKGBUILD | 130 ++++++++++++++++++-----------------
lilv-0.24.8-fix_translations.patch | 56 +++++++++++++++
lilvmm.patch | 80 ++++++++++-----------
3 files changed, 163 insertions(+), 103 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-22 13:13:24 UTC (rev 650522)
+++ PKGBUILD 2020-06-22 13:13:58 UTC (rev 650523)
@@ -1,63 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-# Contributor: speps <speps at aur dot archlinux dot org>
-
-pkgname=lilv
-pkgver=0.24.8
-pkgrel=1
-pkgdesc="A C library interface to the LV2 plug-in standard"
-arch=('x86_64')
-url="https://drobilla.net/software/lilv/"
-license=('custom:ISC')
-depends=('glibc')
-makedepends=('libsndfile' 'lv2' 'python' 'serd' 'sord' 'sratom' 'swig' 'waf')
-optdepends=('bash-completion: completion for bash'
- 'libsndfile: for lv2apply'
- 'python: for Python bindings')
-provides=('liblilv-0.so')
-source=("https://download.drobilla.net/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha512sums=('f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192'
- 'SKIP')
-validpgpkeys=('907D226E7E13FA337F014A083672782A9BF368F3')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
- # let wscript(s) find the custom waf scripts
- mkdir -pv tools
- touch __init__.py
- cp -v waflib/extras/{autoship,autowaf,lv2}.py tools/
- mkdir -pv plugins/tools/
- cp -v waflib/extras/{autoship,autowaf,lv2}.py plugins/tools/
- rm -rv waflib
- sed -e 's/waflib.extras/tools/g' \
- -e "s/load('autowaf'/load('autowaf', tooldir='tools'/g" \
- -e "s/load('lv2'/load('lv2', tooldir='tools'/g" \
- -i wscript
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
- waf configure --prefix=/usr \
- --no-bash-completion \
- --dyn-manifest \
- --test
- waf -v build
-}
-
-check() {
- cd "${pkgname}-${pkgver}"
- waf test
-}
-
-package() {
- depends+=('libserd-0.so' 'libsord-0.so' 'libsratom-0.so')
- cd "${pkgname}-${pkgver}"
- waf install --destdir="${pkgdir}"
- # license
- install -vDm 644 COPYING \
- -t "${pkgdir}/usr/share/licenses/${pkgname}"
- # bash completion
- install -vDm 644 utils/lilv.bash_completion\
- "${pkgdir}/usr/share/bash-completion/completions/${pkgname}"
-}
-# vim:set ts=2 sw=2 et:
Copied: lilv/repos/community-x86_64/PKGBUILD (from rev 650522, lilv/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-22 13:13:58 UTC (rev 650523)
@@ -0,0 +1,67 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+# Contributor: speps <speps at aur dot archlinux dot org>
+
+pkgname=lilv
+pkgver=0.24.8
+pkgrel=2
+pkgdesc="A C library interface to the LV2 plug-in standard"
+arch=('x86_64')
+url="https://drobilla.net/software/lilv/"
+license=('custom:ISC')
+depends=('glibc')
+makedepends=('libsndfile' 'lv2' 'python' 'serd' 'sord' 'sratom' 'swig' 'waf')
+optdepends=('bash-completion: completion for bash'
+ 'libsndfile: for lv2apply'
+ 'python: for Python bindings')
+provides=('liblilv-0.so')
+source=("https://download.drobilla.net/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+ "${pkgname}-0.24.8-fix_translations.patch")
+sha512sums=('f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192'
+ 'SKIP'
+ '71a38be9d33a21e2d2a9500e37efee9825124bab817c8e459790c00c28b9b27a1c9a3b611955790542b55253ae656dad58be934199a854cd7a5e16daed485b68')
+validpgpkeys=('907D226E7E13FA337F014A083672782A9BF368F3')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ # patch translation issues
+ patch -Np1 -i "../${pkgname}-0.24.8-fix_translations.patch"
+ # let wscript(s) find the custom waf scripts
+ mkdir -pv tools
+ touch __init__.py
+ cp -v waflib/extras/{autoship,autowaf,lv2}.py tools/
+ mkdir -pv plugins/tools/
+ cp -v waflib/extras/{autoship,autowaf,lv2}.py plugins/tools/
+ rm -rv waflib
+ sed -e 's/waflib.extras/tools/g' \
+ -e "s/load('autowaf'/load('autowaf', tooldir='tools'/g" \
+ -e "s/load('lv2'/load('lv2', tooldir='tools'/g" \
+ -i wscript
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+ waf configure --prefix=/usr \
+ --no-bash-completion \
+ --dyn-manifest \
+ --test
+ waf -v build
+}
+
+check() {
+ cd "${pkgname}-${pkgver}"
+ waf test
+}
+
+package() {
+ depends+=('libserd-0.so' 'libsord-0.so' 'libsratom-0.so')
+ cd "${pkgname}-${pkgver}"
+ waf install --destdir="${pkgdir}"
+ # license
+ install -vDm 644 COPYING \
+ -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ # bash completion
+ install -vDm 644 utils/lilv.bash_completion\
+ "${pkgdir}/usr/share/bash-completion/completions/${pkgname}"
+}
+# vim:set ts=2 sw=2 et:
Copied: lilv/repos/community-x86_64/lilv-0.24.8-fix_translations.patch (from rev 650522, lilv/trunk/lilv-0.24.8-fix_translations.patch)
===================================================================
--- lilv-0.24.8-fix_translations.patch (rev 0)
+++ lilv-0.24.8-fix_translations.patch 2020-06-22 13:13:58 UTC (rev 650523)
@@ -0,0 +1,56 @@
+From b3438131f4bff67d56243bac85371c03a86bf53b Mon Sep 17 00:00:00 2001
+From: David Robillard <d at drobilla.net>
+Date: Sun, 17 May 2020 20:49:46 +0200
+Subject: [PATCH] Make lilv_world_get() use translations
+
+---
+ NEWS | 6 ++++++
+ src/world.c | 20 ++++++++++++++++++++
+ wscript | 2 +-
+ 3 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/NEWS b/NEWS
+index b2f881c..c1c06f7 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,9 @@
++lilv (0.24.9) unstable;
++
++ * Make lilv_world_get() use translations
++
++ -- David Robillard <d at drobilla.net> Sun, 17 May 2020 18:44:04 +0000
++
+ lilv (0.24.8) stable;
+
+ * Allow passing strings for URIs in Python API when unambiguous
+diff --git a/src/world.c b/src/world.c
+index 22d165a..65cffd4 100644
+--- a/src/world.c
++++ b/src/world.c
+@@ -240,6 +240,26 @@ lilv_world_get(LilvWorld* world,
+ const LilvNode* predicate,
+ const LilvNode* object)
+ {
++ if (!object) {
++ // TODO: Improve performance (see lilv_plugin_get_one)
++ SordIter* stream = sord_search(world->model,
++ subject ? subject->node : NULL,
++ predicate ? predicate->node : NULL,
++ NULL,
++ NULL);
++
++ LilvNodes* nodes =
++ lilv_nodes_from_stream_objects(world, stream, SORD_OBJECT);
++
++ if (nodes) {
++ LilvNode* value = lilv_node_duplicate(lilv_nodes_get_first(nodes));
++ lilv_nodes_free(nodes);
++ return value;
++ }
++
++ return NULL;
++ }
++
+ SordNode* snode = sord_get(world->model,
+ subject ? subject->node : NULL,
+ predicate ? predicate->node : NULL,
Deleted: lilvmm.patch
===================================================================
--- lilvmm.patch 2020-06-22 13:13:24 UTC (rev 650522)
+++ lilvmm.patch 2020-06-22 13:13:58 UTC (rev 650523)
@@ -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);
- };
-
Copied: lilv/repos/community-x86_64/lilvmm.patch (from rev 650522, lilv/trunk/lilvmm.patch)
===================================================================
--- lilvmm.patch (rev 0)
+++ lilvmm.patch 2020-06-22 13:13:58 UTC (rev 650523)
@@ -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);
+ };
+
More information about the arch-commits
mailing list