git: f9a08c3ff04a - main - audio/zam-plugins-lv2: Update 3.14 -> 4.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Tue, 27 Dec 2022 07:51:17 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f9a08c3ff04ab677a77bb93c598c9f977f0fabc8

commit f9a08c3ff04ab677a77bb93c598c9f977f0fabc8
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-12-27 07:50:26 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-12-27 07:51:00 +0000

    audio/zam-plugins-lv2: Update 3.14 -> 4.1
    
    Reported by:    portscout
---
 audio/zam-plugins-lv2/Makefile                     | 22 ++++++++++-------
 audio/zam-plugins-lv2/distinfo                     | 12 ++++++----
 audio/zam-plugins-lv2/files/patch-Makefile         | 28 ++++++++--------------
 .../files/patch-dpf_Makefile.base.mk               | 20 ++++++++++++++++
 .../patch-dpf_utils_lv2-ttl-generator_GNUmakefile  | 11 ---------
 audio/zam-plugins-lv2/pkg-plist                    | 19 +++++++++++++--
 6 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/audio/zam-plugins-lv2/Makefile b/audio/zam-plugins-lv2/Makefile
index 9d12f738b0be..2475e7591f8a 100644
--- a/audio/zam-plugins-lv2/Makefile
+++ b/audio/zam-plugins-lv2/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	zam-plugins
-DISTVERSION=	3.14
-PORTREVISION=	2
+DISTVERSION=	4.1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
@@ -12,18 +11,25 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	lv2>0:audio/lv2 \
+		bash:shells/bash \
 		${LOCALBASE}/include/fftw3.h:math/fftw3
-LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libdbus-1.so:devel/dbus \
+		libfftw3f.so:math/fftw3-float \
 		libjack.so:audio/jack \
+		libpulse.so:audio/pulseaudio \
 		libsamplerate.so:audio/libsamplerate \
 		libzita-convolver.so:audio/zita-convolver
 
-USES=		compiler:c++11-lib gl gmake localbase:ldflags pkgconfig xorg
+USES=		compiler:c++11-lib gl gmake localbase:ldflags pkgconfig sdl xorg
+USE_GL=		gl
+USE_SDL=	sdl2
+USE_XORG=	x11 xext xrandr
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	zamaudio
-GH_TUPLE=	DISTRHO:DPF:68b3a57:d/dpf
-USE_GL=		gl
-USE_XORG=	x11
+GH_TUPLE=	DISTRHO:DPF:8818060:d/dpf \
+		DISTRHO:pugl:3e03459:pugl/dpf/dgl/src/pugl-upstream
 
 CFLAGS+=	-I${FILESDIR}
 MAKE_ARGS+=	USE_SYSTEM_LIBS=1 HAVE_ZITA_CONVOLVER=true
@@ -34,7 +40,7 @@ post-extract:
 	@${RM} -r ${WRKSRC}/lib/zita-convolver-*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/dpf/utils/generate-ttl.sh
+	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/usr/bin/env bash|' ${WRKSRC}/dpf/utils/generate-ttl.sh
 	${REINPLACE_CMD} -e 's/-mtune=generic//' \
 		${WRKSRC}/dpf/Makefile.base.mk
 .if ! ${ARCH} == amd64 && ! ${ARCH} == i386
diff --git a/audio/zam-plugins-lv2/distinfo b/audio/zam-plugins-lv2/distinfo
index a1d79078e06a..9f1f4b41d5e0 100644
--- a/audio/zam-plugins-lv2/distinfo
+++ b/audio/zam-plugins-lv2/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1608538023
-SHA256 (zamaudio-zam-plugins-3.14_GH0.tar.gz) = 4a73a73fa03cc6d7faf2d65840349d2a33e7aaef5a13c6345f534b6c434e7b42
-SIZE (zamaudio-zam-plugins-3.14_GH0.tar.gz) = 23924833
-SHA256 (DISTRHO-DPF-68b3a57_GH0.tar.gz) = c5e188808d6887119bc5311433558331fd7192cff37f1dbf5ed97f25d44a378a
-SIZE (DISTRHO-DPF-68b3a57_GH0.tar.gz) = 1624216
+TIMESTAMP = 1672125804
+SHA256 (zamaudio-zam-plugins-4.1_GH0.tar.gz) = 14fdf13e4f72e2b158c1b8db3d5c7e4a2740977acc1738c998507e0139d8ba15
+SIZE (zamaudio-zam-plugins-4.1_GH0.tar.gz) = 23926863
+SHA256 (DISTRHO-DPF-8818060_GH0.tar.gz) = 0d4a3a7a7c0d5f461b50dd631f115b58b3d1e86a955d932a94b2846ccc8873b5
+SIZE (DISTRHO-DPF-8818060_GH0.tar.gz) = 3473841
+SHA256 (DISTRHO-pugl-3e03459_GH0.tar.gz) = 5edbc1b8aaefe80dff42196694be053449723fdd108ddf2265d47a8a80cd4102
+SIZE (DISTRHO-pugl-3e03459_GH0.tar.gz) = 214146
diff --git a/audio/zam-plugins-lv2/files/patch-Makefile b/audio/zam-plugins-lv2/files/patch-Makefile
index 90ff8cc3c72c..422bd3c31a17 100644
--- a/audio/zam-plugins-lv2/files/patch-Makefile
+++ b/audio/zam-plugins-lv2/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2020-07-20 16:08:29 UTC
+--- Makefile.orig	2022-12-21 06:31:05 UTC
 +++ Makefile
-@@ -34,22 +34,21 @@ $(PLUGINS): libs
+@@ -31,17 +31,16 @@ $(PLUGINS): libs
  # --------------------------------------------------------------
  
  install: all
@@ -8,24 +8,16 @@
 +	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)/ladspa \
  		$(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2 \
  		$(DESTDIR)$(PREFIX)/$(LIBDIR)/vst \
- 		$(DESTDIR)$(PREFIX)/$(BINDIR) ; \
+-		$(DESTDIR)$(PREFIX)/$(LIBDIR)/vst3 \
+ 		$(DESTDIR)$(PREFIX)/$(LIBDIR)/clap \
+ 		$(DESTDIR)$(PREFIX)/$(BINDIR)
  	for plugin in $(PLUGINS); do \
 -		install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2 ; \
--		install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2 \
--			bin/"$$plugin".lv2/* ; \
 +		mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2 ; \
-+		install bin/"$$plugin".lv2/* $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2 ; \
+ 		install -m 644 bin/"$$plugin".lv2/* \
+ 			$(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2/ ; \
+-		cp -r bin/"$$plugin".vst3 $(DESTDIR)$(PREFIX)/$(LIBDIR)/vst3/ ; \
++		#cp -r bin/"$$plugin".vst3 $(DESTDIR)$(PREFIX)/$(LIBDIR)/vst3/ ; \
  	done;
- ifeq ($(HAVE_JACK),true)
- 	for plugin in $(PLUGINS); do \
--		install -t $(DESTDIR)$(PREFIX)/$(BINDIR) bin/"$$plugin" ; \
-+		install bin/"$$plugin" $(DESTDIR)$(PREFIX)/$(BINDIR) ; \
- 	done;
- endif
--	install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/ladspa bin/*-ladspa.so
--	install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/vst bin/*-vst.so
-+	install bin/*-ladspa.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/ladspa
-+	install bin/*-vst.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/vst
- 
- uninstall:
  	for plugin in $(PLUGINS); do \
+ 		install -m 755 bin/"$$plugin"$(APP_EXT) $(DESTDIR)$(PREFIX)/$(BINDIR)/ ; \
diff --git a/audio/zam-plugins-lv2/files/patch-dpf_Makefile.base.mk b/audio/zam-plugins-lv2/files/patch-dpf_Makefile.base.mk
new file mode 100644
index 000000000000..c9692f4ac31e
--- /dev/null
+++ b/audio/zam-plugins-lv2/files/patch-dpf_Makefile.base.mk
@@ -0,0 +1,20 @@
+--- dpf/Makefile.base.mk.orig	2022-12-14 11:22:42 UTC
++++ dpf/Makefile.base.mk
+@@ -218,7 +218,7 @@ BASE_OPTS  = -O3 -ffast-math -fdata-sections -ffunctio
+ LINK_OPTS  = -fdata-sections -ffunction-sections
+ 
+ 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 +=  -msse -msse2 -mfpmath=sse
+ endif
+ 
+ ifeq ($(MACOS),true)
diff --git a/audio/zam-plugins-lv2/files/patch-dpf_utils_lv2-ttl-generator_GNUmakefile b/audio/zam-plugins-lv2/files/patch-dpf_utils_lv2-ttl-generator_GNUmakefile
deleted file mode 100644
index 741808e3e349..000000000000
--- a/audio/zam-plugins-lv2/files/patch-dpf_utils_lv2-ttl-generator_GNUmakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- dpf/utils/lv2-ttl-generator/GNUmakefile.orig	2018-05-29 07:25:29 UTC
-+++ dpf/utils/lv2-ttl-generator/GNUmakefile
-@@ -9,7 +9,7 @@ build: ../lv2_ttl_generator
- endif
- 
- ../lv2_ttl_generator: lv2_ttl_generator.c
--	$(CC) $< $(CFLAGS) -o $@ $(LDFLAGS) -ldl
-+	$(CC) $< $(CFLAGS) -o $@ $(LDFLAGS)
- 
- ../lv2_ttl_generator.exe: lv2_ttl_generator.c
- 	$(CC) $< $(CFLAGS) -o $@ $(LDFLAGS) -static
diff --git a/audio/zam-plugins-lv2/pkg-plist b/audio/zam-plugins-lv2/pkg-plist
index 96d1312abf2a..fd9b1ab1c1d8 100644
--- a/audio/zam-plugins-lv2/pkg-plist
+++ b/audio/zam-plugins-lv2/pkg-plist
@@ -15,8 +15,24 @@ bin/ZamHeadX2
 bin/ZamPhono
 bin/ZamTube
 bin/ZamVerb
+lib/clap/ZaMaximX2.clap
+lib/clap/ZaMultiComp.clap
+lib/clap/ZaMultiCompX2.clap
+lib/clap/ZamAutoSat.clap
+lib/clap/ZamComp.clap
+lib/clap/ZamCompX2.clap
+lib/clap/ZamDelay.clap
+lib/clap/ZamDynamicEQ.clap
+lib/clap/ZamEQ2.clap
+lib/clap/ZamGEQ31.clap
+lib/clap/ZamGate.clap
+lib/clap/ZamGateX2.clap
+lib/clap/ZamGrains.clap
+lib/clap/ZamHeadX2.clap
+lib/clap/ZamPhono.clap
+lib/clap/ZamTube.clap
+lib/clap/ZamVerb.clap
 lib/ladspa/ZaMaximX2-ladspa.so
-lib/ladspa/ZaMultiComp-ladspa.so
 lib/ladspa/ZaMultiCompX2-ladspa.so
 lib/ladspa/ZamAutoSat-ladspa.so
 lib/ladspa/ZamComp-ladspa.so
@@ -28,7 +44,6 @@ lib/ladspa/ZamGEQ31-ladspa.so
 lib/ladspa/ZamGate-ladspa.so
 lib/ladspa/ZamGateX2-ladspa.so
 lib/ladspa/ZamGrains-ladspa.so
-lib/ladspa/ZamPhono-ladspa.so
 lib/ladspa/ZamTube-ladspa.so
 lib/lv2/ZaMaximX2.lv2/ZaMaximX2_dsp.so
 lib/lv2/ZaMaximX2.lv2/ZaMaximX2_dsp.ttl