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

2015-10-25 Thread 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 th

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

2015-10-25 Thread 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

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

2015-10-24 Thread 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 saf

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

2015-10-15 Thread 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?

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

2015-10-15 Thread 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 co

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

2015-10-15 Thread 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

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

2015-10-15 Thread 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.2

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

2015-10-14 Thread 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/

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

2015-10-14 Thread 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 in

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

2015-10-14 Thread 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

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

2015-10-14 Thread 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'l

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

2015-10-14 Thread 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 relea

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

2015-10-14 Thread 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.1