- new

diff --git a/faust.spec b/faust.spec
new file mode 100644 (file)
index 0000000..64e9c31
--- /dev/null
+++ b/faust.spec
@@ -0,0 +1,143 @@
+#
+# Conditional build:
+%bcond_with    tests           # build with tests
+%bcond_without tests           # build without tests
+#
+Summary:       Faust - Programming Language for Audio Applications and Plugins
+Name:          faust
+Version:       2.20.2
+%define                libsrev 127e5bf
+Release:       0.1
+License:       GPL v2 and BSD
+Group:         Applications/Multimedia
+# SF URL: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:       https://github.com/grame-cncm/faust/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 2e4f2db77a1229edf7eb18f14ddd6617
+Source1:       https://github.com/grame-cncm/faustlibraries/archive/%{libsrev}/%{name}libraries-%{version}-%{libsrev}.tar.gz
+# Source1-md5: a0402ea3d24a3fcfb2b8e2e5f251e329
+Patch0:                libmicrohttpd.patch
+Patch1:                libdir.patch
+URL:           https://faust.grame.fr/
+BuildRequires: cmake
+#BuildRequires:        -
+#BuildRequires:        -
+#BuildRequires:        -
+#BuildRequires:        -
+#BuildRequires:        -
+#BuildRequires:        -
+#BuildRequires:        -
+#BuildRequires:        -
+#BuildRequires:        -
+#BuildRequires:        autoconf
+#BuildRequires:        automake
+#BuildRequires:        intltool
+#BuildRequires:        libtool
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define        _noautostrip    .*/.*libsndfile\..*
+
+%description
+Faust (Functional Audio Stream) is a functional programming language
+for sound synthesis and audio processing with a strong focus on
+the design of synthesizers, musical instruments, audio effects, etc.
+Faust targets high-performance signal processing applications and
+audio plug-ins for a variety of platforms and standards.
+
+%package android
+Summary:       Faust API support for android
+Group:         Applications/Multimedia
+
+%description android
+Faust API support for android.
+
+%package devel
+Summary:       Header files for %{name} library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki %{name}
+Group:         Development/Libraries
+
+%description devel
+Header files for %{name} library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki %{name}.
+
+%package static
+Summary:       Static %{name} library
+Summary(pl.UTF-8):     Statyczna biblioteka %{name}
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static %{name} library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka %{name}.
+
+%prep
+%setup -q -a1
+%patch0 -p1
+%patch1 -p1
+
+%{__mv} faustlibraries-%{libsrev}*/* libraries/
+%{__rm} -r faustlibraries-%{libsrev}*
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
+      tools/faust2appls/faust2atomsnippets \
+      tools/faust2appls/faust2md
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+ruby(\s|$),#!%{__ruby}\1,' \
+      tools/faust2sc-1.0.0/faust2sc
+
+%build
+CMAKEOPT="\
+       -DCMAKE_VERBOSE_MAKEFILE=ON \
+       -DCMAKE_BUILD_TYPE=%{!?debug:PLD}%{?debug:Debug} \
+       -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+       -DCMAKE_CXX_FLAGS_PLD='%{rpmcxxflags}' \
+       -DCMAKE_C_FLAGS_PLD='%{rpmcflags}' \
+       -DCMAKE_Fortran_FLAGS_PLD='%{rpmcflags}' \
+       -DCMAKE_EXE_LINKER_FLAGS_PLD='%{rpmldflags}' \
+       -DCMAKE_SHARED_LINKER_FLAGS_PLD='%{rpmldflags}' \
+       -DCMAKE_MODULE_LINKER_FLAGS_PLD='%{rpmldflags}'"
+
+%{__make} \
+       JOBS=%{?_smp_mflags} \
+       PREFIX=%{_prefix} \
+       LIBSDIR=%{_lib} \
+       CMAKEOPT="$CMAKEOPT"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+       PREFIX=%{_prefix} \
+       LIBSDIR=%{_lib} \
+       DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc README.md WHATSNEW.md
+%attr(755,root,root) %{_bindir}/%{name}*
+%attr(755,root,root) %{_bindir}/encoderunitypackage
+%attr(755,root,root) %{_bindir}/filename2ident
+%attr(755,root,root) %{_bindir}/sound2reader
+%{_datadir}/faust
+%{_mandir}/man1/faust.1*
+
+%exclude %{_datadir}/faust/android
+%exclude %{_datadir}/faust/api/android
+%exclude %{_datadir}/faust/smartKeyboard/android
+
+%files android
+%defattr(644,root,root,755)
+%{_datadir}/faust/android
+%{_datadir}/faust/api/android
+%{_datadir}/faust/smartKeyboard/android
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/faust
+%{_libdir}/*.a

diff --git a/libdir.patch b/libdir.patch
new file mode 100644 (file)
index 0000000..bad5f46
--- /dev/null
+++ b/libdir.patch
@@ -0,0 +1,310 @@
+commit baf3ef0ab497d6b829c729638d5941753ba74dcd
+Author: Dominique Fober <fober@grame.fr>
+Date:   Wed Jan 22 12:04:23 2020 +0100
+
+    support to install libraries in lib64 (or any other name). The faust code is also change due to the --libdir faust option.
+
+diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
+index 12f2f937d..323341e6f 100644
+--- a/build/CMakeLists.txt
++++ b/build/CMakeLists.txt
+@@ -13,14 +13,17 @@ get_major_minor_patch( ${VERSION} )
+ set (SOVERS ${VERSION_MAJOR})
+ message (STATUS "Configuring version ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+ 
++if (NOT DEFINED LIBSDIR)
++      set ( LIBSDIR  lib)
++endif()
++
+ get_filename_component(ROOT ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
+ set (SRCDIR ${ROOT}/compiler)
+ set (BINDIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+-set (LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/lib)
++set (LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/${LIBSDIR})
+ 
+ set (CMAKE_CXX_STANDARD 11)
+ 
+-
+ #######################################
+ # Output options
+ option ( DEPLOYMENT_TARGET    "[MacOS]"       off )
+@@ -140,6 +143,7 @@ endif()
+ if (MSVC)
+       set (FAUST_DEFINITIONS ${FAUST_DEFINITIONS} -DMSVisualStudio)
+ else()
++      set (FAUST_DEFINITIONS ${FAUST_DEFINITIONS} -DLIBDIR="${LIBSDIR}")
+       set(CMAKE_CXX_FLAGS_DEBUG "-g -Wextra -Wno-unused-parameter")
+       set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wextra -Wno-unused-parameter")
+ endif()
+@@ -255,6 +259,7 @@ set (ARCHINC ${ARCHDIR}/faust)
+ set (ARCHDIRS ${ARCHINC}/au ${ARCHINC}/audio ${ARCHINC}/dsp ${ARCHINC}/gui ${ARCHINC}/midi ${ARCHINC}/unity ${ARCHINC}/vst)
+ 
+ message (STATUS "Install location is ${CMAKE_INSTALL_PREFIX}")
++message (STATUS "Install libraries in ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}")
+ message (STATUS "Include targets: ${INSTALL_TARGETS} ${SUBTARGETS}")
+ 
+ ####################################
+@@ -265,16 +270,16 @@ endif()
+ 
+ install ( TARGETS ${INSTALL_TARGETS}
+       RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
++    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
+     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/faust
+ )
+ 
+ if (INCLUDE_DYNAMIC)
+ install ( TARGETS dynamiclib
+-      RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
++      RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
+ )
+ endif()
+ 
+@@ -386,7 +391,7 @@ install (
+ # install ios lib
+ if (NOT WIN32)
+       install (
+-              FILES     ${ARCHDIR}/ios-libsndfile.a DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
++              FILES     ${ARCHDIR}/ios-libsndfile.a DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
+               PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+       )
+ endif()
+diff --git a/build/Makefile b/build/Makefile
+index e3cf94f01..b8484e294 100644
+--- a/build/Makefile
++++ b/build/Makefile
+@@ -18,6 +18,7 @@ VERSION := 2.21.6
+ CACHE  = $(FAUSTDIR)/CMakeCache.txt
+ BCACHE = $(FAUSTDIR)/backends.txt
+ TCACHE = $(FAUSTDIR)/targets.txt
++LCACHE = $(FAUSTDIR)/libsdir.txt
+ ifeq ($(system),  MINGW)
+       GENERATOR ?= $(shell [ -f $(CACHE) ] && (grep CMAKE_GENERATOR:INTERNAL $(CACHE) | cut -d= -f2) || echo MSYS Makefiles)
+       NATIVEPACK = winpack
+@@ -57,6 +58,7 @@ BUILDOPT ?= --config Release
+ JOBS   ?= -j 4
+ BACKENDS ?= $(shell [ -f $(BCACHE) ] && (grep BACKENDS $(BCACHE) | cut -d= -f2) || echo regular.cmake)
+ TARGETS  ?= $(shell [ -f $(TCACHE) ] && (grep TARGETS $(TCACHE) | cut -d= -f2) || echo regular.cmake)
++LIBSDIR  ?= $(shell [ -f $(LCACHE) ] && (grep LIBSDIR $(LCACHE) | cut -d= -f2) || echo lib)
+ EMCC   ?= emcc
+ 
+ #===============================================================
+@@ -77,6 +79,10 @@ endif
+ all: $(PROJ)
+       cmake --build $(FAUSTDIR) $(BUILDOPT) -- $(JOBS)
+ 
++full:
++      $(MAKE) cmake BACKENDS=all.cmake TARGETS=all.cmake 
++      cmake --build $(FAUSTDIR) $(BUILDOPT) -- $(JOBS)
++
+ clean:
+       cmake --build $(FAUSTDIR) --target clean
+ 
+@@ -89,6 +95,7 @@ help:
+       @echo "-------- FAUST compiler makefile --------"
+       @echo "Available targets are:"
+       @echo " 'all' (default) : builds the current targets (as defined by your targets setup)."
++      @echo " 'full'          : builds the all targets with all backends."
+       @echo
+       @echo "Targets that require specific setup (see TARGETS option):"
+       @echo " 'faust'          : builds the Faust compiler."
+@@ -99,7 +106,6 @@ help:
+       @echo " 'oscdynamic' : builds the OSC library in dynamic mode."
+       @echo " 'httpdynamic': builds the HTTPD library in dynamic mode."
+       @echo " 'oscandroid' : builds the OSC library for Android."
+-      @echo
+       @echo " 'ioslib'     : builds the libfaust static lib for iOS (makes use of the ios.cmake backend)"
+       @echo
+       @echo "Cleaning:"
+@@ -112,6 +118,7 @@ help:
+       @echo
+       @echo "Available options:"
+       @echo "  FAUSTDIR=<dir>              : the compilation directory. Default to '$(FAUSTDIR)'"
++      @echo "  LIBSDIR                     : the libraries destination directory, default: $(LIBSDIR)"
+       @echo "  GENERATOR=<a cmake generator>: see cmake -h. Default to '$(GENERATOR)'"
+       @echo "  CMAKEOPT=<cmake options>    : pass options to cmake for project generation."
+       @echo "  BUILDOPT=<cmake options>    : pass options to cmake at build time (default to $(BUILDOPT))."
+@@ -283,12 +290,10 @@ silent: $(FAUSTDIR)
+       cd $(FAUSTDIR) && cmake -DCMAKE_VERBOSE_MAKEFILE=OFF ..
+ 
+ cmake: $(FAUSTDIR)
+-      cd $(FAUSTDIR) && cmake -C ../backends/$(BACKENDS) -C ../targets/$(TARGETS) $(CMAKEOPT) -G '$(GENERATOR)' ..
++      cd $(FAUSTDIR) && cmake -C ../backends/$(BACKENDS) -C ../targets/$(TARGETS) $(CMAKEOPT) -DLIBSDIR=$(LIBSDIR) -G '$(GENERATOR)' ..
+       @echo BACKENDS=$(BACKENDS) > $(BCACHE)
+       @echo TARGETS=$(TARGETS) > $(TCACHE)
+-
+-reset: $(FAUSTDIR)
+-      cd $(FAUSTDIR) && cmake -C ../backends/$(BACKENDS) $(CMAKEOPT) -DINCLUDE_STATIC=off -DINCLUDE_DYNAMIC=off -DINCLUDE_HTTP=on -DOSCDYNAMIC=off -DHTTPDYNAMIC=off ..
++      @echo LIBSDIR=$(LIBSDIR) > $(LCACHE)
+ 
+ 
+ #===============================================================
+diff --git a/build/README.md b/build/README.md
+index 3b60d063c..641423a51 100644
+--- a/build/README.md
++++ b/build/README.md
+@@ -2,7 +2,7 @@
+ # How to compile
+ 
+ ### Prerequisites
+-- you must have [cmake](https://cmake.org/) version 3.4.0 or greater installed.
++- you must have [cmake](https://cmake.org/) version 3.7.2 or greater installed.
+ - you must have [LLVM](http://llvm.org/) version 3.8 or greater installed to compile the llvm backend.
+ - you must have [libmicrohttpd](https://www.gnu.org/software/libmicrohttpd/) installed to compile the http library.
+ - on Windows, you have the option to use MS [Visual Studio](http://www.microsoft.com/express/) or the [MSYS2](http://www.msys2.org/) environment. The current Makefile is targetting MSYS2 by default. See Windows specific notes.
+@@ -26,7 +26,7 @@ The Makefile includes 2 kind of targets, addressing the 2 phases of the compilat
+ By default, you can simply type `make` in the `build` folder to compile the **Faust** compiler and the **OSC and HTTP** libraries.
+ On output, you'll find applications in the `build/bin` folder and libraries in the `build/lib` folder.
+ 
+-Type `make help` for details on targets and options.
++**Type `make help` for details on targets and options.**
+ 
+ ## Customizing the embedded backends
+ The `backends` folder contains a set of files describing the Faust backends to be embedded into  each possible output (compiler, static library, dynamic library). By default, the project makes use of `backends.cmake`.
+@@ -48,6 +48,35 @@ You can have a look at the `Makefile` for examples of cmake invocations and at t
+ 
+ **Warning**: running cmake from the build folder may override the existing Makefile.
+ 
++
++## Installing on Linux
++
++The default install directory is `/usr/local`:
++
++`> sudo make install`  
++
++#### Custom installation
++
++To install in another folder:
++
++`> make install PREFIX=/your_folder/folder`  
++
++
++#### Faust libraries location
++By default, all faust libraries are installed in a `lib` folder.
++Some system may require to have the 64 bits libraries installed in a `lib64` folder.
++To specify another destination folder for libraries, use the LIBSDIR option e.g.:
++
++`> make LIBSDIR=lib64`  
++
++or when your project is already generated:
++
++`> make cmake LIBSDIR=lib64`  
++
++
++**WARNING**: all the compilation chain must be aware of the libraries destination folder. Indeed, `faust --libdir` must give the correct location.
++
++
+ ## Compiling on Windows
+ #### Using MSYS2
+ Use of the `make` command assumes that you have [MSYS2](http://www.msys2.org/) installed with development tools. Read the MSYS2 [specific note](README-MSYS2.md).
+diff --git a/build/http/CMakeLists.txt b/build/http/CMakeLists.txt
+index 5dfc4cde7..63e5b06c8 100644
+--- a/build/http/CMakeLists.txt
++++ b/build/http/CMakeLists.txt
+@@ -21,6 +21,9 @@ option ( LIBMICROHTTPD_LDFLAGS       "Manual link flags for libmicrohttpd"   off )
+ if (NOT DEFINED LIBDIR)
+       set (LIBDIR lib)
+ endif()
++if (NOT DEFINED LIBSDIR)
++      set (LIBSDIR lib)
++endif()
+ if (NOT DEFINED ROOT)
+       set (ROOT ../..)
+ endif()
+@@ -190,9 +193,9 @@ if (PACK)
+ endif()
+ 
+ install ( TARGETS ${TARGETS}
+-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib 
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib 
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
++      RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
+     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/faust/gui
+ )
+ 
+diff --git a/build/interp/CMakeLists.txt b/build/interp/CMakeLists.txt
+index efdf4e81e..76ad085c3 100644
+--- a/build/interp/CMakeLists.txt
++++ b/build/interp/CMakeLists.txt
+@@ -12,11 +12,15 @@ set (SOVERS 0)
+ option ( ITPDYNAMIC         "Include Faust Interpreter dynamic library" off )
+ option ( USE_LLVM_CONFIG    "Force use off llvm-config" on )
+ 
++
+ #######################################
+ # check for variables that are normally set at upper level
+ if (NOT DEFINED LIBDIR)
+       set (LIBDIR lib)
+ endif()
++if (NOT DEFINED LIBSDIR)
++      set (LIBSDIR lib)
++endif()
+ if (NOT DEFINED ROOT)
+       set (ROOT ../..)
+ endif()
+@@ -109,9 +113,9 @@ if (PACK)
+ endif()
+ 
+ install ( TARGETS ${TARGETS}
+-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib 
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib 
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
++      RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
+     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/faust/dsp
+ )
+ 
+diff --git a/build/osc/CMakeLists.txt b/build/osc/CMakeLists.txt
+index 9bcaa73d5..92d96d097 100644
+--- a/build/osc/CMakeLists.txt
++++ b/build/osc/CMakeLists.txt
+@@ -16,6 +16,9 @@ option ( OSCDYNAMIC  "Include Faust OSC dynamic library"     off )
+ if (NOT DEFINED LIBDIR)
+       set (LIBDIR lib)
+ endif()
++if (NOT DEFINED LIBSDIR)
++      set (LIBSDIR lib)
++endif()
+ if (NOT DEFINED ROOT)
+       set (ROOT ../..)
+ endif()
+@@ -136,9 +139,9 @@ if (PACK)
+ endif()
+ 
+ install ( TARGETS ${TARGETS}
+-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib 
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib 
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
++      RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSDIR}
+     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/faust/osc
+ )
+ 
+diff --git a/compiler/libcode.cpp b/compiler/libcode.cpp
+index 9c9c7e65e..4d12ec46a 100644
+--- a/compiler/libcode.cpp
++++ b/compiler/libcode.cpp
+@@ -727,9 +727,12 @@ static bool processCmdline(int argc, const char* argv[])
+ #define kPSEP '/'
+ #endif
+ 
++#ifndef LIBDIR
++#define LIBDIR "lib"
++#endif
+ static void printLibDir()
+ {
+-    cout << gGlobal->gFaustRootDir << kPSEP << "lib" << endl;
++    cout << gGlobal->gFaustRootDir << kPSEP << LIBDIR << endl;
+ }
+ static void printIncludeDir()
+ {

diff --git a/libmicrohttpd.patch b/libmicrohttpd.patch
new file mode 100644 (file)
index 0000000..3c2de6e
--- /dev/null
+++ b/libmicrohttpd.patch
@@ -0,0 +1,22 @@
+diff --git a/architecture/httpdlib/src/httpd/HTTPDServer.cpp b/architecture/httpdlib/src/httpd/HTTPDServer.cpp
+index 0c5dfa67d..a9ccec8e4 100644
+--- a/architecture/httpdlib/src/httpd/HTTPDServer.cpp
++++ b/architecture/httpdlib/src/httpd/HTTPDServer.cpp
+@@ -115,7 +115,7 @@ HTTPDServer::~HTTPDServer() { stop(); }
+ //--------------------------------------------------------------------------
+ bool HTTPDServer::start(int port)
+ {
+-      fServer = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, port, NULL, NULL, _answer_to_connection, this, MHD_OPTION_END);
++      fServer = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY, port, NULL, NULL, (MHD_AccessHandlerCallback)_answer_to_connection, this, MHD_OPTION_END);
+       return fServer != 0;
+ }
+ 
+@@ -221,7 +221,7 @@ int HTTPDServer::answer (struct MHD_Connection *connection, const char *url, con
+       }
+ 
+       Message msg (url);
+-      MHD_get_connection_values (connection, t, _get_params, &msg);
++      MHD_get_connection_values (connection, t, (MHD_KeyValueIterator)_get_params, &msg);
+       vector<Message*> outMsgs;
+       if (fDebug) {
+               cout << method << ": ";