On Tue, Mar 19 2019, Charlene Wendling <[email protected]> wrote:
> (i've snipped many things)
[...]
>> > patches/patch-src_qsynthChannelsForm_cpp
>> > ===================================================================
>> > RCS file: patches/patch-src_qsynthChannelsForm_cpp diff -N
>> > patches/patch-src_qsynthChannelsForm_cpp
>> > --- /dev/null 1 Jan 1970 00:00:00 -0000
>> > +++ patches/patch-src_qsynthChannelsForm_cpp 18 Mar 2019
>> > 22:58:05 -0000 @@ -0,0 +1,33 @@
>> > +$OpenBSD$
>> > +
>> > +Index: src/qsynthChannelsForm.cpp
>> > +--- src/qsynthChannelsForm.cpp.orig
>> > ++++ src/qsynthChannelsForm.cpp
>> > +@@ -256,11 +256,11 @@ void qsynthChannelsForm::updateChannel ( int
>> > iChan )
>> > + #ifdef CONFIG_FLUID_BANK_OFFSET
>> > + int iSFID = 0;
>> > + QString sSFName;
>> > +- #ifdef CONFIG_FLUID_PRESET_GET_SFONT
>> > ++ #ifdef CONFIG_FLUID_PRESET_GET_SFONT
>> > + fluid_sfont_t *pSoundFont
>> > = ::fluid_preset_get_sfont(pPreset); +- #else
>> > ++ #else
>> > + fluid_sfont_t *pSoundFont = pPreset->sfont;
>> > +- #endif
>> > ++ #endif
>> > + if (pSoundFont) {
>> > + #ifdef CONFIG_FLUID_SFONT_GET_ID
>> > + iSFID = ::fluid_sfont_get_id(pSoundFont);
>>
>> Is that hunk really needed?
>
> This is the only thing my diff doesn't address.
As far as I can see, this hunk only adds a TAB to three lines and
shouldn't affect semantics. I'd suggest to leave those lines alone.
>> > +@@ -290,10 +290,12 @@ void qsynthChannelsForm::updateChannel ( int
>> > iChan )
>> > + pItem->setText(QSYNTH_CHANNELS_PROG,
>> > + QString::number(iProg));
>> > + pItem->setText(QSYNTH_CHANNELS_NAME, sName);
>> > ++ #ifdef CONFIG_FLUID_BANK_OFFSET
>> > + pItem->setText(QSYNTH_CHANNELS_SFID,
>> > + QString::number(iSFID));
>> > + pItem->setText(QSYNTH_CHANNELS_SFNAME,
>> > + QFileInfo(sSFName).baseName());
>> > ++ #endif
>> > + // Make this a dirty-operation.
>> > + m_iDirtyCount++;
>> > + }
>> > Index: patches/patch-src_qsynthMainForm_cpp
>> > ===================================================================
>> > RCS file: patches/patch-src_qsynthMainForm_cpp
>> > diff -N patches/patch-src_qsynthMainForm_cpp
>> > --- /dev/null 1 Jan 1970 00:00:00 -0000
>> > +++ patches/patch-src_qsynthMainForm_cpp 18 Mar 2019
>> > 22:58:05 -0000 @@ -0,0 +1,18 @@
>> > +$OpenBSD$
>> > +
>> > +ports-gcc fix. lroundf() is not detected during configuration, so
>> > CONFIG_ROUND +is undefined.
>>
>> cwen:
>>
>> Could you please check why lroundf isn't detected?
>>
>> > But <cmath> is pulled by Qt headers already, creating a conflict
>> > +between <cmath>'s lroundf() and the bundled lroundf().
>>
>> If this source file falls back on the bundled lroundf, then maybe the
>> fallback path doesn't need to include math.h/cmath at all? ofc I
>> would prefer qsynth to just use "our" lroundf.
>>
>
> Once s/LDDFLAGS/LDFLAGS has been made, that patch wasn't necessary
> anymore, lroundf() is detected.
Hah, nice. Thanks, ok jca@
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
