Date: Fri, 26 Feb 2016 02:40:00 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409574 - head/audio/dream/files Message-ID: <201602260240.u1Q2e0Gu082879@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Fri Feb 26 02:40:00 2016 New Revision: 409574 URL: https://svnweb.freebsd.org/changeset/ports/409574 Log: - Fix build on 10.x Added: head/audio/dream/files/patch-src_GUI-QT_LiveScheduleDlg.h (contents, props changed) head/audio/dream/files/patch-src_matlib_MatlibStdToolbox.cpp (contents, props changed) Added: head/audio/dream/files/patch-src_GUI-QT_LiveScheduleDlg.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/dream/files/patch-src_GUI-QT_LiveScheduleDlg.h Fri Feb 26 02:40:00 2016 (r409574) @@ -0,0 +1,11 @@ +--- src/GUI-QT/LiveScheduleDlg.h.orig 2013-11-11 16:33:43 UTC ++++ src/GUI-QT/LiveScheduleDlg.h +@@ -26,7 +26,7 @@ + \******************************************************************************/ + + #ifndef __LiveScheduleDlg_H +-#define LiveScheduleDlg_H ++#define __LiveScheduleDlg_H + + #include "ui_LiveScheduleWindow.h" + #include "CWindow.h" Added: head/audio/dream/files/patch-src_matlib_MatlibStdToolbox.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/dream/files/patch-src_matlib_MatlibStdToolbox.cpp Fri Feb 26 02:40:00 2016 (r409574) @@ -0,0 +1,29 @@ +--- src/matlib/MatlibStdToolbox.cpp.orig 2016-02-26 02:12:16 UTC ++++ src/matlib/MatlibStdToolbox.cpp +@@ -28,11 +28,11 @@ + #include "MatlibStdToolbox.h" + #include "../GlobalDefinitions.h" + +-/* The mutex need to be application wide, ++/* The dream_mutex need to be application wide, + only the execution routines are thread-safe */ +-static CMutex* mutex = NULL; +-#define MUTEX_LOCK() mutex->Lock() +-#define MUTEX_UNLOCK() mutex->Unlock() ++static CMutex* dream_mutex = NULL; ++#define MUTEX_LOCK() dream_mutex->Lock() ++#define MUTEX_UNLOCK() dream_mutex->Unlock() + + # define PLANNER_FLAGS (FFTW_ESTIMATE | FFTW_DESTROY_INPUT) + /* Warning: for testing purpose only */ +@@ -669,8 +669,8 @@ CFftPlans::CFftPlans(const int iFftSize) + bInitialized(FALSE), bFixedSizeInit(FALSE), fftw_n(0) + { + /* Static initialization of CMutex not working on Mac OS X */ +- if (!mutex) +- mutex = new CMutex(); ++ if (!dream_mutex) ++ dream_mutex = new CMutex(); + + /* If iFftSize is non zero then proceed to initialization */ + if (iFftSize)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602260240.u1Q2e0Gu082879>