8 files changed, 86 insertions, 122 deletions

diff --git a/audio/dpf-plugins-lv2/Makefile b/audio/dpf-plugins-lv2/Makefile
index afd4a6e55bb6..657151b005fe 100644
--- a/audio/dpf-plugins-lv2/Makefile
+++ b/audio/dpf-plugins-lv2/Makefile
@@ -2,9 +2,7 @@
 
 PORTNAME=	dpf-plugins
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1-1
-PORTREVISION=	4
-DISTVERSIONSUFFIX=	-g0c433e4
+DISTVERSION=	1.2
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
@@ -16,9 +14,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		bash:shells/bash
-LIB_DEPENDS=	libprojectM.so:graphics/libprojectm
+LIB_DEPENDS=	liblo.so:audio/liblo \
+		libprojectM.so:graphics/libprojectm
 
-USES=		gmake localbase pkgconfig shebangfix
+USES=		gl gmake localbase pkgconfig shebangfix
 SHEBANG_FILES=	dpf/utils/generate-ttl.sh
 USE_GITHUB=	yes
 GH_ACCOUNT=	DISTRHO
@@ -29,12 +28,20 @@ USE_GL=		gl
 CXXFLAGS+=	-I${FILESDIR}
 LDFLAGS+=	-pthread
 
+OPTIONS_DEFINE=		JACK
+OPTIONS_DEFAULT=	JACK
+OPTIONS_SUB=		yes
+
 OPTIONS_DEFINE_amd64=	SIMD
 OPTIONS_DEFINE_i386=	SIMD
 OPTIONS_DEFAULT_amd64=	SIMD
 OPTIONS_DEFAULT_i386=	SIMD
 
-SIMD_MAKE_ENV=	SIMD_FLAGS="-msse -msse2 -mfpmath=sse"
+JACK_MAKE_ARGS=		HAVE_JACK=true
+JACK_MAKE_ARGS_OFF=	HAVE_JACK=false
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
+
+SIMD_MAKE_ENV=		SIMD_FLAGS="-msse -msse2 -mfpmath=sse"
 
 post-patch: # disable all plugins except for LV2
 	@${FIND} ${WRKSRC} -name "*.mk" | ${XARGS} ${REINPLACE_CMD} -i '' -E 's/BUILD_(LADSPA|DSSI|VST2) *= *true/BUILD_\1 = false/'
diff --git a/audio/dpf-plugins-lv2/distinfo b/audio/dpf-plugins-lv2/distinfo
index 44027834e387..e6f8889eaf56 100644
--- a/audio/dpf-plugins-lv2/distinfo
+++ b/audio/dpf-plugins-lv2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534560066
-SHA256 (DISTRHO-DPF-Plugins-v1.1-1-g0c433e4_GH0.tar.gz) = 40455ca67a79ec1589f386450e242109965c4529b098264dac2df4cad673b288
-SIZE (DISTRHO-DPF-Plugins-v1.1-1-g0c433e4_GH0.tar.gz) = 10703465
+TIMESTAMP = 1551337651
+SHA256 (DISTRHO-DPF-Plugins-v1.2_GH0.tar.gz) = ded7a0fcffb0cf8bc7e9ccec1ab3ccfebe075bae73b3439d32b4db09d3728992
+SIZE (DISTRHO-DPF-Plugins-v1.2_GH0.tar.gz) = 8278681
diff --git a/audio/dpf-plugins-lv2/files/patch-Makefile b/audio/dpf-plugins-lv2/files/patch-Makefile
index 1e3ba2ab0f66..aa7c2159e8fa 100644
--- a/audio/dpf-plugins-lv2/files/patch-Makefile
+++ b/audio/dpf-plugins-lv2/files/patch-Makefile
@@ -1,27 +1,18 @@
---- Makefile.orig	2018-08-18 06:07:42 UTC
+--- Makefile.orig	2019-02-28 06:54:29 UTC
 +++ Makefile
-@@ -109,17 +109,17 @@ endif
+@@ -113,13 +113,13 @@ clean:
  # --------------------------------------------------------------
  
  install:
 -	install -d $(DESTDIR)$(PREFIX)/lib/ladspa/
--	install -d $(DESTDIR)$(PREFIX)/lib/dssi/
 +	#install -d $(DESTDIR)$(PREFIX)/lib/ladspa/
-+	#install -d $(DESTDIR)$(PREFIX)/lib/dssi/
+ 	install -d $(DESTDIR)$(PREFIX)/lib/dssi/
  	install -d $(DESTDIR)$(PREFIX)/lib/lv2/
--	install -d $(DESTDIR)$(PREFIX)/lib/vst/
-+	#install -d $(DESTDIR)$(PREFIX)/lib/vst/
+ 	install -d $(DESTDIR)$(PREFIX)/lib/vst/
+ 	install -d $(DESTDIR)$(PREFIX)/bin/
  
--	cp bin/*-ladspa.* $(DESTDIR)$(PREFIX)/lib/ladspa/
--	cp bin/*-dssi.*   $(DESTDIR)$(PREFIX)/lib/dssi/
--	cp bin/*-vst.*    $(DESTDIR)$(PREFIX)/lib/vst/
-+	#cp bin/*-ladspa.* $(DESTDIR)$(PREFIX)/lib/ladspa/
-+	#cp bin/*-dssi.*   $(DESTDIR)$(PREFIX)/lib/dssi/
-+	#cp bin/*-vst.*    $(DESTDIR)$(PREFIX)/lib/vst/
- 
- ifeq ($(HAVE_DGL),true)
--	cp -r bin/*-dssi  $(DESTDIR)$(PREFIX)/lib/dssi/
-+	#cp -r bin/*-dssi  $(DESTDIR)$(PREFIX)/lib/dssi/
- endif
- 	cp -r bin/*.lv2   $(DESTDIR)$(PREFIX)/lib/lv2/
+-	install -m 644 bin/*-ladspa.* $(DESTDIR)$(PREFIX)/lib/ladspa/
++	#install -m 644 bin/*-ladspa.* $(DESTDIR)$(PREFIX)/lib/ladspa/
+ 	install -m 644 bin/*-dssi.*   $(DESTDIR)$(PREFIX)/lib/dssi/
+ 	install -m 644 bin/*-vst.*    $(DESTDIR)$(PREFIX)/lib/vst/
  
diff --git a/audio/dpf-plugins-lv2/files/patch-Makefile.mk b/audio/dpf-plugins-lv2/files/patch-Makefile.mk
deleted file mode 100644
index 64910b1c982f..000000000000
--- a/audio/dpf-plugins-lv2/files/patch-Makefile.mk
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.mk.orig	2018-04-27 06:05:19 UTC
-+++ Makefile.mk
-@@ -23,7 +23,7 @@ endif
- # Set build and link flags
- 
- BASE_FLAGS = -Wall -Wextra -pipe
--BASE_OPTS  = -O2 -ffast-math -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections
-+BASE_OPTS  = -O2 -ffast-math -mtune=generic $(SIMD_FLAGS) -fdata-sections -ffunction-sections
- 
- ifneq ($(MACOS_OLD),true)
- # Old MacOS doesn't support this
-@@ -35,13 +35,13 @@ ifeq ($(MACOS),true)
- LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs
- else
- # Common linker flags
--LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-+LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--strip-all
- endif
- 
- ifeq ($(RASPPI),true)
- # Raspberry-Pi optimization flags
- BASE_OPTS  = -O2 -ffast-math -march=armv6 -mfpu=vfp -mfloat-abi=hard
--LINK_OPTS  = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-+LINK_OPTS  = -Wl,-O1 -Wl,--strip-all
- endif
- 
- ifeq ($(NOOPT),true)
diff --git a/audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk b/audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk
new file mode 100644
index 000000000000..92fd973f1b74
--- /dev/null
+++ b/audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk
@@ -0,0 +1,11 @@
+--- dpf/Makefile.base.mk.orig	2019-02-28 18:07:46 UTC
++++ dpf/Makefile.base.mk
+@@ -90,7 +90,7 @@ endif
+ # Set build and link flags
+ 
+ BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
+-BASE_OPTS  = -O3 -ffast-math -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections
++BASE_OPTS  = -O3 -ffast-math -mtune=generic $(SIMD_FLAGS) -fdata-sections -ffunction-sections
+ 
+ ifeq ($(MACOS),true)
+ # MacOS linker flags
diff --git a/audio/dpf-plugins-lv2/files/patch-dpf_dgl_Makefile.mk b/audio/dpf-plugins-lv2/files/patch-dpf_dgl_Makefile.mk
deleted file mode 100644
index 0ebc623341e4..000000000000
--- a/audio/dpf-plugins-lv2/files/patch-dpf_dgl_Makefile.mk
+++ /dev/null
@@ -1,26 +0,0 @@
---- dpf/dgl/Makefile.mk.orig	2018-04-27 06:05:19 UTC
-+++ dpf/dgl/Makefile.mk
-@@ -23,20 +23,20 @@ endif
- # Set build and link flags
- 
- BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
--BASE_OPTS  = -O2 -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections
-+BASE_OPTS  = -O2 -mtune=generic $(SIMD_FLAGS) -fdata-sections -ffunction-sections
- 
- ifeq ($(MACOS),true)
- # MacOS linker flags
- LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs
- else
- # Common linker flags
--LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-+LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--strip-all
- endif
- 
- ifeq ($(RASPPI),true)
- # Raspberry-Pi optimization flags
- BASE_OPTS  = -O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard
--LINK_OPTS  = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-+LINK_OPTS  = -Wl,-O1 -Wl,--strip-all
- endif
- 
- ifeq ($(NOOPT),true)
diff --git a/audio/dpf-plugins-lv2/files/patch-dpf_dgl_src_Window.cpp b/audio/dpf-plugins-lv2/files/patch-dpf_dgl_src_Window.cpp
index 50eedaeef945..73f197045b77 100644
--- a/audio/dpf-plugins-lv2/files/patch-dpf_dgl_src_Window.cpp
+++ b/audio/dpf-plugins-lv2/files/patch-dpf_dgl_src_Window.cpp
@@ -1,4 +1,4 @@
---- dpf/dgl/src/Window.cpp.orig	2018-08-18 05:40:10 UTC
+--- dpf/dgl/src/Window.cpp.orig	2019-02-28 06:54:29 UTC
 +++ dpf/dgl/src/Window.cpp
 @@ -51,6 +51,10 @@ extern "C" {
  #include "../StandaloneWindow.hpp"
@@ -11,8 +11,8 @@
  #define FOR_EACH_WIDGET(it) \
    for (std::list<Widget*>::iterator it = fWidgets.begin(); it != fWidgets.end(); ++it)
  
-@@ -1151,7 +1155,12 @@ bool Window::openFileBrowser(const FileB
- 
+@@ -1216,7 +1220,12 @@ bool Window::openFileBrowser(const FileB
+ #  ifdef DISTRHO_OS_LINUX
      if (startDir.isEmpty())
      {
 +#if defined(__FreeBSD__)
diff --git a/audio/dpf-plugins-lv2/pkg-plist b/audio/dpf-plugins-lv2/pkg-plist
index 13ae4d76dea1..8fba069846a8 100644
--- a/audio/dpf-plugins-lv2/pkg-plist
+++ b/audio/dpf-plugins-lv2/pkg-plist
@@ -1,3 +1,35 @@
+%%JACK%%bin/3BandEQ
+%%JACK%%bin/3BandSplitter
+%%JACK%%bin/AmplitudeImposer
+%%JACK%%bin/CycleShifter
+%%JACK%%bin/Kars
+%%JACK%%bin/MVerb
+%%JACK%%bin/MaBitcrush
+%%JACK%%bin/MaFreeverb
+%%JACK%%bin/MaGigaverb
+%%JACK%%bin/MaPitchshift
+%%JACK%%bin/Nekobi
+%%JACK%%bin/PingPongPan
+%%JACK%%bin/ProM
+%%JACK%%bin/SoulForce
+%%JACK%%bin/glBars
+lib/dssi/3BandEQ-dssi.so
+lib/dssi/3BandEQ-dssi/3BandEQ_ui
+lib/dssi/3BandSplitter-dssi.so
+lib/dssi/3BandSplitter-dssi/3BandSplitter_ui
+lib/dssi/AmplitudeImposer-dssi.so
+lib/dssi/AmplitudeImposer-dssi/AmplitudeImposer_ui
+lib/dssi/CycleShifter-dssi.so
+lib/dssi/CycleShifter-dssi/CycleShifter_ui
+lib/dssi/Kars-dssi.so
+lib/dssi/MVerb-dssi.so
+lib/dssi/MVerb-dssi/MVerb_ui
+lib/dssi/Nekobi-dssi.so
+lib/dssi/Nekobi-dssi/Nekobi_ui
+lib/dssi/PingPongPan-dssi.so
+lib/dssi/PingPongPan-dssi/PingPongPan_ui
+lib/dssi/SoulForce-dssi.so
+lib/dssi/SoulForce-dssi/SoulForce_ui
 lib/lv2/3BandEQ.lv2/3BandEQ_dsp.so
 lib/lv2/3BandEQ.lv2/3BandEQ_dsp.ttl
 lib/lv2/3BandEQ.lv2/3BandEQ_ui.so
@@ -24,30 +56,12 @@ lib/lv2/CycleShifter.lv2/manifest.ttl
 lib/lv2/CycleShifter.lv2/presets.ttl
 lib/lv2/Kars.lv2/Kars_dsp.so
 lib/lv2/Kars.lv2/Kars_dsp.ttl
-lib/lv2/Kars.lv2/Kars_ui.so
-lib/lv2/Kars.lv2/Kars_ui.ttl
 lib/lv2/Kars.lv2/manifest.ttl
-lib/lv2/Kars.lv2/modgui.ttl
-lib/lv2/Kars.lv2/modgui/icon-kars.html
-lib/lv2/Kars.lv2/modgui/pedals/boxy-small/yellow.png
-lib/lv2/Kars.lv2/modgui/pedals/footswitch.png
-lib/lv2/Kars.lv2/modgui/screenshot-kars.png
-lib/lv2/Kars.lv2/modgui/stylesheet-kars.css
-lib/lv2/Kars.lv2/modgui/thumbnail-kars.png
 lib/lv2/MVerb.lv2/MVerb_dsp.so
 lib/lv2/MVerb.lv2/MVerb_dsp.ttl
 lib/lv2/MVerb.lv2/MVerb_ui.so
 lib/lv2/MVerb.lv2/MVerb_ui.ttl
 lib/lv2/MVerb.lv2/manifest.ttl
-lib/lv2/MVerb.lv2/modgui.ttl
-lib/lv2/MVerb.lv2/modgui/combos/model-001/model-0930.png
-lib/lv2/MVerb.lv2/modgui/icon-mverb.html
-lib/lv2/MVerb.lv2/modgui/knobs/chicken-head/_strip.png
-lib/lv2/MVerb.lv2/modgui/screenshot-mverb.png
-lib/lv2/MVerb.lv2/modgui/stylesheet-mverb.css
-lib/lv2/MVerb.lv2/modgui/switches/switch-001.png
-lib/lv2/MVerb.lv2/modgui/thumbnail-mverb.png
-lib/lv2/MVerb.lv2/modgui/utils/dropdown-arrow-white.png
 lib/lv2/MVerb.lv2/presets.ttl
 lib/lv2/MaBitcrush.lv2/MaBitcrush_dsp.so
 lib/lv2/MaBitcrush.lv2/MaBitcrush_dsp.ttl
@@ -66,32 +80,11 @@ lib/lv2/Nekobi.lv2/Nekobi_dsp.ttl
 lib/lv2/Nekobi.lv2/Nekobi_ui.so
 lib/lv2/Nekobi.lv2/Nekobi_ui.ttl
 lib/lv2/Nekobi.lv2/manifest.ttl
-lib/lv2/Nekobi.lv2/modgui.ttl
-lib/lv2/Nekobi.lv2/modgui/background.png
-lib/lv2/Nekobi.lv2/modgui/footswitch.png
-lib/lv2/Nekobi.lv2/modgui/icon-nekobi.html
-lib/lv2/Nekobi.lv2/modgui/knob.png
-lib/lv2/Nekobi.lv2/modgui/led-off.png
-lib/lv2/Nekobi.lv2/modgui/led-on.png
-lib/lv2/Nekobi.lv2/modgui/screenshot-nekobi.png
-lib/lv2/Nekobi.lv2/modgui/slider-horizontal.png
-lib/lv2/Nekobi.lv2/modgui/slider-vertical.png
-lib/lv2/Nekobi.lv2/modgui/stylesheet-nekobi.css
-lib/lv2/Nekobi.lv2/modgui/thumb-nekobi.png
 lib/lv2/PingPongPan.lv2/PingPongPan_dsp.so
 lib/lv2/PingPongPan.lv2/PingPongPan_dsp.ttl
 lib/lv2/PingPongPan.lv2/PingPongPan_ui.so
 lib/lv2/PingPongPan.lv2/PingPongPan_ui.ttl
 lib/lv2/PingPongPan.lv2/manifest.ttl
-lib/lv2/PingPongPan.lv2/modgui.ttl
-lib/lv2/PingPongPan.lv2/modgui/background.png
-lib/lv2/PingPongPan.lv2/modgui/footswitch.png
-lib/lv2/PingPongPan.lv2/modgui/icon-ppp.html
-lib/lv2/PingPongPan.lv2/modgui/knob.png
-lib/lv2/PingPongPan.lv2/modgui/screenshot-ppp.png
-lib/lv2/PingPongPan.lv2/modgui/slider.png
-lib/lv2/PingPongPan.lv2/modgui/stylesheet-ppp.css
-lib/lv2/PingPongPan.lv2/modgui/thumb-ppp.png
 lib/lv2/PingPongPan.lv2/presets.ttl
 lib/lv2/ProM.lv2/ProM.so
 lib/lv2/ProM.lv2/ProM.ttl
@@ -105,3 +98,18 @@ lib/lv2/SoulForce.lv2/presets.ttl
 lib/lv2/glBars.lv2/glBars.so
 lib/lv2/glBars.lv2/glBars.ttl
 lib/lv2/glBars.lv2/manifest.ttl
+lib/vst/3BandEQ-vst.so
+lib/vst/3BandSplitter-vst.so
+lib/vst/AmplitudeImposer-vst.so
+lib/vst/CycleShifter-vst.so
+lib/vst/Kars-vst.so
+lib/vst/MVerb-vst.so
+lib/vst/MaBitcrush-vst.so
+lib/vst/MaFreeverb-vst.so
+lib/vst/MaGigaverb-vst.so
+lib/vst/MaPitchshift-vst.so
+lib/vst/Nekobi-vst.so
+lib/vst/PingPongPan-vst.so
+lib/vst/ProM-vst.so
+lib/vst/SoulForce-vst.so
+lib/vst/glBars-vst.so