package/mpd: bump to version 0.19.15

Drop patches applied upstream:
 - 0001: notify: Don't use constexpr on Haiku
 - 0002: notify: use "constexpr" only with glibc

Renumber remaining patches.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016.08.x
Jörg Krause 2016-05-01 19:19:49 +02:00 committed by Thomas Petazzoni
parent 8490e8333d
commit 21e6112738
6 changed files with 2 additions and 61 deletions

View File

@ -1,28 +0,0 @@
From f7d5081b727f69ae3a894a4a3310670a5d9ab077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 17 Sep 2015 22:18:10 +0200
Subject: [PATCH] notify: Don't use constexpr on Haiku
[Thomas: taken from upstream commit bf73d0f9051fd5740c22bf6e5114ceb4535d548f.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
src/notify.hxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/notify.hxx b/src/notify.hxx
index 3e62a01..1ee413f 100644
--- a/src/notify.hxx
+++ b/src/notify.hxx
@@ -28,7 +28,8 @@ struct notify {
Cond cond;
bool pending;
-#if !defined(WIN32) && !defined(__NetBSD__) && !defined(__BIONIC__)
+#if !defined(WIN32) && !defined(__NetBSD__) && !defined(__BIONIC__) && \
+ !defined(__HAIKU__)
constexpr
#endif
notify():pending(false) {}
--
2.6.4

View File

@ -1,31 +0,0 @@
From 09830d448d6299a47fbccf39af6f325be5f2b514 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 17 Sep 2015 22:56:35 +0200
Subject: [PATCH] notify: use "constexpr" only with glibc
The Mutex and Cond constructors are only "constexpr" with glibc, and
this is what this #ifdef is about.
[Thomas: taken from upstream commit 459a812a54509ebfd634a3df2998395c9cb5b98f.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
src/notify.hxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/notify.hxx b/src/notify.hxx
index 1ee413f..c96390b 100644
--- a/src/notify.hxx
+++ b/src/notify.hxx
@@ -28,8 +28,7 @@ struct notify {
Cond cond;
bool pending;
-#if !defined(WIN32) && !defined(__NetBSD__) && !defined(__BIONIC__) && \
- !defined(__HAIKU__)
+#ifdef __GLIBC__
constexpr
#endif
notify():pending(false) {}
--
2.6.4

View File

@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
sha256 2fd23805132e5002a4d24930001a7c7d3aaf55e3bd0cd71af5385895160e99e7 mpd-0.19.14.tar.xz
sha256 0cb9a223894b038ce966ce6d651d9b3ea3bdc7d7b9bec8d1e9e7e091cbc29b8b mpd-0.19.15.tar.xz

View File

@ -5,7 +5,7 @@
################################################################################
MPD_VERSION_MAJOR = 0.19
MPD_VERSION = $(MPD_VERSION_MAJOR).14
MPD_VERSION = $(MPD_VERSION_MAJOR).15
MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
MPD_DEPENDENCIES = host-pkgconf boost libglib2