Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Sep 2020 18:26:43 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r548738 - in head/audio/zrythm: . files
Message-ID:  <202009151826.08FIQhF0022197@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Tue Sep 15 18:26:42 2020
New Revision: 548738
URL: https://svnweb.freebsd.org/changeset/ports/548738

Log:
  audio/zrythm: Fix license; Fix link to fftw3*_threads libraries: they weren't linked to due to a bug in meson.build
  
  Reported by:	upstream

Deleted:
  head/audio/zrythm/files/patch-src_main.c
Modified:
  head/audio/zrythm/Makefile
  head/audio/zrythm/files/patch-meson.build

Modified: head/audio/zrythm/Makefile
==============================================================================
--- head/audio/zrythm/Makefile	Tue Sep 15 16:35:04 2020	(r548737)
+++ head/audio/zrythm/Makefile	Tue Sep 15 18:26:42 2020	(r548738)
@@ -3,15 +3,17 @@
 PORTNAME=	zrythm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.911
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modern music production system, also known as DAW
 
-LICENSE=	GPLv3
+LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	fftw3>0:math/fftw3 \
+		fftw3-float>0:math/fftw3-float \
 		help2man:misc/help2man \
 		kf5-breeze-icons>0:x11-themes/kf5-breeze-icons
 LIB_DEPENDS=	libaudec.so:audio/libaudec \
@@ -47,6 +49,8 @@ USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 gtksource
 USE_XORG=	x11
 GLIB_SCHEMAS=	org.zrythm.Zrythm.gschema.xml
 INSTALLS_ICONS=	yes
+
+LDFLAGS+=	${LOCALBASE}/lib/libfftw3_threads.so ${LOCALBASE}/lib/libfftw3f_threads.so # these libs are required but aren't returned by pkg-config for fftw3
 
 BINARY_ALIAS=	git=false python3=${PYTHON_CMD}
 

Modified: head/audio/zrythm/files/patch-meson.build
==============================================================================
--- head/audio/zrythm/files/patch-meson.build	Tue Sep 15 16:35:04 2020	(r548737)
+++ head/audio/zrythm/files/patch-meson.build	Tue Sep 15 18:26:42 2020	(r548738)
@@ -1,3 +1,5 @@
+Workaround for the bug in meson.build: fftw3_threads and fftw3f_threads libraries aren't returned by pkg-config
+
 --- meson.build.orig	2020-06-06 18:03:44 UTC
 +++ meson.build
 @@ -638,8 +638,8 @@ zrythm_deps = [



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