| I needed to put back those changes to the mp3_mode location, so that’s done and fixed John’s issue. The reason why it
failed on his side is that he has less permissive flags in his compiler than we do, so it catches more potential issues.
I think we should avoid merging from csound6 as the codebases will diverge more and more, particularly if we need
to apply fixes as I had to do. The plan is as soon as John disposes of the test errors, we push that fix to csound6, and
publish 6.18.1 to solve all the issues in Linux.
I noticed the Windows build failed too, but I don’t know whether it was for the same reason. We may need to watch it.
========================
Prof. Victor Lazzarini
Maynooth University
Ireland
> On 21 Nov 2022, at 22:13, Steven Yi wrote:
>
> I needed the web changes that were merged via PR to csound6 also in
> develop so I merged. The other changes seemed fine to bring over.
> What's our practice now, are we going to no longer merge from csound6
> to develop? I'm fine with that moving forward and we can cherry pick
> commits if necessary.
>
> Looks like CI was not building on push to develop. I enabled that now
> and it built on Linux; no idea now why it would fail on John's
> computer. I'll try on my linux machine when I get home later.
>
> Sidenote: I just created a Github codespace and was able to build
> Csound in the Ubuntu VM created for the space. Pretty amazing, allows
> for dev work to happen all in the browser.
>
> On Mon, Nov 21, 2022 at 3:03 PM Victor Lazzarini wrote:
>>
>> Also the changes to csoundCore.h, csound,c, argdecode.c and libsnd.c should not have been applied here, they are fixes to csound6 because of ABI brekage, but the code in 7.x w
>> did not need to be changed.
>> ========================
>> Prof. Victor Lazzarini
>> Maynooth University
>> Ireland
>>
>>> On 21 Nov 2022, at 19:58, Victor Lazzarini wrote:
>>>
>>> I got this report from John
>>>
>>> xenakis:~/cs7> git log
>>>
>>> xenakis:~/cs7> make
>>> Scanning dependencies of target csound64
>>> [ 0%] Building C object CMakeFiles/csound64.dir/Top/csound.c.o
>>> /home/jpff/cs7/Top/csound.c:960:7: error: excess elements in struct initializer [-Werror]
>>> 0 /* mp3 mode */
>>> ^
>>> /home/jpff/cs7/Top/csound.c:960:7: note: (near initialization for ‘cenviron_.oparms_’)
>>> cc1: all warnings being treated as errors
>>> make[2]: *** [CMakeFiles/csound64.dir/build.make:100: CMakeFiles/csound64.dir/Top/csound.c.o] Error 1
>>> make[1]: *** [CMakeFiles/Makefile2:605: CMakeFiles/csound64.dir/all] Error 2
>>> make: *** [Makefile:180: all] Error 2
>>> xenakis:~/cs7>
>>>
>>> ========================
>>> Prof. Victor Lazzarini
>>> Maynooth University
>>> Ireland
>>>
>>>> On 21 Nov 2022, at 19:43, Steven Yi wrote:
>>>>
>>>> *Warning*
>>>>
>>>> This email originated from outside of Maynooth University's Mail System. Do not reply, click links or open attachments unless you recognise the sender and know the content is safe.
>>>>
>>>> How is it broken? It built on CI and builds locally here (macOS)
>>>>
>>>> On Mon, Nov 21, 2022 at 12:18 PM Victor Lazzarini
>>>> wrote:
>>>>>
>>>>> This commit has brought diverging codebases
>>>>>
>>>>> https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fcsound%2Fcsound%2Fcommit%2Fce3318f87128ee60bd6225487afc842fc14345a7&data=05%7C01%7CVictor.Lazzarini%40mu.ie%7C263ccf26b26946ea9c0f08dacc0dd063%7C1454f5ccbb354685bbd98621fd8055c9%7C0%7C0%7C638046657007894066%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=7X6ffbhahymGDlmzO52VqPAXLAtWxdsxGAVfOXwzRm4%3D&reserved=0
>>>>>
>>>>> and the develop branch is broken now.
>>>>>
>>>>> Prof. Victor Lazzarini
>>>>> Maynooth University
>>>>> Ireland
>>>
>>
|