diff --git a/lv2-1.14.0.tar.bz2 b/lv2-1.14.0.tar.bz2 deleted file mode 100644 index d2040fd..0000000 --- a/lv2-1.14.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8052683894c04efd748c81b95dd065d274d4e856c8b9e58b7c3da3db4e71d32 -size 386438 diff --git a/lv2-1.16.0.tar.bz2 b/lv2-1.16.0.tar.bz2 new file mode 100644 index 0000000..74fdab5 --- /dev/null +++ b/lv2-1.16.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dec3727d7bd34a413a344a820678848e7f657b5c6019a0571c61df76d7bdf1de +size 502116 diff --git a/lv2.changes b/lv2.changes index 255f405..663ce57 100644 --- a/lv2.changes +++ b/lv2.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Wed Dec 4 08:05:16 UTC 2019 - Dave Plater + +- Update to release 1.16.0 +- Rebase lv2pkgconfig.patch, lv2core.pc is no longer built. +- Remove incorporated reproducible.patch. +- Use python3 +- Upstream changes: + *Aggressively deprecate uri-map and event extensions. + *Add lv2_validate utility. + *eg-midigate: Respond to "all notes off" MIDI message. + *eg-sampler: Add waveform display to UI. + *Add core/attributes.h utility header. + *Upgrade build system and fix building with Python 3.7. + *Install headers to simpler paths. + *Simplify use of lv2specgen. + *atom: Add lv2_atom_object_get_typed() for easy type-safe access. + to object properties. + *core: Add lv2:MIDIPlugin class. + *core: Rework port restrictions so that presets can be validated. + *midi: Fix incorrect range of midi:chunk. + *options: Relax range of opts:requiredOption and + opts:supportedOption + *patch: Add patch:context property. + *patch: Add patch:accept property. + *state: Add state:StateChanged for notification events. + *time: Clarify time:beat origin. + *units: Fix outdated port description in documentation. + *units: Remove overly restrictive domain from units:unit. + ------------------------------------------------------------------- Mon Jul 9 19:36:47 UTC 2018 - bwiedemann@suse.com diff --git a/lv2.spec b/lv2.spec index 8ca0dbc..10f732e 100644 --- a/lv2.spec +++ b/lv2.spec @@ -1,7 +1,7 @@ # # spec file for package lv2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,9 +22,11 @@ %else %define asciidocs 0 %endif +# TODO:build Leap:15 with python2 +%define _waf python3 waf Name: lv2 -Version: 1.14.0 +Version: 1.16.0 Release: 0 Summary: Plugin standard for audio systems License: ISC @@ -34,10 +36,8 @@ Source0: http://lv2plug.in/spec/lv2-%{version}.tar.bz2 Source1: lv2-rpmlintrc # Patch-Fix-Upstream lv2pkgconfig.patch davejplater@gmail.com -- Add "/" to end of -I directory because otherwise pkg-config outputs nothing. Patch0: lv2pkgconfig.patch -# Patch-Fix-Upstream reproducible.patch bmwiedemann -Patch1: reproducible.patch BuildRequires: pkg-config -BuildRequires: python-rdflib +BuildRequires: python3-rdflib BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0 BuildRequires: pkgconfig(sndfile) >= 1.0.0 %if %{asciidocs} == 1 @@ -45,7 +45,7 @@ BuildRequires: pkgconfig(sndfile) >= 1.0.0 BuildRequires: asciidoc BuildRequires: doxygen BuildRequires: graphviz -BuildRequires: python-Pygments +BuildRequires: python3-Pygments %endif %description @@ -169,13 +169,14 @@ This package contains the LV2 API documentation. %prep %setup -q -%patch0 -%patch1 -p1 +%autopatch -p1 %build +for i in `grep -rl "/usr/bin/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done + export CFLAGS='%{optflags}' export CXXFLAGS='%{optflags}' -./waf configure -v \ +%_waf configure -v \ --prefix=%{_prefix} \ --lv2dir=%{_libdir}/%{name} \ --libdir=%{_libdir} \ @@ -185,17 +186,20 @@ export CXXFLAGS='%{optflags}' %endif --debug -./waf %{?_smp_mflags} -vvv build +%_waf %{?_smp_mflags} -vvv build %install -./waf install --lv2dir=%{_libdir}/%{name} --destdir=%{buildroot} +%_waf install --lv2dir=%{_libdir}/%{name} --destdir=%{buildroot} %if %{asciidocs} == 1 mv -t . %{buildroot}%{_defaultdocdir}/lv2/lv2plug.in %endif +chmod 055 %{buildroot}%{_bindir}/lv2_validate %files %defattr(0644,root,root,0755) -%doc COPYING NEWS README.md +%doc NEWS README.md +%license COPYING +%{_bindir}/lv2_validate %{_libdir}/lv2/ %exclude %{_libdir}/lv2/eg-amp.lv2/ %exclude %{_libdir}/lv2/eg-metro.lv2/ @@ -210,7 +214,6 @@ mv -t . %{buildroot}%{_defaultdocdir}/lv2/lv2plug.in %{_includedir}/lv2.h %{_includedir}/lv2/ %{_libdir}/pkgconfig/lv2.pc -%{_libdir}/pkgconfig/lv2core.pc %files examples %defattr(0644,root,root,0755) diff --git a/lv2pkgconfig.patch b/lv2pkgconfig.patch index 400cc7b..ff517ea 100644 --- a/lv2pkgconfig.patch +++ b/lv2pkgconfig.patch @@ -1,17 +1,7 @@ -Index: lv2/lv2plug.in/ns/lv2core/lv2core.pc.in +Index: lv2-1.16.0/lv2.pc.in =================================================================== ---- lv2/lv2plug.in/ns/lv2core/lv2core.pc.in.orig 2014-12-04 00:07:38.000000000 +0200 -+++ lv2/lv2plug.in/ns/lv2core/lv2core.pc.in 2017-03-12 13:33:58.384142906 +0200 -@@ -7,4 +7,4 @@ Name: lv2core - Version: @LV2CORE_VERSION@ - Description: An audio plugin interface specification. - Libs: --Cflags: -I${includedir} -+Cflags: -I${includedir}/ -Index: lv2.pc.in -=================================================================== ---- lv2.pc.in.orig 2014-12-04 00:07:38.000000000 +0200 -+++ lv2.pc.in 2017-03-12 13:35:21.026937142 +0200 +--- lv2-1.16.0.orig/lv2.pc.in 2018-09-04 01:06:23.000000000 +0200 ++++ lv2-1.16.0/lv2.pc.in 2019-12-04 09:42:44.128378371 +0200 @@ -4,4 +4,4 @@ includedir=@INCLUDEDIR@ Name: LV2 Version: @VERSION@ diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index aef7eb1..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,109 +0,0 @@ -Author: Bernhard M. Wiedemann -Date: 2018-04-16 - -https://github.com/drobilla/lv2/pull/21 -https://github.com/drobilla/lv2/pull/22 - -make lv2 package build reproducible - -Index: lv2-1.14.0/lv2specgen/lv2specgen.py -=================================================================== ---- lv2-1.14.0.orig/lv2specgen/lv2specgen.py -+++ lv2-1.14.0/lv2specgen/lv2specgen.py -@@ -45,6 +45,7 @@ import optparse - import os - import re - import sys -+import time - import xml.sax.saxutils - import xml.dom - import xml.dom.minidom -@@ -113,7 +114,7 @@ def findStatements(model, s, p, o): - def findOne(m, s, p, o): - l = findStatements(m, s, p, o) - try: -- return l.next() -+ return sorted(l)[0] - except: - return None - -@@ -396,7 +397,7 @@ def rdfsPropertyInfo(term, m): - domains = findStatements(m, term, rdfs.domain, None) - domainsdoc = "" - first = True -- for d in domains: -+ for d in sorted(domains): - union = findOne(m, getObject(d), owl.unionOf, None) - if union: - uris = parseCollection(m, getObject(union)) -@@ -414,7 +415,7 @@ def rdfsPropertyInfo(term, m): - ranges = findStatements(m, term, rdfs.range, None) - rangesdoc = "" - first = True -- for r in ranges: -+ for r in sorted(ranges): - union = findOne(m, getObject(r), owl.unionOf, None) - if union: - uris = parseCollection(m, getObject(union)) -@@ -477,13 +478,14 @@ def rdfsClassInfo(term, m): - restrictions.append(getSubject(meta_type)) - - if len(superclasses) > 0: -+ superclasses.sort() - doc += "\nSub-class of" - first = True - for superclass in superclasses: - doc += getProperty(getTermLink(superclass), first) - first = False - -- for r in restrictions: -+ for r in sorted(restrictions): - props = findStatements(m, r, None, None) - onProp = None - comment = None -@@ -529,6 +531,7 @@ def rdfsClassInfo(term, m): - # Find out about properties which have rdfs:domain of t - d = classdomains.get(str(term), "") - if d: -+ d.sort() - dlist = '' - first = True - for k in d: -@@ -539,6 +542,7 @@ def rdfsClassInfo(term, m): - # Find out about properties which have rdfs:range of t - r = classranges.get(str(term), "") - if r: -+ r.sort() - rlist = '' - first = True - for k in r: -@@ -606,7 +610,7 @@ def rdfsInstanceInfo(term, m): - doc = "" - - first = True -- for match in findStatements(m, term, rdf.type, None): -+ for match in sorted(findStatements(m, term, rdf.type, None)): - doc += getProperty(getTermLink(getObject(match), - term, - rdf.type), -@@ -942,7 +946,7 @@ def releaseChangeset(m, release, prefix= - - entry = '' - #entry = '
    \n' -- for i in findStatements(m, getObject(changeset), dcs.item, None): -+ for i in sorted(findStatements(m, getObject(changeset), dcs.item, None)): - item = getObject(i) - label = findOne(m, item, rdfs.label, None) - if not label: -@@ -1276,8 +1280,9 @@ def specgen(specloc, indir, style_uri, d - else: - template = template.replace('@COMMENT@', '') - -- template = template.replace('@DATE@', datetime.datetime.utcnow().strftime('%F')) -- template = template.replace('@TIME@', datetime.datetime.utcnow().strftime('%F %H:%M UTC')) -+ build_date = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) -+ template = template.replace('@DATE@', build_date.strftime('%F')) -+ template = template.replace('@TIME@', build_date.strftime('%F %H:%M UTC')) - - return template -