Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Owen Williams]

thank you!  this is a big help.

On Sun, 2015-10-25 at 20:52 +0100, Daniel Schürmann wrote:
> Master is again head up with 1.12
> 
> Am 25.10.2015 um 03:45 schrieb Owen Williams:
> > I really don't know enough about the recent changes to do this merge
> > right, can someone please step in and do this?  
> >
> > owen
> >
> > On Thu, 2015-10-15 at 07:48 +0200, Uwe Klotz wrote:
> >> Daniel has already migrated his changes for Windows (UTF-16/wchar_t) from 
> >> 1.12 to master separately. It should be safe if we just choose the 
> >> SoundSource and TagLib files from master in case of conflicts.
> >>
> >> On 10/15/2015 02:05 AM, Owen Williams wrote:
> >>> Can someone carefully do a merge from 1.12 into trunk?  There are a
> >>> bunch of conflicts with the soundsource files.
> >>>
> >>> We have to be very careful making changes to soundsource files because
> >>> there has been so much divergence since the backend change.  Until the
> >>> release we need to keep incorporating 1.12 bugfixes into master.
> >>>
> >>> (Speaking of the release, we're just waiting on the shoutcast fix and
> >>> then we'll do it.  It sounds like there's a freeze on shutdown we need
> >>> to fix, but otherwise it's mostly good)
> >>>
> >>>
> >>> --
> >>> ___
> >>> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> >>> http://mixxx.org
> >>>
> >>>
> >>> Mixxx-devel mailing list
> >>> Mixxx-devel@lists.sourceforge.net
> >>> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> >>>
> >>
> >> --
> >> ___
> >> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> >> http://mixxx.org
> >>
> >>
> >> Mixxx-devel mailing list
> >> Mixxx-devel@lists.sourceforge.net
> >> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> >>
> >>
> >
> >
> > --
> > ___
> > Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> > http://mixxx.org
> >
> >
> > Mixxx-devel mailing list
> > Mixxx-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> 
> 
> --
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
> 
> 
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> 
> 



--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Daniel Schürmann]

Master is again head up with 1.12

Am 25.10.2015 um 03:45 schrieb Owen Williams:
> I really don't know enough about the recent changes to do this merge
> right, can someone please step in and do this?  
>
> owen
>
> On Thu, 2015-10-15 at 07:48 +0200, Uwe Klotz wrote:
>> Daniel has already migrated his changes for Windows (UTF-16/wchar_t) from 
>> 1.12 to master separately. It should be safe if we just choose the 
>> SoundSource and TagLib files from master in case of conflicts.
>>
>> On 10/15/2015 02:05 AM, Owen Williams wrote:
>>> Can someone carefully do a merge from 1.12 into trunk?  There are a
>>> bunch of conflicts with the soundsource files.
>>>
>>> We have to be very careful making changes to soundsource files because
>>> there has been so much divergence since the backend change.  Until the
>>> release we need to keep incorporating 1.12 bugfixes into master.
>>>
>>> (Speaking of the release, we're just waiting on the shoutcast fix and
>>> then we'll do it.  It sounds like there's a freeze on shutdown we need
>>> to fix, but otherwise it's mostly good)
>>>
>>>
>>> --
>>> ___
>>> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
>>> http://mixxx.org
>>>
>>>
>>> Mixxx-devel mailing list
>>> Mixxx-devel@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>>>
>>
>> --
>> ___
>> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
>> http://mixxx.org
>>
>>
>> Mixxx-devel mailing list
>> Mixxx-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>>
>>
>
>
> --
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
>
>
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel


--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Owen Williams]

I really don't know enough about the recent changes to do this merge
right, can someone please step in and do this?  

owen

On Thu, 2015-10-15 at 07:48 +0200, Uwe Klotz wrote:
> Daniel has already migrated his changes for Windows (UTF-16/wchar_t) from 
> 1.12 to master separately. It should be safe if we just choose the 
> SoundSource and TagLib files from master in case of conflicts.
> 
> On 10/15/2015 02:05 AM, Owen Williams wrote:
> > Can someone carefully do a merge from 1.12 into trunk?  There are a
> > bunch of conflicts with the soundsource files.
> >
> > We have to be very careful making changes to soundsource files because
> > there has been so much divergence since the backend change.  Until the
> > release we need to keep incorporating 1.12 bugfixes into master.
> >
> > (Speaking of the release, we're just waiting on the shoutcast fix and
> > then we'll do it.  It sounds like there's a freeze on shutdown we need
> > to fix, but otherwise it's mostly good)
> >
> >
> > --
> > ___
> > Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> > http://mixxx.org
> >
> >
> > Mixxx-devel mailing list
> > Mixxx-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> >
> 
> 
> --
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
> 
> 
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> 
> 



--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Sébastien Blaisot]

Le 15/10/2015 08:42, Daniel Schürmann a écrit :
> Unfortunately I have no access to the build server (network timeout)
> Since there are no recent windows builds builds on
> http://downloads.mixxx.org/builds/1.12/
> I assume there is still an issue. Can one forward me the failing build
> message?

from 
http://builds.mixxx.org:8081/jenkins/job/1.12-release/architecture=amd64,platform=windows/129/console

soundsourcemediafoundation.cpp
c:\mixxx\environments\2.0-x64-release\include\taglib\trefcounter.h(36) : 
warning C4005: 'NOMINMAX' : macro redefinition
  command-line arguments :  see previous definition of 'NOMINMAX'
plugins\soundsourcemediafoundation\soundsourcemediafoundation.cpp(66) : 
error C2614: 'SoundSourceMediaFoundation' : illegal member 
initialization: 'm_wcFilename' is not a base or member
plugins\soundsourcemediafoundation\soundsourcemediafoundation.cpp(75) : 
error C2065: 'm_wcFilename' : undeclared identifier
plugins\soundsourcemediafoundation\soundsourcemediafoundation.cpp(80) : 
error C2065: 'm_wcFilename' : undeclared identifier
plugins\soundsourcemediafoundation\soundsourcemediafoundation.cpp(80) : 
error C2541: 'delete' : cannot delete objects that are not pointers
scons: *** 
[win64_build\plugins\win64_build\mediafoundation\soundsourcemediafoundation.obj]
 
Error 2
scons: building terminated because of errors.

-- 
Sébastien
圣巴斯弟盎



--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Owen Williams]

Windows build failure:
Ilib\fidlib-0.9.10 /IC:\usr\include\taglib /Ilib\hidapi-0.8.0-pre
\hidapi /Ilib\xwax /Ilib\scratchlib /Ilib\vamp-2.3
soundsourcemediafoundation.cpp
c:\mixxx\environments\2.0-x64-debug\include\taglib\trefcounter.h(36) :
warning C4005: 'NOMINMAX' : macro redefinition
command-line arguments :  see previous definition of 'NOMINMAX'
plugins\soundsourcemediafoundation\soundsourcemediafoundation.cpp(66) :
error C2614: 'SoundSourceMediaFoundation' : illegal member
initialization: 'm_wcFilename' is not a base or member
plugins\soundsourcemediafoundation\soundsourcemediafoundation.cpp(75) :
error C2065: 'm_wcFilename' : undeclared identifier
plugins\soundsourcemediafoundation\soundsourcemediafoundation.cpp(80) :
error C2065: 'm_wcFilename' : undeclared identifier
plugins\soundsourcemediafoundation\soundsourcemediafoundation.cpp(80) :
error C2541: 'delete' : cannot delete objects that are not pointers
scons: *** [win64_build\plugins\win64_build\mediafoundation
\soundsourcemediafoundation.obj] Error 2
scons: building terminated because of errors.
Build step 'Execute Windows batch command' marked build as failure

http://builds.mixxx.org:8081/jenkins/job/1.12-debug/architecture=amd64,platform=windows/15/console


On Thu, 2015-10-15 at 08:42 +0200, Daniel Schürmann wrote:
> My latest commit, trying to fix the wchat_t windows issue is on 1.12
> branch only. 
> 
> 
> I will merge the 1.12 to master once 1.12 builds on windows. 
> 
> Unfortunately I have no access to the build server (network timeout) 
> 
> Since there are no recent windows builds builds on
> http://downloads.mixxx.org/builds/1.12/
> 
> I assume there is still an issue. Can one forward me the failing build
> message? 
> 
> 
> There also a major Taglib issue pending. Version 1.10 will be released
> in a couple of days until then we can use Taglib head of master
> 
> Who is able to update Taglib to current master. Who is able to add
> Taglib 1.10 to the Mixxx ppa? 
> 
> What is to do for Mac? 
> 
> 
> Details: 
> https://github.com/taglib/taglib/issues/635
> 
>  
> 
> 
> 
> 
> 2015-10-15 7:48 GMT+02:00 Uwe Klotz :
> Daniel has already migrated his changes for Windows
> (UTF-16/wchar_t) from
> 1.12 to master separately. It should be safe if we just choose
> the
> SoundSource and TagLib files from master in case of conflicts.
> 
> On 10/15/2015 02:05 AM, Owen Williams wrote:
> > Can someone carefully do a merge from 1.12 into trunk?
> There are a
> > bunch of conflicts with the soundsource files.
> >
> > We have to be very careful making changes to soundsource
> files because
> > there has been so much divergence since the backend change.
> Until the
> > release we need to keep incorporating 1.12 bugfixes into
> master.
> >
> > (Speaking of the release, we're just waiting on the
> shoutcast fix and
> > then we'll do it.  It sounds like there's a freeze on
> shutdown we need
> > to fix, but otherwise it's mostly good)
> >
> >
> >
> 
> --
> > ___
> > Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> > http://mixxx.org
> >
> >
> > Mixxx-devel mailing list
> > Mixxx-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> >
> 
> 
> 
> --
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
> 
> 
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> 
> 
> 
> --
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
> 
> 
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel



--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Owen Williams]

The build server was having network problems so I bought a new network
card.  I've started a new build, we'll see if it works.

On Thu, 2015-10-15 at 08:42 +0200, Daniel Schürmann wrote:
> My latest commit, trying to fix the wchat_t windows issue is on 1.12
> branch only. 
> 
> 
> I will merge the 1.12 to master once 1.12 builds on windows. 
> 
> Unfortunately I have no access to the build server (network timeout) 
> 
> Since there are no recent windows builds builds on
> http://downloads.mixxx.org/builds/1.12/
> 
> I assume there is still an issue. Can one forward me the failing build
> message? 
> 
> 
> There also a major Taglib issue pending. Version 1.10 will be released
> in a couple of days until then we can use Taglib head of master
> 
> Who is able to update Taglib to current master. Who is able to add
> Taglib 1.10 to the Mixxx ppa? 
> 
> What is to do for Mac? 
> 
> 
> Details: 
> https://github.com/taglib/taglib/issues/635
> 
>  
> 
> 
> 
> 
> 2015-10-15 7:48 GMT+02:00 Uwe Klotz :
> Daniel has already migrated his changes for Windows
> (UTF-16/wchar_t) from
> 1.12 to master separately. It should be safe if we just choose
> the
> SoundSource and TagLib files from master in case of conflicts.
> 
> On 10/15/2015 02:05 AM, Owen Williams wrote:
> > Can someone carefully do a merge from 1.12 into trunk?
> There are a
> > bunch of conflicts with the soundsource files.
> >
> > We have to be very careful making changes to soundsource
> files because
> > there has been so much divergence since the backend change.
> Until the
> > release we need to keep incorporating 1.12 bugfixes into
> master.
> >
> > (Speaking of the release, we're just waiting on the
> shoutcast fix and
> > then we'll do it.  It sounds like there's a freeze on
> shutdown we need
> > to fix, but otherwise it's mostly good)
> >
> >
> >
> 
> --
> > ___
> > Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> > http://mixxx.org
> >
> >
> > Mixxx-devel mailing list
> > Mixxx-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> >
> 
> 
> 
> --
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
> 
> 
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> 
> 
> 
> --
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
> 
> 
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel



--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Thorsten Munsch]

Hi all,

I've done a lot of sessions with the current 1.12 branch. Just want to 
mention that the stability is impressive. I haven't found any bugs yet. :)

If I can help with testing for the further 1.12 release, let me know.

On the weekend I will watch for some (easy) bugs to solve.


Am 15.10.2015 um 08:42 schrieb Daniel Schürmann:
> My latest commit, trying to fix the wchat_t windows issue is on 1.12
> branch only.
>
> I will merge the 1.12 to master once 1.12 builds on windows.
>
> Unfortunately I have no access to the build server (network timeout)
> Since there are no recent windows builds builds on
> http://downloads.mixxx.org/builds/1.12/
> I assume there is still an issue. Can one forward me the failing build
> message?
>
> There also a major Taglib issue pending. Version 1.10 will be released
> in a couple of days until then we can use Taglib head of master
> Who is able to update Taglib to current master. Who is able to add
> Taglib 1.10 to the Mixxx ppa?
> What is to do for Mac?
>
> Details:
> https://github.com/taglib/taglib/issues/635
>
>
>
> 2015-10-15 7:48 GMT+02:00 Uwe Klotz  >:
>
> Daniel has already migrated his changes for Windows (UTF-16/wchar_t)
> from
> 1.12 to master separately. It should be safe if we just choose the
> SoundSource and TagLib files from master in case of conflicts.
>
> On 10/15/2015 02:05 AM, Owen Williams wrote:
>  > Can someone carefully do a merge from 1.12 into trunk?  There are a
>  > bunch of conflicts with the soundsource files.
>  >
>  > We have to be very careful making changes to soundsource files
> because
>  > there has been so much divergence since the backend change.
> Until the
>  > release we need to keep incorporating 1.12 bugfixes into master.
>  >
>  > (Speaking of the release, we're just waiting on the shoutcast fix and
>  > then we'll do it.  It sounds like there's a freeze on shutdown we
> need
>  > to fix, but otherwise it's mostly good)
>  >
>  >
>  >
> 
> --
>  > ___
>  > Get Mixxx, the #1 Free MP3 DJ Mixing software Today
>  > http://mixxx.org
>  >
>  >
>  > Mixxx-devel mailing list
>  > Mixxx-devel@lists.sourceforge.net
> 
>  > https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>  >
>
>
> 
> --
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
>
>
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> 
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>
>
>
>
> --
>
>
>
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
>
>
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>

--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Daniel Schürmann]

My latest commit, trying to fix the wchat_t windows issue is on 1.12 branch
only.

I will merge the 1.12 to master once 1.12 builds on windows.

Unfortunately I have no access to the build server (network timeout)
Since there are no recent windows builds builds on
http://downloads.mixxx.org/builds/1.12/
I assume there is still an issue. Can one forward me the failing build
message?

There also a major Taglib issue pending. Version 1.10 will be released in a
couple of days until then we can use Taglib head of master
Who is able to update Taglib to current master. Who is able to add Taglib
1.10 to the Mixxx ppa?
What is to do for Mac?

Details:
https://github.com/taglib/taglib/issues/635



2015-10-15 7:48 GMT+02:00 Uwe Klotz :

> Daniel has already migrated his changes for Windows (UTF-16/wchar_t) from
> 1.12 to master separately. It should be safe if we just choose the
> SoundSource and TagLib files from master in case of conflicts.
>
> On 10/15/2015 02:05 AM, Owen Williams wrote:
> > Can someone carefully do a merge from 1.12 into trunk?  There are a
> > bunch of conflicts with the soundsource files.
> >
> > We have to be very careful making changes to soundsource files because
> > there has been so much divergence since the backend change.  Until the
> > release we need to keep incorporating 1.12 bugfixes into master.
> >
> > (Speaking of the release, we're just waiting on the shoutcast fix and
> > then we'll do it.  It sounds like there's a freeze on shutdown we need
> > to fix, but otherwise it's mostly good)
> >
> >
> >
> --
> > ___
> > Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> > http://mixxx.org
> >
> >
> > Mixxx-devel mailing list
> > Mixxx-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/mixxx-devel
> >
>
>
>
> --
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
>
>
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>
--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Uwe Klotz]

Daniel has already migrated his changes for Windows (UTF-16/wchar_t) from 
1.12 to master separately. It should be safe if we just choose the 
SoundSource and TagLib files from master in case of conflicts.

On 10/15/2015 02:05 AM, Owen Williams wrote:
> Can someone carefully do a merge from 1.12 into trunk?  There are a
> bunch of conflicts with the soundsource files.
>
> We have to be very careful making changes to soundsource files because
> there has been so much divergence since the backend change.  Until the
> release we need to keep incorporating 1.12 bugfixes into master.
>
> (Speaking of the release, we're just waiting on the shoutcast fix and
> then we'll do it.  It sounds like there's a freeze on shutdown we need
> to fix, but otherwise it's mostly good)
>
>
> --
> ___
> Get Mixxx, the #1 Free MP3 DJ Mixing software Today
> http://mixxx.org
>
>
> Mixxx-devel mailing list
> Mixxx-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mixxx-devel
>


--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Sean M. Pappalardo - D.J. Pegasus]

On 10/14/2015 05:52 PM, Owen Williams wrote:

In general I don't think we'll be doing maintenance releases.


There's always a maintenance window for the current stable release. We 
can only change its length.


If the time between 1.12.0 and 1.13.0 is short (like a month or less,) 
then you're probably right, but we need to at least cursorily plan for 
the case that 1.13 is delayed.


Sincerely,
Sean M. Pappalardo
"D.J. Pegasus"
Mixxx Developer - Controller Specialist



smime.p7s
Description: S/MIME Cryptographic Signature
--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Owen Williams]

On Wed, 2015-10-14 at 17:13 -0700, Sean M. Pappalardo - D.J. Pegasus
wrote:
> 
> On 10/14/2015 05:05 PM, Owen Williams wrote:
> > Until the
> > release we need to keep incorporating 1.12 bugfixes into master.
> 
> Uh, we need to keep doing that until 1.13 is released.

In general I don't think we'll be doing maintenance releases.  If there
are showstopper bugs that affect both branches, we can do individual
cherrypicks of 1.13 back to 1.12.  But my intent is, after we release
1.12, to immediately branch trunk for alpha of the next release.

> 
> > (Speaking of the release, we're just waiting on the shoutcast fix and
> > then we'll do it.
> 
> How important to the release is getting my build server in production? I 
> expect we'll need to keep the existing one around as long as 1.12 is 
> supported so as not to change anything about the build environment 
> during the support cycle.

We have a build server that produces correct builds, so for this release
the new build server is not critical.  But I'd like to move to the new
server for the next release.

> 
> My preference would be to move to the new build server now, do a Release 
> Candidate to verify nothing broke as a result of the build env change, 
> then release from there so we can retire the old build server sooner.

I don't see a reason to throw that particular monkey wrench into the
mix.  For the current release let's stick with what we've got.  However
I would be in favor of getting master builds set up on the new server
right away.  We can even have the new server make 1.12 builds, but for
now the current server will remain canonical.

> 
> The only limitations are my availability to finalize the build envs and 
> what to do about the OSX VM. I have more time now than I did before, so 
> I figure I can get the Windows and Ubuntu builders going within the next 
> couple weeks.

I see no reason to hesitate :).  Two envs is better than none.

owen


--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

Re: [Mixxx-devel] 1.12 -> trunk merge needs help

[Sean M. Pappalardo - D.J. Pegasus]

On 10/14/2015 05:05 PM, Owen Williams wrote:

Until the
release we need to keep incorporating 1.12 bugfixes into master.


Uh, we need to keep doing that until 1.13 is released.


(Speaking of the release, we're just waiting on the shoutcast fix and
then we'll do it.


How important to the release is getting my build server in production? I 
expect we'll need to keep the existing one around as long as 1.12 is 
supported so as not to change anything about the build environment 
during the support cycle.


My preference would be to move to the new build server now, do a Release 
Candidate to verify nothing broke as a result of the build env change, 
then release from there so we can retire the old build server sooner.


The only limitations are my availability to finalize the build envs and 
what to do about the OSX VM. I have more time now than I did before, so 
I figure I can get the Windows and Ubuntu builders going within the next 
couple weeks.


Sincerely,
Sean M. Pappalardo
"D.J. Pegasus"
Mixxx Developer - Controller Specialist



smime.p7s
Description: S/MIME Cryptographic Signature
--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel

[Mixxx-devel] 1.12 -> trunk merge needs help

[Owen Williams]

Can someone carefully do a merge from 1.12 into trunk?  There are a
bunch of conflicts with the soundsource files.

We have to be very careful making changes to soundsource files because
there has been so much divergence since the backend change.  Until the
release we need to keep incorporating 1.12 bugfixes into master.

(Speaking of the release, we're just waiting on the shoutcast fix and
then we'll do it.  It sounds like there's a freeze on shutdown we need
to fix, but otherwise it's mostly good)


--
___
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org


Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel