5 files changed, 63 insertions, 20 deletions

diff --git a/audio/dpf-plugins-lv2/Makefile b/audio/dpf-plugins-lv2/Makefile
index 3d51e8bc94e7..edd766cb3ffa 100644
--- a/audio/dpf-plugins-lv2/Makefile
+++ b/audio/dpf-plugins-lv2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dpf-plugins
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5
+DISTVERSION=	1.6
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
@@ -13,20 +13,25 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		bash:shells/bash
-LIB_DEPENDS=	liblo.so:audio/liblo \
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		liblo.so:audio/liblo \
 		libprojectM.so:graphics/libprojectm \
 		libpulse-simple.so:audio/pulseaudio
 
-USES=		compiler:c++11-lang gl gmake localbase pkgconfig shebangfix xorg
+USES=		compiler:c++11-lang gl gmake localbase pkgconfig sdl shebangfix xorg
+USE_XORG=	x11 xcursor xext xrandr
+USE_GL=		gl
+USE_SDL=	sdl2
+
 SHEBANG_FILES=	dpf/utils/generate-ttl.sh
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	DISTRHO
 GH_PROJECT=	DPF-Plugins
-USE_XORG=	x11 xcursor xext xrandr
-USE_GL=		gl
 
 CXXFLAGS+=	-I${FILESDIR}
 LDFLAGS+=	-pthread
+MAKE_ARGS=	LINUX=true
 
 CONFLICTS_INSTALL=	nekobi-lv2 # bin/Nekobi
 
@@ -45,7 +50,4 @@ JACK_LIB_DEPENDS=	libjack.so:audio/jack
 
 SIMD_MAKE_ENV=		SIMD_FLAGS="-mtune=generic -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/'
-
 .include <bsd.port.mk>
diff --git a/audio/dpf-plugins-lv2/distinfo b/audio/dpf-plugins-lv2/distinfo
index 4ff31471fd90..0ccd9a3c168b 100644
--- a/audio/dpf-plugins-lv2/distinfo
+++ b/audio/dpf-plugins-lv2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642527495
-SHA256 (DISTRHO-DPF-Plugins-v1.5_GH0.tar.gz) = a421bfc1fe879473e5b5862dca4070e94e4fbe8daa13a6de0d4c432df25747a0
-SIZE (DISTRHO-DPF-Plugins-v1.5_GH0.tar.gz) = 71355133
+TIMESTAMP = 1667858901
+SHA256 (DISTRHO-DPF-Plugins-v1.6_GH0.tar.gz) = 175e3675a56a386918fab0b4b630632fb9506597fedf2ebde0691dbebc1cc2a7
+SIZE (DISTRHO-DPF-Plugins-v1.6_GH0.tar.gz) = 70527281
diff --git a/audio/dpf-plugins-lv2/files/patch-Makefile b/audio/dpf-plugins-lv2/files/patch-Makefile
index 6992c3109164..358bf62cd391 100644
--- a/audio/dpf-plugins-lv2/files/patch-Makefile
+++ b/audio/dpf-plugins-lv2/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2021-01-15 11:38:19 UTC
+--- Makefile.orig	2022-10-31 20:10:17 UTC
 +++ Makefile
-@@ -117,13 +117,13 @@ clean:
+@@ -163,7 +163,7 @@ clean:
  # --------------------------------------------------------------
  
  install:
@@ -9,10 +9,12 @@
  	install -d $(DESTDIR)$(PREFIX)/lib/dssi/
  	install -d $(DESTDIR)$(PREFIX)/lib/lv2/
  	install -d $(DESTDIR)$(PREFIX)/lib/vst/
+@@ -171,7 +171,7 @@ install:
+ 	install -d $(DESTDIR)$(PREFIX)/lib/clap/
  	install -d $(DESTDIR)$(PREFIX)/bin/
  
 -	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/
- ifeq ($(MACOS),true)
- 	cp -r bin/*.vst               $(DESTDIR)$(PREFIX)/lib/vst/
+ ifneq ($(MACOS),true)
+ 	install -m 644 bin/*-vst.*    $(DESTDIR)$(PREFIX)/lib/vst/
diff --git a/audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk b/audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk
index 48e032ba6fc3..81e51a501f20 100644
--- a/audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk
+++ b/audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk
@@ -1,11 +1,20 @@
---- dpf/Makefile.base.mk.orig	2021-01-15 11:38:19 UTC
+--- dpf/Makefile.base.mk.orig	2022-10-31 20:10:17 UTC
 +++ dpf/Makefile.base.mk
-@@ -136,7 +136,7 @@ BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
- BASE_OPTS  = -O3 -ffast-math -fdata-sections -ffunction-sections
+@@ -218,7 +218,7 @@ BASE_OPTS  = -O3 -ffast-math -fdata-sections -ffunctio
+ LINK_OPTS  = -fdata-sections -ffunction-sections
  
- ifeq ($(CPU_I386_OR_X86_64),true)
+ ifeq ($(GCC),true)
+-BASE_FLAGS += -fno-gnu-unique
++#BASE_FLAGS += -fno-gnu-unique
+ endif
+ 
+ ifeq ($(SKIP_STRIPPING),true)
+@@ -244,7 +244,7 @@ BASE_OPTS += -msse -msse2 -msse3 -msimd128
+ else ifeq ($(CPU_ARM32),true)
+ BASE_OPTS += -mfpu=neon-vfpv4 -mfloat-abi=hard
+ else ifeq ($(CPU_I386_OR_X86_64),true)
 -BASE_OPTS += -mtune=generic -msse -msse2 -mfpmath=sse
 +BASE_OPTS += $(SIMD_FLAGS)
  endif
  
- ifeq ($(CPU_ARM),true)
+ ifeq ($(MACOS),true)
diff --git a/audio/dpf-plugins-lv2/pkg-plist b/audio/dpf-plugins-lv2/pkg-plist
index 02acaf2e9f5e..b6cf65289e68 100644
--- a/audio/dpf-plugins-lv2/pkg-plist
+++ b/audio/dpf-plugins-lv2/pkg-plist
@@ -12,6 +12,21 @@
 %%JACK%%bin/PingPongPan
 %%JACK%%bin/SoulForce
 %%JACK%%bin/glBars
+lib/clap/3BandEQ.clap
+lib/clap/3BandSplitter.clap
+lib/clap/AmplitudeImposer.clap
+lib/clap/CycleShifter.clap
+lib/clap/Kars.clap
+lib/clap/MVerb.clap
+lib/clap/MaBitcrush.clap
+lib/clap/MaFreeverb.clap
+lib/clap/MaGigaverb.clap
+lib/clap/MaPitchshift.clap
+lib/clap/Nekobi.clap
+lib/clap/PingPongPan.clap
+lib/clap/ProM.clap/ProM.clap
+lib/clap/SoulForce.clap
+lib/clap/glBars.clap
 lib/dssi/3BandEQ-dssi.so
 lib/dssi/3BandEQ-dssi/3BandEQ_ui
 lib/dssi/3BandSplitter-dssi.so
@@ -112,3 +127,18 @@ lib/vst/PingPongPan-vst.so
 lib/vst/ProM.vst/ProM.so
 lib/vst/SoulForce-vst.so
 lib/vst/glBars-vst.so
+lib/vst3/3BandEQ.vst3/Contents/x86_64-linux/3BandEQ.so
+lib/vst3/3BandSplitter.vst3/Contents/x86_64-linux/3BandSplitter.so
+lib/vst3/AmplitudeImposer.vst3/Contents/x86_64-linux/AmplitudeImposer.so
+lib/vst3/CycleShifter.vst3/Contents/x86_64-linux/CycleShifter.so
+lib/vst3/Kars.vst3/Contents/x86_64-linux/Kars.so
+lib/vst3/MVerb.vst3/Contents/x86_64-linux/MVerb.so
+lib/vst3/MaBitcrush.vst3/Contents/x86_64-linux/MaBitcrush.so
+lib/vst3/MaFreeverb.vst3/Contents/x86_64-linux/MaFreeverb.so
+lib/vst3/MaGigaverb.vst3/Contents/x86_64-linux/MaGigaverb.so
+lib/vst3/MaPitchshift.vst3/Contents/x86_64-linux/MaPitchshift.so
+lib/vst3/Nekobi.vst3/Contents/x86_64-linux/Nekobi.so
+lib/vst3/PingPongPan.vst3/Contents/x86_64-linux/PingPongPan.so
+lib/vst3/ProM.vst3/Contents/x86_64-linux/ProM.so
+lib/vst3/SoulForce.vst3/Contents/x86_64-linux/SoulForce.so
+lib/vst3/glBars.vst3/Contents/x86_64-linux/glBars.so