svn commit: r565769 - in head/audio/faust: . files

[Yuri Victorovich]

Author: yuri
Date: Wed Feb 17 18:29:03 2021
New Revision: 565769
URL: https://svnweb.freebsd.org/changeset/ports/565769

Log:
  audio/faust: Up llvm version; Enable more backends; Fix the INCLUDE_HTTP option; Add to pkg-message
  
  llvm-{9,10} lack some xx::dump() functions and lead to libfaust.so with unresolved symbols.

Modified:
  head/audio/faust/Makefile
  head/audio/faust/files/patch-build_CMakeLists.txt
  head/audio/faust/pkg-message
  head/audio/faust/pkg-plist

Modified: head/audio/faust/Makefile
==============================================================================
--- head/audio/faust/Makefile	Wed Feb 17 18:28:58 2021	(r565768)
+++ head/audio/faust/Makefile	Wed Feb 17 18:29:03 2021	(r565769)
@@ -3,6 +3,7 @@
 
 PORTNAME=	faust
 DISTVERSION=	2.30.5
+PORTREVISION=	1
 CATEGORIES=	audio devel
 
 MAINTAINER=	yuri at FreeBSD.org
@@ -11,7 +12,7 @@ COMMENT=	Functional programming language for realtime 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-LIB_DEPENDS=	libLLVM-${LLVM_VERSION:C/([1-9])([0-9])/\1/}.so:devel/llvm${LLVM_VERSION}
+LIB_DEPENDS=	libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION}
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lang cmake ncurses python pkgconfig shebangfix
@@ -24,16 +25,21 @@ GH_TUPLE=	\
 
 SHEBANG_FILES=	tools/faust2appls/* tools/benchmark/faustbench tools/sound2faust/sound2reader
 
-LLVM_VERSION=	${LLVM_DEFAULT}
+LLVM_VERSION=	11 # earlier versions lack dump() function(s) that cause unresolved symbols in libfaust.so
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/build
-CMAKE_ARGS=	-DLLVM_BACKEND=COMPILER -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VERSION}
+CMAKE_ON=	INCLUDE_DYNAMIC # only installs headers and not libs by default: https://github.com/grame-cncm/faust/issues/553
+CMAKE_ON+=	LLVM_BUILD CPP_BUILD OCPP_BUILD # enable backends
+CMAKE_ARGS=	-DLLVM_BACKEND=DYNAMIC -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VERSION} \
+		-DC_BACKEND=DYNAMIC \
+		-DCPP_BACKEND=DYNAMIC
 
-CXXFLAGS+=	-DCPP_BUILD -DOCPP_BUILD # enable backends
+CXXFLAGS+=	-I${WRKSRC}/compiler/generator/cpp # fatal error: 'cpp_code_container.hh' file not found WHEN INCLUDE_STATIC=TRUE
+CXXFLAGS+=	`llvm-config${LLVM_VERSION} --cflags` -DLLVM_${LLVM_VERSION}0 # for the llvm backend
 LDFLAGS+=	-lexecinfo
 
 OPTIONS_DEFINE=		EXAMPLES HIGHLIGHT HTTPD_LIB
-OPTIONS_DEFAULT=	HIGHLIGHT
+OPTIONS_DEFAULT=	HIGHLIGHT HTTPD_LIB
 OPTIONS_SUB=		yes
 
 EXAMPLES_CMAKE_BOOL=	FREEBSD_INSTALL_EXAMPLES
@@ -41,9 +47,8 @@ EXAMPLES_CMAKE_BOOL=	FREEBSD_INSTALL_EXAMPLES
 HIGHLIGHT_DESC=		Syntax highlighting in Kate, gedit, Highlight, vim
 HTTPD_LIB_DESC=		Build httpd support library
 
-HTTPD_LIB_ALL_TARGET=	all httpd
+HTTPD_CMAKE_BOOL=	INCLUDE_HTTP
 HTTPD_LIB_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
-HTTPD_LIB_BROKEN=	TODO fix after change to cmake
 
 PORTEXAMPLES=		*
 

Modified: head/audio/faust/files/patch-build_CMakeLists.txt
==============================================================================
--- head/audio/faust/files/patch-build_CMakeLists.txt	Wed Feb 17 18:28:58 2021	(r565768)
+++ head/audio/faust/files/patch-build_CMakeLists.txt	Wed Feb 17 18:29:03 2021	(r565769)
@@ -5,7 +5,7 @@
  ####################################
  # source and headers files
 -file (GLOB SRC ${SRCDIR}/*.cpp ${SRCDIR}/*/*.cpp ${SRCDIR}/draw/*/*.cpp ${SRCDIR}/generator/fir/*.cpp)
-+file (GLOB SRC ${SRCDIR}/*.cpp ${SRCDIR}/*/*.cpp ${SRCDIR}/draw/*/*.cpp ${SRCDIR}/generator/fir/*.cpp ${SRCDIR}/generator/cpp/*.cpp)
++file (GLOB SRC ${SRCDIR}/*.cpp ${SRCDIR}/*/*.cpp ${SRCDIR}/draw/*/*.cpp ${SRCDIR}/generator/fir/*.cpp ${SRCDIR}/generator/cpp/*.cpp ${SRCDIR}/generator/llvm/*.cpp)
  file (GLOB HH  ${SRCDIR}/*.hh  ${SRCDIR}/*/*.hh  ${SRCDIR}/generator/fir/*.hh)
  
  ####################################

Modified: head/audio/faust/pkg-message
==============================================================================
--- head/audio/faust/pkg-message	Wed Feb 17 18:28:58 2021	(r565768)
+++ head/audio/faust/pkg-message	Wed Feb 17 18:29:03 2021	(r565769)
@@ -4,7 +4,7 @@
 You installed Faust: the programming language for realtime audio
 signal processing.
 
-In order to try it, you can put the final program from
+In order to try it, you can put the dsp program from
 http://faust.grame.fr/examples/2015/09/30/oscillator.html into the
 source file sine.dsp, and run the faust compiler that will create
 Qt UI with Jack audio backend:
@@ -13,6 +13,10 @@ $ faust2jaqt sine.dsp
 $ ./sine;
 
 It will create the window with sliders for two tunable oscillators.
+
+In order to compile programs for some audio backends (like Jack,
+PortAudio) you need to first install them.
+
 EOM
 }
 ]

Modified: head/audio/faust/pkg-plist
==============================================================================
--- head/audio/faust/pkg-plist	Wed Feb 17 18:28:58 2021	(r565768)
+++ head/audio/faust/pkg-plist	Wed Feb 17 18:29:03 2021	(r565769)
@@ -203,6 +203,7 @@ include/faust/gui/ValueConverter.h
 include/faust/gui/WaveReader.h
 include/faust/gui/console.h
 include/faust/gui/httpdUI.h
+%%HTTPD_LIB%%include/faust/gui/jsonfaustui.h
 include/faust/gui/meta.h
 include/faust/gui/mspUI.h
 include/faust/gui/qrcodegen.h
@@ -232,7 +233,11 @@ include/faust/unity/AudioPluginInterface.h
 include/faust/vst/faust.h
 include/faust/vst/voice.h
 include/faust/vst/vstui.h
+lib/libfaust.so
+lib/libfaust.so.2
+lib/libfaust.so.2.30.5
 lib/ios-libsndfile.a
+%%HTTPD_LIB%%lib/libHTTPDFaust.a
 lib/libOSCFaust.a
 %%HIGHLIGHT%%share/apps/katepart/syntax/faust.xml
 %%DATADIR%%/AU/AUPublic/AUBase/AUBase.cpp