CVS commit: pkgsrc/audio/lilv

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Dec 14 18:02:51 UTC 2019

Modified Files:
        pkgsrc/audio/lilv: Makefile PLIST buildlink3.mk distinfo options.mk
Added Files:
        pkgsrc/audio/lilv/patches: patch-wscript

Log Message:
lilv: Update to 0.24.6. Convert to waf.mk.

lilv (0.24.6) stable;

  * Add more strict error detection when storing plugin state properties
  * Add option to override LV2_PATH in applications
  * Don't print errors when saving state if correct links already exist
  * Fix GCC8 warnings
  * Fix creating directories across drives on Windows
  * Fix issues with loading state with saved files from the model
  * Fix memory errors and Python 3.4+ compatibility in Python bindings
  * Fix unit tests on Windows
  * Make Python bindings more Pythonic


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/audio/lilv/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/lilv/PLIST \
    pkgsrc/audio/lilv/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/lilv/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/lilv/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/lilv/patches/patch-wscript

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/lilv/Makefile
diff -u pkgsrc/audio/lilv/Makefile:1.18 pkgsrc/audio/lilv/Makefile:1.19
--- pkgsrc/audio/lilv/Makefile:1.18     Sat Nov  2 21:09:15 2019
+++ pkgsrc/audio/lilv/Makefile  Sat Dec 14 18:02:50 2019
@@ -1,27 +1,20 @@
-# $NetBSD: Makefile,v 1.18 2019/11/02 21:09:15 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2019/12/14 18:02:50 nia Exp $
 
-DISTNAME=      lilv-0.24.4
-PKGREVISION=   2
+DISTNAME=      lilv-0.24.6
 CATEGORIES=    audio
-MASTER_SITES=  http://download.drobilla.net/
+MASTER_SITES=  https://download.drobilla.net/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://drobilla.net/software/lilv/
+HOMEPAGE=      https://drobilla.net/software/lilv/
 COMMENT=       C library to make the use of LV2 plugins as simple as possible
 LICENSE=       isc
 
-#BUILD_DEPENDS+=       swig-[0-9]*:../../devel/swig2 # python --bindings BROKEN
-
 USE_LANGUAGES= c c++
 USE_TOOLS+=    gsed pkg-config
 
-PKGCONFIG_OVERRIDE+=   lilv.pc.in
-CONFIGURE_ENV+=                LV2_PATH=${BUILDLINK_PREFIX.lv2}/lib/lv2
-EGDIR=                 share/examples/lilv
-CONF_FILES=            ${EGDIR}/lilv ${PKG_SYSCONFDIR}/bash_completion.d/lilv
-MAKE_DIRS=             ${PKG_SYSCONFDIR}/bash_completion.d
-INSTALLATION_DIRS=     ${EGDIR}
+WAF_ENV+=      LV2_PATH=${BUILDLINK_PREFIX.lv2}/lib/lv2
+WAF_ARGS+=     --no-bindings
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -31,26 +24,11 @@ PLIST_VARS+=        lv2bench
 PLIST.lv2bench=        yes
 .endif
 
-.include "options.mk"
-
-BUILD_OPTIONS= ${BUILD_DEBUG} ${BUILD_DOC} ${BUILD_TESTS} # --bindings BROKEN
-
-do-configure:
-       cd ${WRKSRC} && \
-               ${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf configure \
-                       --configdir=${PKG_SYSCONFDIR:Q} \
-                       --destdir=${DESTDIR} --mandir=${PREFIX}/${PKGMANDIR} \
-                       --default-lv2-path=${BUILDLINK_PREFIX.lv2}/lib/lv2 \
-                       ${BUILD_OPTIONS}
-do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} ./waf build
-
-do-install:
-       cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PYTHONBIN} ./waf install
-       ${INSTALL_DATA} ${WRKSRC}/utils/lilv.bash_completion \
-               ${DESTDIR}${PREFIX}/${EGDIR}/lilv
-       ${RM} ${DESTDIR}${PKG_SYSCONFDIR}/bash_completion.d/lilv
+PYTHON_FOR_BUILD_ONLY= tool
+PKGCONFIG_OVERRIDE+=   lilv.pc.in
 
+.include "options.mk"
+.include "../../devel/waf/waf.mk"
 BUILDLINK_API_DEPENDS.sratom+= sratom>=0.4.0
 .include "../../converters/sratom/buildlink3.mk"
 BUILDLINK_API_DEPENDS.lv2+=    lv2>=1.14.0
@@ -59,5 +37,4 @@ BUILDLINK_API_DEPENDS.sord+=  sord>=0.14.
 .include "../../textproc/sord/buildlink3.mk"
 BUILDLINK_API_DEPENDS.serd+=   serd>=0.18.0
 .include "../../textproc/serd/buildlink3.mk"
-.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/lilv/PLIST
diff -u pkgsrc/audio/lilv/PLIST:1.3 pkgsrc/audio/lilv/PLIST:1.4
--- pkgsrc/audio/lilv/PLIST:1.3 Wed Jan  2 20:31:48 2019
+++ pkgsrc/audio/lilv/PLIST     Sat Dec 14 18:02:50 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/01/02 20:31:48 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/12/14 18:02:50 nia Exp $
 bin/lilv-bench
 bin/lv2apply
 ${PLIST.lv2bench}bin/lv2bench
@@ -14,6 +14,6 @@ man/man1/lv2apply.1
 man/man1/lv2info.1
 man/man1/lv2ls.1
 ${PLIST.doc}man/man3/lilv.3
+share/bash_completion.d/lilv
 ${PLIST.doc}share/doc/lilv-0/html/index.html
 ${PLIST.doc}share/doc/lilv-0/html/style.css
-share/examples/lilv/lilv
Index: pkgsrc/audio/lilv/buildlink3.mk
diff -u pkgsrc/audio/lilv/buildlink3.mk:1.3 pkgsrc/audio/lilv/buildlink3.mk:1.4
--- pkgsrc/audio/lilv/buildlink3.mk:1.3 Sun Jul 21 22:23:57 2019
+++ pkgsrc/audio/lilv/buildlink3.mk     Sat Dec 14 18:02:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2019/07/21 22:23:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2019/12/14 18:02:50 nia Exp $
 
 BUILDLINK_TREE+=       lilv
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        lilv
 LILV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.lilv+=   lilv>=0.20.0
-BUILDLINK_ABI_DEPENDS.lilv?=   lilv>=0.24.4nb2
+BUILDLINK_ABI_DEPENDS.lilv+=   lilv>=0.24.4nb2
 BUILDLINK_PKGSRCDIR.lilv?=     ../../audio/lilv
 
 .include "../../audio/lv2/buildlink3.mk"

Index: pkgsrc/audio/lilv/distinfo
diff -u pkgsrc/audio/lilv/distinfo:1.4 pkgsrc/audio/lilv/distinfo:1.5
--- pkgsrc/audio/lilv/distinfo:1.4      Wed Jan  2 20:31:48 2019
+++ pkgsrc/audio/lilv/distinfo  Sat Dec 14 18:02:50 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2019/01/02 20:31:48 bsiegert Exp $
+$NetBSD: distinfo,v 1.5 2019/12/14 18:02:50 nia Exp $
 
-SHA1 (lilv-0.24.4.tar.bz2) = 8da8c0b42f9cb19477671d4e3c92c82a0638782b
-RMD160 (lilv-0.24.4.tar.bz2) = 7255f9e6650aa64ccbd55dde558e868bc76ea4e9
-SHA512 (lilv-0.24.4.tar.bz2) = cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89
-Size (lilv-0.24.4.tar.bz2) = 252209 bytes
+SHA1 (lilv-0.24.6.tar.bz2) = e9fe09960dc4a6ec259e7f9bf75eb52530761e10
+RMD160 (lilv-0.24.6.tar.bz2) = d154046fe392e8f857fc26b64d819ca469ef7172
+SHA512 (lilv-0.24.6.tar.bz2) = 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
+Size (lilv-0.24.6.tar.bz2) = 541765 bytes
 SHA1 (patch-src_util.c) = e30ab85a08b3fb15c386b26a0ea55848d27a479c
+SHA1 (patch-wscript) = 854d549c0332266778bacbe21be3325dcd5adffe

Index: pkgsrc/audio/lilv/options.mk
diff -u pkgsrc/audio/lilv/options.mk:1.1 pkgsrc/audio/lilv/options.mk:1.2
--- pkgsrc/audio/lilv/options.mk:1.1    Mon Apr 20 03:21:58 2015
+++ pkgsrc/audio/lilv/options.mk        Sat Dec 14 18:02:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/04/20 03:21:58 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2019/12/14 18:02:50 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lilv
 PKG_SUPPORTED_OPTIONS= debug doc tests
@@ -8,22 +8,16 @@ PLIST_VARS+=          doc
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
-BUILD_DEBUG=           --debug
-.else
-BUILD_DEBUG=           # blank
+WAF_ARGS+=             --debug
 .endif
 
 .if !empty(PKG_OPTIONS:Mdoc)
-BUILD_DOC=             --docs
+WAF_ARGS+=             --docs
 BUILD_DEPENDS+=                doxygen-[0-9]*:../../devel/doxygen
 BUILD_DEPENDS+=                graphviz-[0-9]*:../../graphics/graphviz
 PLIST.doc=             yes
-.else
-BUILD_DOC=             # blank
 .endif
 
 .if !empty(PKG_OPTIONS:Mtests)
-BUILD_TESTS=           --test
-.else
-BUILD_TESTS=           # blank
+WAF_ARGS+=             --test
 .endif

Added files:

Index: pkgsrc/audio/lilv/patches/patch-wscript
diff -u /dev/null pkgsrc/audio/lilv/patches/patch-wscript:1.1
--- /dev/null   Sat Dec 14 18:02:51 2019
+++ pkgsrc/audio/lilv/patches/patch-wscript     Sat Dec 14 18:02:51 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-wscript,v 1.1 2019/12/14 18:02:51 nia Exp $
+
+Install completions to correct location.
+
+--- wscript.orig       2019-11-10 21:39:53.000000000 +0000
++++ wscript
+@@ -438,7 +438,7 @@ def build(bld):
+     # Bash completion
+     if bld.env.BASH_COMPLETION:
+         bld.install_as(
+-            '${SYSCONFDIR}/bash_completion.d/lilv', 'utils/lilv.bash_completion')
++            'share/bash_completion.d/lilv', 'utils/lilv.bash_completion')
+ 
+     bld.add_post_fun(autowaf.run_ldconfig)
+