Index: head/audio/spiralsynthmodular/Makefile =================================================================== --- head/audio/spiralsynthmodular/Makefile (revision 476155) +++ head/audio/spiralsynthmodular/Makefile (revision 476156) @@ -1,65 +1,65 @@ # Created by: David Yeske # $FreeBSD$ PORTNAME= spiralsynthmodular PORTVERSION= 0.2.2a -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= audio MASTER_SITES= SF/spiralmodular/spiralmodular/${PORTVERSION}%20%28Latest%20Version%29 DISTNAME= spiralmodular-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Object-oriented modular softsynth/sequencer/sampler BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa \ jackd:audio/jack LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ libsndfile.so:audio/libsndfile USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ENV= FLTK_CONFIG="${FLTK_CONFIG}" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/spiralmodular-0.2.2 OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math post-patch: @${REINPLACE_CMD} -E -e 's@(-O3|-ffast-math)@@g; \ s|-Wall||; \ s|CFLAGS="-pipe|CFLAGS="\$$\{CFLAGS\}|; \ s|CXXFLAGS="-pipe|CXXFLAGS="\$$\{CXXFLAGS\}|; \ s|^SpiralSound/Plugins/MidiPlugin/Makefile||; \ s|MidiPlugin||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-I/usr/X11R6/include|-I${LOCALBASE}/include|' \ ${WRKSRC}/SpiralSound/Plugins/LADSPAPlugin/Makefile.in @${REINPLACE_CMD} -e 's|O_SYNC|O_FSYNC|' \ ${WRKSRC}/SpiralSound/Midi.C @${REINPLACE_CMD} -e 's|True|true|; s|False|false|' \ ${WRKSRC}/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C @${REINPLACE_CMD} -e 's|JackPort::||' \ ${WRKSRC}/SpiralSound/Plugins/JackPlugin/JackPlugin.h @${REINPLACE_CMD} -e 's|CVGUI::||' \ ${WRKSRC}/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.h @${REINPLACE_CMD} -e 's|Sample::||' \ ${WRKSRC}/SpiralSound/Sample.h @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's,-l(dl|rt),,; s|g\+\+|$$(CXX)|; \ /^(CC|CXX)[[:space:]]*=.+$$/d; \ s,@FLTK_(C|CXX)FLAGS@,-I${LOCALBASE}/include,; \ s,(bin|lib)dir),DESTDIR)$$(&,' @${FIND} ${WRKSRC} -type f -name "*.C" -o -name "*.cpp" -o -name "*.h" \ | ${XARGS} ${REINPLACE_CMD} -e '/^#include $$|.H>|; \ /^#include "FL/s|.h"$$|.H"|; \ s|fl_file_chooser.H|Fl_File_Chooser.H|g' post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/SpiralPlugins/*.so .include Index: head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C =================================================================== --- head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C (nonexistent) +++ head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C (revision 476156) @@ -0,0 +1,20 @@ +--- SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C.orig 2018-08-01 05:59:24 UTC ++++ SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C +@@ -502,7 +502,7 @@ inline void PoshSamplerPluginGUI::cb_Load_i(Fl_Button* + { + char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + strcpy(m_TextBuf,fn); + m_GUICH->SetData("Name",m_TextBuf); +@@ -523,7 +523,7 @@ inline void PoshSamplerPluginGUI::cb_Save_i(Fl_Button* + { + char *fn=fl_file_chooser("Save sample", "{*.wav,*.WAV}", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + strcpy(m_TextBuf,fn); + m_GUICH->Set("Name",m_TextBuf); Property changes on: head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C =================================================================== --- head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C (nonexistent) +++ head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C (revision 476156) @@ -0,0 +1,20 @@ +--- SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C.orig 2018-08-01 06:00:29 UTC ++++ SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C +@@ -350,7 +350,7 @@ inline void SpiralLoopPluginGUI::cb_Load_i(Fl_Button* + { + char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + strcpy(m_TextBuf,fn); + m_GUICH->SetData("Name",m_TextBuf); +@@ -368,7 +368,7 @@ inline void SpiralLoopPluginGUI::cb_Save_i(Fl_Button* + { + char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + strcpy(m_TextBuf,fn); + m_GUICH->SetData("Name",m_TextBuf); Property changes on: head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C =================================================================== --- head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C (nonexistent) +++ head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C (revision 476156) @@ -0,0 +1,11 @@ +--- SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C.orig 2018-08-01 06:01:08 UTC ++++ SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C +@@ -220,7 +220,7 @@ void StreamPluginGUI::cb_Pos (Fl_Slider* o, void* v) { + + inline void StreamPluginGUI::cb_Load_i (Fl_Button* o, void* v) { + char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL); +- if (fn && fn!='\0') { ++ if (fn && *fn!='\0') { + strcpy (m_TextBuf, fn); + m_GUICH->SetData ("FileName", (void*)m_TextBuf); + m_GUICH->SetCommand (StreamPlugin::LOAD); Property changes on: head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/spiralsynthmodular/files/patch-SpiralSynthModular.C =================================================================== --- head/audio/spiralsynthmodular/files/patch-SpiralSynthModular.C (nonexistent) +++ head/audio/spiralsynthmodular/files/patch-SpiralSynthModular.C (revision 476156) @@ -0,0 +1,24 @@ +SpiralSynthModular.C:1016:14: error: comparison between pointer and integer ('char *' and 'int') + if (fn && fn!='\0') + ~~^ ~~~~ + +--- SpiralSynthModular.C.orig 2018-08-01 05:55:58 UTC ++++ SpiralSynthModular.C +@@ -1013,7 +1013,7 @@ inline void SynthModular::cb_Load_i(Fl_Button* o, void + + char *fn=fl_file_chooser("Load a patch", "*.ssm", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + ifstream inf(fn); + +@@ -1039,7 +1039,7 @@ inline void SynthModular::cb_Save_i(Fl_Button* o, void + { + char *fn=fl_file_chooser("Save a patch", "*.ssm", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + ifstream ifl(fn); + if (ifl) Property changes on: head/audio/spiralsynthmodular/files/patch-SpiralSynthModular.C ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property