Nested volatile can not be initialised in constexpr, so don't use it for

mutex and condvar.

4 files changed, 44 insertions, 1 deletions

diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index 5bc4c74e857..bc7690b6c48 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.44 2014/09/07 20:23:20 wiz Exp $
+$NetBSD: distinfo,v 1.45 2014/09/10 12:10:23 joerg Exp $
 
 SHA1 (mpd-0.18.13.tar.xz) = 0ddf8c55228fcc67522ecdd7710f93dc146c99a7
 RMD160 (mpd-0.18.13.tar.xz) = 80a1357d6a5dd9d34124f6b5ebc110b89b56fc2f
 Size (mpd-0.18.13.tar.xz) = 585836 bytes
+SHA1 (patch-src_notify.hxx) = 714308857ecf353b42e8766d35c473a9d7fc9d8e
 SHA1 (patch-src_output_HttpdOutputPlugin.cxx) = 6e046d00a4e59c905d8fe014afe854aac1337e8d
+SHA1 (patch-src_thread_PosixCond.hxx) = ed3cbc512c6209c7fa98cc6e95c7c7dd8b52d1f9
+SHA1 (patch-src_thread_PosixMutex.hxx) = c3215fb672e567cd11cc548bcb513519b120a52e
diff --git a/audio/musicpd/patches/patch-src_notify.hxx b/audio/musicpd/patches/patch-src_notify.hxx
new file mode 100644
index 00000000000..50abc27e992
--- /dev/null
+++ b/audio/musicpd/patches/patch-src_notify.hxx
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_notify.hxx,v 1.1 2014/09/10 12:10:23 joerg Exp $
+
+--- src/notify.hxx.orig	2014-09-09 20:11:34.000000000 +0000
++++ src/notify.hxx
+@@ -28,9 +28,6 @@ struct notify {
+ 	Cond cond;
+ 	bool pending;
+ 
+-#ifndef WIN32
+-	constexpr
+-#endif
+ 	notify():pending(false) {}
+ 
+ 	/**
diff --git a/audio/musicpd/patches/patch-src_thread_PosixCond.hxx b/audio/musicpd/patches/patch-src_thread_PosixCond.hxx
new file mode 100644
index 00000000000..18a7683282d
--- /dev/null
+++ b/audio/musicpd/patches/patch-src_thread_PosixCond.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_thread_PosixCond.hxx,v 1.1 2014/09/10 12:10:23 joerg Exp $
+
+--- src/thread/PosixCond.hxx.orig	2014-09-09 20:08:12.000000000 +0000
++++ src/thread/PosixCond.hxx
+@@ -41,7 +41,7 @@ class PosixCond {
+ 	pthread_cond_t cond;
+ 
+ public:
+-	constexpr PosixCond():cond(PTHREAD_COND_INITIALIZER) {}
++	PosixCond():cond(PTHREAD_COND_INITIALIZER) {}
+ 
+ 	PosixCond(const PosixCond &other) = delete;
+ 	PosixCond &operator=(const PosixCond &other) = delete;
diff --git a/audio/musicpd/patches/patch-src_thread_PosixMutex.hxx b/audio/musicpd/patches/patch-src_thread_PosixMutex.hxx
new file mode 100644
index 00000000000..63634d3b455
--- /dev/null
+++ b/audio/musicpd/patches/patch-src_thread_PosixMutex.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_thread_PosixMutex.hxx,v 1.1 2014/09/10 12:10:23 joerg Exp $
+
+--- src/thread/PosixMutex.hxx.orig	2014-09-09 20:07:45.000000000 +0000
++++ src/thread/PosixMutex.hxx
+@@ -41,7 +41,7 @@ class PosixMutex {
+ 	pthread_mutex_t mutex;
+ 
+ public:
+-	constexpr PosixMutex():mutex(PTHREAD_MUTEX_INITIALIZER) {}
++	PosixMutex():mutex(PTHREAD_MUTEX_INITIALIZER) {}
+ 
+ 	PosixMutex(const PosixMutex &other) = delete;
+ 	PosixMutex &operator=(const PosixMutex &other) = delete;