audio/jalv: Update 1.6.6 -> 1.6.8

6 files changed, 12 insertions, 49 deletions

diff --git a/audio/jalv/Makefile b/audio/jalv/Makefile
index f60bb619ebe0..6356af24566b 100644
--- a/audio/jalv/Makefile
+++ b/audio/jalv/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	jalv
-DISTVERSION=	1.6.6
-PORTREVISION=	3
+DISTVERSION=	1.6.8
 CATEGORIES=	audio
 MASTER_SITES=	http://download.drobilla.net/
 
@@ -21,15 +20,12 @@ LIB_DEPENDS=	liblilv-0.so:audio/lilv \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		compiler:c++11-lang gnome pkgconfig python:build qmake:no_configure,no_env \
-		qt:5 tar:bz2 waf
-CONFIGURE_ARGS=	--no-qt4
-USE_CXXSTD=	c++11
+USES=		desktop-file-utils gnome pkgconfig meson qmake:no_configure,no_env \
+		qt:5 tar:xz
 USE_QT=		core gui widgets buildtools:build
 USE_GNOME=	atk atkmm cairo cairomm pango pangomm libsigc++20 \
 		gdkpixbuf2 glib20 glibmm  gtk20 gtk30 gtkmm24
 
-post-install:
-		@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/jalv* lib/jack/jalv.so
+CXXFLAGS+=	-fPIC
 
 .include <bsd.port.mk>
diff --git a/audio/jalv/distinfo b/audio/jalv/distinfo
index 8090e071a693..991da0e3126d 100644
--- a/audio/jalv/distinfo
+++ b/audio/jalv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613273285
-SHA256 (jalv-1.6.6.tar.bz2) = 92d141781b664373207c343cebc5e9b8ced461faf26fdccb95df0007b0639e16
-SIZE (jalv-1.6.6.tar.bz2) = 356622
+TIMESTAMP = 1665462184
+SHA256 (jalv-1.6.8.tar.xz) = edae77b1280ea44d4c0b2b732686defd370fde25ed1da289896d9f53b6fc15e1
+SIZE (jalv-1.6.8.tar.xz) = 60712
diff --git a/audio/jalv/files/patch-src_jalv__gtkmm2.cpp b/audio/jalv/files/patch-src_jalv__gtkmm2.cpp
deleted file mode 100644
index c296e9caf2c5..000000000000
--- a/audio/jalv/files/patch-src_jalv__gtkmm2.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/jalv_gtkmm2.cpp.orig	2021-02-14 03:34:10 UTC
-+++ src/jalv_gtkmm2.cpp
-@@ -14,6 +14,8 @@
-   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
- 
-+#include <ctype.h> // workaround for error: use of undeclared identifier 'isascii'
-+
- #include "jalv_internal.h"
- 
- #include "lv2/core/attributes.h"
diff --git a/audio/jalv/files/patch-src_jalv__qt.cpp b/audio/jalv/files/patch-src_jalv__qt.cpp
deleted file mode 100644
index 173e415617af..000000000000
--- a/audio/jalv/files/patch-src_jalv__qt.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/jalv_qt.cpp.orig	2021-02-14 03:40:27 UTC
-+++ src/jalv_qt.cpp
-@@ -14,6 +14,8 @@
-   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
- 
-+#include <ctype.h> // workaround for error: use of undeclared identifier 'isascii'
-+
- #include "jalv_internal.h"
- 
- #include "lilv/lilv.h"
diff --git a/audio/jalv/files/patch-wscript b/audio/jalv/files/patch-wscript
deleted file mode 100644
index f7513df26f1a..000000000000
--- a/audio/jalv/files/patch-wscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- wscript.orig	2021-01-07 22:05:57 UTC
-+++ wscript
-@@ -116,7 +116,7 @@ def configure(conf):
-     conf.check_pkg('serd-0 >= 0.24.0', uselib_store='SERD')
-     conf.check_pkg('sord-0 >= 0.14.0', uselib_store='SORD')
-     conf.check_pkg('sratom-0 >= 0.6.0', uselib_store='SRATOM')
--    if Options.options.portaudio:
-+    if False and Options.options.portaudio:
-         conf.check_pkg('portaudio-2.0 >= 2.0.0',
-                        uselib_store='PORTAUDIO',
-                        system=True,
diff --git a/audio/jalv/pkg-plist b/audio/jalv/pkg-plist
index 832e6c753559..47e34f7d97c5 100644
--- a/audio/jalv/pkg-plist
+++ b/audio/jalv/pkg-plist
@@ -1,10 +1,10 @@
 bin/jalv
 bin/jalv.gtk
 bin/jalv.gtk3
-bin/jalv.gtkmm
 bin/jalv.qt5
 lib/jack/jalv.so
-share/man/man1/jalv.1.gz
-share/man/man1/jalv.gtk.1.gz
-share/man/man1/jalv.gtkmm.1.gz
-share/man/man1/jalv.qt.1.gz
+man/man1/jalv.1.gz
+man/man1/jalv.gtk.1.gz
+man/man1/jalv.gtk3.1.gz
+man/man1/jalv.qt5.1.gz
+share/applications/jalv.desktop