audio/zam-plugins-lv: Update 3.10 -> 3.10-13

5 files changed, 20 insertions, 33 deletions

diff --git a/audio/zam-plugins-lv2/Makefile b/audio/zam-plugins-lv2/Makefile
index e944a0b81a34..f200724cf1ba 100644
--- a/audio/zam-plugins-lv2/Makefile
+++ b/audio/zam-plugins-lv2/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	zam-plugins
-DISTVERSION=	3.10
+DISTVERSION=	3.10-13
+DISTVERSIONSUFFIX=	-gfbdbf08
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
@@ -26,18 +27,19 @@ LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
 USES=		compiler:c++11-lib gmake localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	zamaudio
-GH_TUPLE=	DISTRHO:DPF:495cb5f:d/dpf
+GH_TUPLE=	DISTRHO:DPF:2786991:d/dpf
 USE_GL=		gl
 USE_XORG=	x11
 
 CFLAGS+=	-I${FILESDIR}
-LDFLAGS+=	-lzita-convolver # TODO this can be reduced to only relevant places
+MAKE_ARGS+=	USE_SYSTEM_LIBS=1
+xLDFLAGS+=	-lzita-convolver # TODO this can be reduced to only relevant places
 
 post-extract:
 	@${RM} -r ${WRKSRC}/lib/zita-convolver-*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|#include "../../lib/zita-convolver-.*/zita-convolver.h"|#include <zita-convolver.h>|' ${WRKSRC}/plugins/Zam*/convolution.*pp
+	#@${REINPLACE_CMD} -e 's|#include "../../lib/zita-convolver-.*/zita-convolver.h"|#include <zita-convolver.h>|' ${WRKSRC}/plugins/Zam*/convolution.*pp
 	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/dpf/utils/generate-ttl.sh
 
 .include <bsd.port.mk>
diff --git a/audio/zam-plugins-lv2/distinfo b/audio/zam-plugins-lv2/distinfo
index 95433c8bc422..a42d78bb1dce 100644
--- a/audio/zam-plugins-lv2/distinfo
+++ b/audio/zam-plugins-lv2/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1527579863
-SHA256 (zamaudio-zam-plugins-3.10_GH0.tar.gz) = 0267b7fc2bc9c0284ef195dc944021c2d057578e1814ee3a2f221191d3a651a1
-SIZE (zamaudio-zam-plugins-3.10_GH0.tar.gz) = 23528411
-SHA256 (DISTRHO-DPF-495cb5f_GH0.tar.gz) = 04195601ce9837618718b15f243116db83b586b0805a9e46bcde1dbbd394721a
-SIZE (DISTRHO-DPF-495cb5f_GH0.tar.gz) = 1600006
+TIMESTAMP = 1528555837
+SHA256 (zamaudio-zam-plugins-3.10-13-gfbdbf08_GH0.tar.gz) = 5cb7a1a95ab2571ad8a3797f0f4d2a5c27f29a89f1171312d576213cfe573b5c
+SIZE (zamaudio-zam-plugins-3.10-13-gfbdbf08_GH0.tar.gz) = 23932828
+SHA256 (DISTRHO-DPF-2786991_GH0.tar.gz) = dc2b8d2708926d1a2b8043bf5a3e4670530246949af01f5c959439e3a6ecdbc8
+SIZE (DISTRHO-DPF-2786991_GH0.tar.gz) = 1600005
diff --git a/audio/zam-plugins-lv2/files/patch-plugins_ZamHeadX2_Makefile b/audio/zam-plugins-lv2/files/patch-plugins_ZamHeadX2_Makefile
deleted file mode 100644
index 027d866ee5fc..000000000000
--- a/audio/zam-plugins-lv2/files/patch-plugins_ZamHeadX2_Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/ZamHeadX2/Makefile.orig	2018-05-29 07:56:10 UTC
-+++ plugins/ZamHeadX2/Makefile
-@@ -13,7 +13,6 @@ NAME = ZamHeadX2
- # Files to build
- 
- OBJS_DSP = \
--	../../lib/zita-convolver-3.1.0/zita-convolver.cpp.o \
- 	convolution.cpp.o \
- 	ZamHeadX2Plugin.cpp.o
- 
diff --git a/audio/zam-plugins-lv2/files/patch-plugins_ZamVerb_Makefile b/audio/zam-plugins-lv2/files/patch-plugins_ZamVerb_Makefile
deleted file mode 100644
index 4fe102bba643..000000000000
--- a/audio/zam-plugins-lv2/files/patch-plugins_ZamVerb_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins/ZamVerb/Makefile.orig	2018-05-29 07:56:20 UTC
-+++ plugins/ZamVerb/Makefile
-@@ -15,8 +15,7 @@ NAME = ZamVerb
- OBJS_DSP = \
- 	ZamVerbPlugin.cpp.o \
- 	ZamVerbImpulses.cpp.o \
--	convolution.cpp.o \
--	../../lib/zita-convolver-3.1.0/zita-convolver.cpp.o
-+	convolution.cpp.o
- 
- OBJS_UI  = \
- 	ZamVerbArtwork.cpp.o \
diff --git a/audio/zam-plugins-lv2/pkg-plist b/audio/zam-plugins-lv2/pkg-plist
index 2ca3cc2d85d9..96d1312abf2a 100644
--- a/audio/zam-plugins-lv2/pkg-plist
+++ b/audio/zam-plugins-lv2/pkg-plist
@@ -10,6 +10,7 @@ bin/ZamEQ2
 bin/ZamGEQ31
 bin/ZamGate
 bin/ZamGateX2
+bin/ZamGrains
 bin/ZamHeadX2
 bin/ZamPhono
 bin/ZamTube
@@ -26,10 +27,9 @@ lib/ladspa/ZamEQ2-ladspa.so
 lib/ladspa/ZamGEQ31-ladspa.so
 lib/ladspa/ZamGate-ladspa.so
 lib/ladspa/ZamGateX2-ladspa.so
-lib/ladspa/ZamHeadX2-ladspa.so
+lib/ladspa/ZamGrains-ladspa.so
 lib/ladspa/ZamPhono-ladspa.so
 lib/ladspa/ZamTube-ladspa.so
-lib/ladspa/ZamVerb-ladspa.so
 lib/lv2/ZaMaximX2.lv2/ZaMaximX2_dsp.so
 lib/lv2/ZaMaximX2.lv2/ZaMaximX2_dsp.ttl
 lib/lv2/ZaMaximX2.lv2/ZaMaximX2_ui.so
@@ -101,6 +101,12 @@ lib/lv2/ZamGateX2.lv2/ZamGateX2_ui.so
 lib/lv2/ZamGateX2.lv2/ZamGateX2_ui.ttl
 lib/lv2/ZamGateX2.lv2/manifest.ttl
 lib/lv2/ZamGateX2.lv2/presets.ttl
+lib/lv2/ZamGrains.lv2/ZamGrains_dsp.so
+lib/lv2/ZamGrains.lv2/ZamGrains_dsp.ttl
+lib/lv2/ZamGrains.lv2/ZamGrains_ui.so
+lib/lv2/ZamGrains.lv2/ZamGrains_ui.ttl
+lib/lv2/ZamGrains.lv2/manifest.ttl
+lib/lv2/ZamGrains.lv2/presets.ttl
 lib/lv2/ZamHeadX2.lv2/ZamHeadX2_dsp.so
 lib/lv2/ZamHeadX2.lv2/ZamHeadX2_dsp.ttl
 lib/lv2/ZamHeadX2.lv2/ZamHeadX2_ui.so
@@ -137,6 +143,7 @@ lib/vst/ZamEQ2-vst.so
 lib/vst/ZamGEQ31-vst.so
 lib/vst/ZamGate-vst.so
 lib/vst/ZamGateX2-vst.so
+lib/vst/ZamGrains-vst.so
 lib/vst/ZamHeadX2-vst.so
 lib/vst/ZamPhono-vst.so
 lib/vst/ZamTube-vst.so