Skip to content

Commit 176ee23

Browse files
BramGiesenBramGiesen
authored
Merge pull request #61 from moddevices/updates
A few plugin updates and new packages
2 parents 1bfcca7 + 23c4fc8 commit 176ee23

File tree

30 files changed

+931
-85
lines changed

30 files changed

+931
-85
lines changed

‎lv2-data‎

Submodule lv2-data updated from f5e5fc3 to 3f344a8

‎plugins/package/beatslash-lv2/01_no-gui.patch‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
diff --git a/beatslash.lv2/beatrepeater_mono.ttl b/beatslash.lv2/beatrepeater_mono.ttl
2+
index c078f5f..26dc5db 100644
3+
--- a/beatslash.lv2/beatrepeater_mono.ttl
4+
+++ b/beatslash.lv2/beatrepeater_mono.ttl
5+
@@ -11,17 +11,12 @@
6+
@prefix pprops: <http://lv2plug.in/ns/ext/port-props#> .
7+
@prefix guiext: <http://lv2plug.in/ns/extensions/ui#> .
8+
9+
-<http://github.com/blablack/beatslash-lv2/beatrepeater_mono/gui>
10+
- a guiext:GtkUI ;
11+
- guiext:binary <beatrepeater_mono_gui.so> .
12+
-
13+
<http://github.com/blablack/beatslash-lv2/beatrepeater_mono>
14+
a lv2:Plugin ;
15+
lv2:project <http://github.com/blablack/beatslash-lv2/> ;
16+
doap:name "Beat Repeater - Mono" ;
17+
doap:license <http://opensource.org/licenses/isc> ;
18+
ll:pegName "p" ;
19+
- guiext:ui <http://github.com/blablack/beatslash-lv2/beatrepeater_mono/gui> ;
20+
lv2:optionalFeature lv2:hardRTCapable ;
21+
lv2:port [
22+
a lv2:InputPort, lv2:AudioPort ;
23+
diff --git a/beatslash.lv2/beatrepeater_stereo.ttl b/beatslash.lv2/beatrepeater_stereo.ttl
24+
index 89b7d49..8ae4228 100644
25+
--- a/beatslash.lv2/beatrepeater_stereo.ttl
26+
+++ b/beatslash.lv2/beatrepeater_stereo.ttl
27+
@@ -11,17 +11,12 @@
28+
@prefix pprops: <http://lv2plug.in/ns/ext/port-props#> .
29+
@prefix guiext: <http://lv2plug.in/ns/extensions/ui#> .
30+
31+
-<http://github.com/blablack/beatslash-lv2/beatrepeater_stereo/gui>
32+
- a guiext:GtkUI ;
33+
- guiext:binary <beatrepeater_stereo_gui.so> .
34+
-
35+
<http://github.com/blablack/beatslash-lv2/beatrepeater_stereo>
36+
a lv2:Plugin ;
37+
lv2:project <http://github.com/blablack/beatslash-lv2/> ;
38+
doap:name "Beat Repeater - Stereo" ;
39+
doap:license <http://opensource.org/licenses/isc> ;
40+
ll:pegName "p" ;
41+
- guiext:ui <http://github.com/blablack/beatslash-lv2/beatrepeater_stereo/gui> ;
42+
lv2:optionalFeature lv2:hardRTCapable ;
43+
lv2:port [
44+
a lv2:InputPort, lv2:AudioPort ;
45+
diff --git a/beatslash.lv2/beatslicer_mono.ttl b/beatslash.lv2/beatslicer_mono.ttl
46+
index bbb812f..30c1b38 100644
47+
--- a/beatslash.lv2/beatslicer_mono.ttl
48+
+++ b/beatslash.lv2/beatslicer_mono.ttl
49+
@@ -11,17 +11,12 @@
50+
@prefix pprops: <http://lv2plug.in/ns/ext/port-props#> .
51+
@prefix guiext: <http://lv2plug.in/ns/extensions/ui#> .
52+
53+
-<http://github.com/blablack/beatslash-lv2/beatslicer_mono/gui>
54+
- a guiext:GtkUI ;
55+
- guiext:binary <beatslicer_mono_gui.so> .
56+
-
57+
<http://github.com/blablack/beatslash-lv2/beatslicer_mono>
58+
a lv2:Plugin ;
59+
lv2:project <http://github.com/blablack/beatslash-lv2/> ;
60+
doap:name "Beat Slicer - Mono" ;
61+
doap:license <http://opensource.org/licenses/isc> ;
62+
ll:pegName "p" ;
63+
- guiext:ui <http://github.com/blablack/beatslash-lv2/beatslicer_mono/gui> ;
64+
lv2:optionalFeature lv2:hardRTCapable ;
65+
lv2:port [
66+
a lv2:InputPort, lv2:AudioPort ;
67+
diff --git a/beatslash.lv2/beatslicer_stereo.ttl b/beatslash.lv2/beatslicer_stereo.ttl
68+
index 888d641..909876e 100644
69+
--- a/beatslash.lv2/beatslicer_stereo.ttl
70+
+++ b/beatslash.lv2/beatslicer_stereo.ttl
71+
@@ -11,17 +11,12 @@
72+
@prefix pprops: <http://lv2plug.in/ns/ext/port-props#> .
73+
@prefix guiext: <http://lv2plug.in/ns/extensions/ui#> .
74+
75+
-<http://github.com/blablack/beatslash-lv2/beatslicer_stereo/gui>
76+
- a guiext:GtkUI ;
77+
- guiext:binary <beatslicer_stereo_gui.so> .
78+
-
79+
<http://github.com/blablack/beatslash-lv2/beatslicer_stereo>
80+
a lv2:Plugin ;
81+
lv2:project <http://github.com/blablack/beatslash-lv2/> ;
82+
doap:name "Beat Slicer - Stereo" ;
83+
doap:license <http://opensource.org/licenses/isc> ;
84+
ll:pegName "p" ;
85+
- guiext:ui <http://github.com/blablack/beatslash-lv2/beatslicer_stereo/gui> ;
86+
lv2:optionalFeature lv2:hardRTCapable ;
87+
lv2:port [
88+
a lv2:InputPort, lv2:AudioPort ;
89+
diff --git a/wscript b/wscript
90+
index 0135eb6..dbb89df 100644
91+
--- a/wscript
92+
+++ b/wscript
93+
@@ -27,13 +27,8 @@ def configure(conf):
94+
conf.load('compiler_cxx')
95+
conf.load('lv2')
96+
97+
- autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM',atleast_version='2.24.0')
98+
- autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2', atleast_version='2.24.0')
99+
- autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.0.0')
100+
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2', atleast_version='1.2.0')
101+
autowaf.check_pkg(conf, 'lvtk-plugin-1', uselib_store='LVTK_PLUGIN', atleast_version='1.2.0')
102+
- autowaf.check_pkg(conf, 'lvtk-ui-1', uselib_store='LVTK_UI', atleast_version='1.2.0')
103+
- autowaf.check_pkg(conf, 'lvtk-gtkui-1', uselib_store='LVTK_GTKGUI', atleast_version='1.2.0')
104+
105+
check = 'Extended Initializer Lists'
106+
conf.check_cxx(msg = check,
107+
@@ -129,26 +124,3 @@ def build(bld):
108+
'-DPLUGIN_HEADER="src/%s.hpp"' % i],
109+
['LV2', 'LVTK_PLUGIN'],
110+
['src/envgen.cpp'])
111+
-
112+
-
113+
-
114+
-
115+
- plugins_gui = '''
116+
- beatrepeater_mono_gui
117+
- beatrepeater_stereo_gui
118+
- beatslicer_mono_gui
119+
- beatslicer_stereo_gui
120+
- '''.split()
121+
-
122+
- for i in plugins_gui:
123+
- build_plugin_gui(bld, 'beatslash.lv2', i, ['src/%s.cpp' % i],
124+
- ['-DPLUGIN_CLASS=%s' % i,
125+
- '-std=c++11',
126+
- '-DURI_PREFIX=\"http://github.com/blablack/beatslash-lv2/\"',
127+
- '-DPLUGIN_URI_SUFFIX="%s"' % i,
128+
- '-DPLUGIN_HEADER="src/%s.hpp"' % i],
129+
- ['LV2', 'LVTK_PLUGIN', 'LVTK_GTKGUI', 'GTKMM', 'GTK2', 'CAIRO'],
130+
- ['src/dial.cpp', 'src/labeleddial.cpp', 'src/my_box.cpp'])
131+
-
132+
-
133+
-

‎plugins/package/beatslash-lv2/beatslash-lv2.mk‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
######################################
2+
#
3+
# beatslash-lv2
4+
#
5+
######################################
6+
7+
BEATSLASH_LV2_VERSION = 98ef36eca1b6f6320282a8c01bbcee0118d8a302
8+
BEATSLASH_LV2_SITE = $(call github,blablack,beatslash-lv2,$(BEATSLASH_LV2_VERSION))
9+
BEATSLASH_LV2_DEPENDENCIES = lvtk-1
10+
BEATSLASH_LV2_BUNDLES = beatslash.lv2
11+
12+
BEATSLASH_LV2_TARGET_WAF = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/usr/bin/python ./waf
13+
14+
define BEATSLASH_LV2_CONFIGURE_CMDS
15+
(cd $(@D); $(BEATSLASH_LV2_TARGET_WAF) configure --prefix=/usr)
16+
endef
17+
18+
define BEATSLASH_LV2_BUILD_CMDS
19+
(cd $(@D); $(BEATSLASH_LV2_TARGET_WAF) build -j $(PARALLEL_JOBS))
20+
endef
21+
22+
define BEATSLASH_LV2_INSTALL_TARGET_CMDS
23+
(cd $(@D); $(BEATSLASH_LV2_TARGET_WAF) install --destdir=$(TARGET_DIR))
24+
endef
25+
26+
$(eval $(generic-package))

‎plugins/package/deteriorate-lv2/01_no-gui.patch‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
diff --git a/deteriorate.lv2/downsampler_mono.ttl b/deteriorate.lv2/downsampler_mono.ttl
2+
index 0ff59dc..a630e51 100644
3+
--- a/deteriorate.lv2/downsampler_mono.ttl
4+
+++ b/deteriorate.lv2/downsampler_mono.ttl
5+
@@ -7,17 +7,12 @@
6+
@prefix guiext: <http://lv2plug.in/ns/extensions/ui#> .
7+
@prefix pprops: <http://lv2plug.in/ns/ext/port-props#> .
8+
9+
-<http://github.com/blablack/deteriorate-lv2/downsampler_mono/gui>
10+
- a guiext:GtkUI ;
11+
- guiext:binary <downsampler_mono_gui.so> .
12+
-
13+
<http://github.com/blablack/deteriorate-lv2/downsampler_mono>
14+
a lv2:Plugin, lv2:FilterPlugin ;
15+
lv2:project <http://github.com/blablack/deteriorate-lv2/> ;
16+
doap:name "Downsampler - Mono" ;
17+
doap:license <http://opensource.org/licenses/isc> ;
18+
ll:pegName "p" ;
19+
- guiext:ui <http://github.com/blablack/deteriorate-lv2/downsampler_mono/gui> ;
20+
lv2:optionalFeature lv2:hardRTCapable ;
21+
lv2:port [
22+
a lv2:InputPort, lv2:ControlPort ;
23+
diff --git a/deteriorate.lv2/downsampler_stereo.ttl b/deteriorate.lv2/downsampler_stereo.ttl
24+
index 3789619..a88c892 100644
25+
--- a/deteriorate.lv2/downsampler_stereo.ttl
26+
+++ b/deteriorate.lv2/downsampler_stereo.ttl
27+
@@ -7,17 +7,12 @@
28+
@prefix guiext: <http://lv2plug.in/ns/extensions/ui#> .
29+
@prefix pprops: <http://lv2plug.in/ns/ext/port-props#> .
30+
31+
-<http://github.com/blablack/deteriorate-lv2/downsampler_stereo/gui>
32+
- a guiext:GtkUI ;
33+
- guiext:binary <downsampler_stereo_gui.so> .
34+
-
35+
<http://github.com/blablack/deteriorate-lv2/downsampler_stereo>
36+
a lv2:Plugin, lv2:FilterPlugin ;
37+
lv2:project <http://github.com/blablack/deteriorate-lv2/> ;
38+
doap:name "Downsampler - Stereo" ;
39+
doap:license <http://opensource.org/licenses/isc> ;
40+
ll:pegName "p" ;
41+
- guiext:ui <http://github.com/blablack/deteriorate-lv2/downsampler_stereo/gui> ;
42+
lv2:optionalFeature lv2:hardRTCapable ;
43+
lv2:port [
44+
a lv2:InputPort, lv2:ControlPort ;
45+
diff --git a/deteriorate.lv2/granulator_mono.ttl b/deteriorate.lv2/granulator_mono.ttl
46+
index 19740ef..c3c1a6c 100644
47+
--- a/deteriorate.lv2/granulator_mono.ttl
48+
+++ b/deteriorate.lv2/granulator_mono.ttl
49+
@@ -7,17 +7,12 @@
50+
@prefix guiext: <http://lv2plug.in/ns/extensions/ui#> .
51+
@prefix pprops: <http://lv2plug.in/ns/ext/port-props#> .
52+
53+
-<http://github.com/blablack/deteriorate-lv2/granulator_mono/gui>
54+
- a guiext:GtkUI ;
55+
- guiext:binary <granulator_mono_gui.so> .
56+
-
57+
<http://github.com/blablack/deteriorate-lv2/granulator_mono>
58+
a lv2:Plugin, lv2:FilterPlugin ;
59+
lv2:project <http://github.com/blablack/deteriorate-lv2/> ;
60+
doap:name "Granulator - Mono" ;
61+
doap:license <http://opensource.org/licenses/isc> ;
62+
ll:pegName "p" ;
63+
- guiext:ui <http://github.com/blablack/deteriorate-lv2/granulator_mono/gui> ;
64+
lv2:optionalFeature lv2:hardRTCapable ;
65+
lv2:port [
66+
a lv2:InputPort, lv2:AudioPort ;
67+
diff --git a/deteriorate.lv2/granulator_stereo.ttl b/deteriorate.lv2/granulator_stereo.ttl
68+
index 9d67292..c052142 100644
69+
--- a/deteriorate.lv2/granulator_stereo.ttl
70+
+++ b/deteriorate.lv2/granulator_stereo.ttl
71+
@@ -7,17 +7,12 @@
72+
@prefix guiext: <http://lv2plug.in/ns/extensions/ui#> .
73+
@prefix pprops: <http://lv2plug.in/ns/ext/port-props#> .
74+
75+
-<http://github.com/blablack/deteriorate-lv2/granulator_stereo/gui>
76+
- a guiext:GtkUI ;
77+
- guiext:binary <granulator_stereo_gui.so> .
78+
-
79+
<http://github.com/blablack/deteriorate-lv2/granulator_stereo>
80+
a lv2:Plugin, lv2:FilterPlugin ;
81+
lv2:project <http://github.com/blablack/deteriorate-lv2/> ;
82+
doap:name "Granulator - Stereo" ;
83+
doap:license <http://opensource.org/licenses/isc> ;
84+
ll:pegName "p" ;
85+
- guiext:ui <http://github.com/blablack/deteriorate-lv2/granulator_stereo/gui> ;
86+
lv2:optionalFeature lv2:hardRTCapable ;
87+
lv2:port [
88+
a lv2:InputPort, lv2:AudioPort ;
89+
diff --git a/wscript b/wscript
90+
index 26781ad..c5f0440 100644
91+
--- a/wscript
92+
+++ b/wscript
93+
@@ -27,13 +27,8 @@ def configure(conf):
94+
conf.load('compiler_cxx')
95+
conf.load('lv2')
96+
97+
- autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM',atleast_version='2.24.0')
98+
- autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2', atleast_version='2.24.0')
99+
- autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.0.0')
100+
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2', atleast_version='1.2.0')
101+
autowaf.check_pkg(conf, 'lvtk-plugin-1', uselib_store='LVTK_PLUGIN', atleast_version='1.2.0')
102+
- autowaf.check_pkg(conf, 'lvtk-ui-1', uselib_store='LVTK_UI', atleast_version='1.2.0')
103+
- autowaf.check_pkg(conf, 'lvtk-gtkui-1', uselib_store='LVTK_GTKGUI', atleast_version='1.2.0')
104+
105+
check = 'Extended Initializer Lists'
106+
conf.check_cxx(msg = check,
107+
@@ -142,26 +137,3 @@ def build(bld):
108+
'-DPLUGIN_HEADER="src/%s.hpp"' % i],
109+
['LV2', 'LVTK_PLUGIN'],
110+
['src/envgen.cpp'])
111+
-
112+
-
113+
-
114+
-
115+
- plugins_gui = '''
116+
- downsampler_mono_gui
117+
- downsampler_stereo_gui
118+
- granulator_mono_gui
119+
- granulator_stereo_gui
120+
- '''.split()
121+
-
122+
- for i in plugins_gui:
123+
- build_plugin_gui(bld, 'deteriorate.lv2', i, ['src/%s.cpp' % i],
124+
- ['-DPLUGIN_CLASS=%s' % i,
125+
- '-std=c++11',
126+
- '-DURI_PREFIX=\"http://github.com/blablack/deteriorate-lv2/\"',
127+
- '-DPLUGIN_URI_SUFFIX="%s"' % i,
128+
- '-DPLUGIN_HEADER="src/%s.hpp"' % i],
129+
- ['LV2', 'LVTK_PLUGIN', 'LVTK_GTKGUI', 'GTKMM', 'GTK2', 'CAIRO'],
130+
- ['src/dial.cpp', 'src/labeleddial.cpp', 'src/my_box.cpp'])
131+
-
132+
-
133+
-

‎plugins/package/deteriorate-lv2/deteriorate-lv2.mk‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
######################################
2+
#
3+
# deteriorate-lv2
4+
#
5+
######################################
6+
7+
DETERIORATE_LV2_VERSION = 93ea1762755d57dd44a45adee55822bacd2c0a3b
8+
DETERIORATE_LV2_SITE = $(call github,blablack,deteriorate-lv2,$(DETERIORATE_LV2_VERSION))
9+
DETERIORATE_LV2_DEPENDENCIES = lvtk-1
10+
DETERIORATE_LV2_BUNDLES = deteriorate.lv2
11+
12+
DETERIORATE_LV2_TARGET_WAF = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/usr/bin/python ./waf
13+
14+
define DETERIORATE_LV2_CONFIGURE_CMDS
15+
(cd $(@D); $(DETERIORATE_LV2_TARGET_WAF) configure --prefix=/usr)
16+
endef
17+
18+
define DETERIORATE_LV2_BUILD_CMDS
19+
(cd $(@D); $(DETERIORATE_LV2_TARGET_WAF) build -j $(PARALLEL_JOBS))
20+
endef
21+
22+
define DETERIORATE_LV2_INSTALL_TARGET_CMDS
23+
(cd $(@D); $(DETERIORATE_LV2_TARGET_WAF) install --destdir=$(TARGET_DIR))
24+
endef
25+
26+
$(eval $(generic-package))

‎plugins/package/dpf-plugins/dpf-plugins.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#
55
######################################
66

7-
DPF_PLUGINS_VERSION = ad74a88c36664135546cdc5e770d5ac9bfd46110
7+
DPF_PLUGINS_VERSION = 86084a934adb26f529038cbcf901fd7a09b95897
88
DPF_PLUGINS_SITE = $(call github,DISTRHO,DPF-Plugins,$(DPF_PLUGINS_VERSION))
99
DPF_PLUGINS_BUNDLES = 3BandEQ.lv2 3BandSplitter.lv2 AmplitudeImposer.lv2 CycleShifter.lv2 Kars.lv2 MaBitcrush.lv2 MaFreeverb.lv2 MaGigaverb.lv2 MaPitchshift.lv2 MVerb.lv2 Nekobi.lv2 PingPongPan.lv2 SoulForce.lv2
1010

11-
DPF_PLUGINS_TARGET_MAKE = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) NOOPT=true -C $(@D)
11+
DPF_PLUGINS_TARGET_MAKE = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) NOOPT=true HAVE_CAIRO=false HAVE_GL=false -C $(@D)
1212

1313
define DPF_PLUGINS_BUILD_CMDS
1414
$(DPF_PLUGINS_TARGET_MAKE)

‎plugins/package/dpf-plugins/no_gen.patch‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
diff --git a/../../DPF-Plugins/dpf/utils/generate-ttl.sh b/dpf/utils/generate-ttl.sh
2-
index dc7de63..60592de 100755
3-
--- a/../../DPF-Plugins/dpf/utils/generate-ttl.sh
1+
diff --git a/dpf/utils/generate-ttl.sh b/dpf/utils/generate-ttl.sh
2+
index 7522b26..f3b0993 100755
3+
--- a/dpf/utils/generate-ttl.sh
44
+++ b/dpf/utils/generate-ttl.sh
5-
@@ -1,33 +1 @@
6-
-#!/bin/bash
7-
-
5+
@@ -1,33 +1,3 @@
6+
#!/bin/bash
7+
88
-set -e
99
-
1010
-if [ -d bin ]; then
@@ -14,13 +14,13 @@ index dc7de63..60592de 100755
1414
- exit
1515
-fi
1616
-
17-
-PWD=`dirname $0`
17+
-PWD="$(dirname "$0")"
1818
-
19-
-if [ -f $PWD/lv2_ttl_generator.exe ]; then
20-
- GEN=$PWD/lv2_ttl_generator.exe
19+
-if [ -f "$PWD/lv2_ttl_generator.exe" ]; then
20+
- GEN="$PWD/lv2_ttl_generator.exe"
2121
- EXT=dll
2222
-else
23-
- GEN=$PWD/lv2_ttl_generator
23+
- GEN="$PWD/lv2_ttl_generator"
2424
- if [ -d /Library/Audio ]; then
2525
- EXT=dylib
2626
- else
@@ -32,8 +32,8 @@ index dc7de63..60592de 100755
3232
-
3333
-for i in $FOLDERS; do
3434
- cd $i
35-
- FILE=`ls *.$EXT | sort | head -n 1`
36-
- $GEN ./$FILE
35+
- FILE="$(ls *.$EXT | sort | head -n 1)"
36+
- "$GEN" "./$FILE"
3737
- cd ..
3838
-done
3939
+echo "no gen"

0 commit comments

Comments
 (0)