Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Dec 2021 03:27:46 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c60634c06302 - main - audio/guitarix-lv2: Update 0.42.1 -> 0.43.0
Message-ID:  <202112070327.1B73RkWT062567@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

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

commit c60634c0630285fb1cbee8577aed61aca825c712
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-12-07 03:26:50 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-12-07 03:27:42 +0000

    audio/guitarix-lv2: Update 0.42.1 -> 0.43.0
---
 audio/guitarix-lv2/Makefile               | 24 ++++++++++++++++--------
 audio/guitarix-lv2/distinfo               |  6 +++---
 audio/guitarix-lv2/files/patch-git_d8f003 | 12 ------------
 audio/guitarix-lv2/pkg-plist              |  1 +
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/audio/guitarix-lv2/Makefile b/audio/guitarix-lv2/Makefile
index 7507e1201f20..534c9c28d07e 100644
--- a/audio/guitarix-lv2/Makefile
+++ b/audio/guitarix-lv2/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	guitarix
-DISTVERSION=	0.42.1
-PORTREVISION=	1
+DISTVERSION=	0.43.0
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/
 PKGNAMESUFFIX=	-lv2
@@ -24,8 +23,10 @@ LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
 		libfftw3f.so:math/fftw3-float \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
 		libjack.so:audio/jack \
 		liblilv-0.so:audio/lilv \
+		liblo.so:audio/liblo \
 		liblrdf.so:textproc/liblrdf \
 		libserd-0.so:devel/serd \
 		libsndfile.so:audio/libsndfile \
@@ -36,17 +37,20 @@ LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
 RUN_DEPENDS=	roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf
 
 USES=		compiler:c++11-lang eigen:3 gnome libarchive localbase:ldflags \
-		pkgconfig python:build readline waf xorg tar:xz
-USE_GNOME=	atkmm cairo gtk30 gtkmm30 pangomm
+		pkgconfig python:build readline shebangfix waf xorg tar:xz
+USE_GNOME=	atkmm cairo gtk30 gtkmm30 gdkpixbuf2 pangomm
 USE_XORG=	x11
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-lfs --ldflags="${LDFLAGS}"
 USE_BINUTILS=	yes # linking needs some GNU features, fails on 12 without this, see https://github.com/brummer10/GxPlugins.lv2/issues/9
 
+SHEBANG_FILES=	tools/coverage tools/dsp2cc tools/dsp2insert tools/dsp2insert tools/tube_transfer.py # see https://github.com/brummer10/guitarix/issues/97
+
+CONFIGURE_ARGS=	--enable-lfs --ldflags="${LDFLAGS}" --jack-session
+
 LDFLAGS+=	-B${LOCALBASE}/bin # Use ld provided by USE_BINUTILS for GNU features, otherwise GNU ld isn't called
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
-BINARY_ALIAS=	python=${PYTHON_CMD} ld=${LOCALBASE}/bin/ld
+BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD} ld=${LOCALBASE}/bin/ld
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
@@ -55,9 +59,13 @@ NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 NLS_USE=	GNOME=intltool
 
-post-install: # https://sourceforge.net/p/guitarix/bugs/60/
+post-install:
+	# strip, see https://sourceforge.net/p/guitarix/bugs/60/
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/guitarix
-	@${RM} -r ${STAGEDIR}/applications
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
+	# workaround for https://github.com/brummer10/guitarix/issues/98
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo && \
+	 ${MV} ${STAGEDIR}/usr/share/metainfo/org.guitarix.guitarix.metainfo.xml ${STAGEDIR}${PREFIX}/share/metainfo && \
+	 ${RMDIR} ${STAGEDIR}/usr/share/metainfo ${STAGEDIR}/usr/share
 
 .include <bsd.port.mk>
diff --git a/audio/guitarix-lv2/distinfo b/audio/guitarix-lv2/distinfo
index c296acf623d3..d9a76edf8fa7 100644
--- a/audio/guitarix-lv2/distinfo
+++ b/audio/guitarix-lv2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619212925
-SHA256 (guitarix2-0.42.1.tar.xz) = 797e46e07148fba89e46fac4efe73a5b3a98f070bca85db3d143de781b142c80
-SIZE (guitarix2-0.42.1.tar.xz) = 71825372
+TIMESTAMP = 1638843977
+SHA256 (guitarix2-0.43.0.tar.xz) = 482655fe668377b30befe3cdc26e9bf8b86a785b5c147abedffebaf1ed8bfca0
+SIZE (guitarix2-0.43.0.tar.xz) = 71761472
diff --git a/audio/guitarix-lv2/files/patch-git_d8f003 b/audio/guitarix-lv2/files/patch-git_d8f003
deleted file mode 100644
index 88c242afec8c..000000000000
--- a/audio/guitarix-lv2/files/patch-git_d8f003
+++ /dev/null
@@ -1,12 +0,0 @@
-https://sourceforge.net/p/guitarix/git/ci/d8f003484c57d808682025dfb07a7a1fb848afdc/
-Issue #63 - Fix build on gcc 11
-
---- src/headers/gx_system.h.orig
-+++ src/headers/gx_system.h
-@@ -132,7 +132,7 @@
- 
- template <class T>
- inline bool atomic_compare_and_exchange(T **p, T *oldv, T *newv) {
--    return g_atomic_pointer_compare_and_exchange(reinterpret_cast<void* volatile*>(p), static_cast<void*>(oldv), newv);
-+    return g_atomic_pointer_compare_and_exchange(reinterpret_cast<void**>(p), static_cast<void*>(oldv), newv);
- }
diff --git a/audio/guitarix-lv2/pkg-plist b/audio/guitarix-lv2/pkg-plist
index aa56e6616822..a598ce798014 100644
--- a/audio/guitarix-lv2/pkg-plist
+++ b/audio/guitarix-lv2/pkg-plist
@@ -851,6 +851,7 @@ share/gx_head/sounds/greathall.wav
 %%NLS%%share/locale/it/LC_MESSAGES/guitarix.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/guitarix.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/guitarix.mo
+share/metainfo/org.guitarix.guitarix.metainfo.xml
 share/pixmaps/gx_bypass.png
 share/pixmaps/gx_head.png
 share/pixmaps/gx_log_grey.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112070327.1B73RkWT062567>