From owner-svn-ports-head@freebsd.org Fri Feb 26 02:40:01 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC6A7AB474F; Fri, 26 Feb 2016 02:40:01 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A30A61C62; Fri, 26 Feb 2016 02:40:01 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1Q2e0Bw082881; Fri, 26 Feb 2016 02:40:00 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1Q2e0Gu082879; Fri, 26 Feb 2016 02:40:00 GMT (envelope-from db@FreeBSD.org) Message-Id: <201602260240.u1Q2e0Gu082879@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Fri, 26 Feb 2016 02:40:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409574 - head/audio/dream/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Feb 2016 02:40:02 -0000 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)