mpd: bump version.

This commit is contained in:
Jerome Duval
2016-04-09 15:11:14 +00:00
parent cd85a98927
commit f5f8c909b1
2 changed files with 53 additions and 30 deletions

View File

@@ -8,7 +8,7 @@ COPYRIGHT="2003-2014 The Music Player Daemon Project"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://www.musicpd.org/download/mpd/0.19/mpd-$portVersion.tar.xz"
CHECKSUM_SHA256="7b6fe6c7ce72f5f80a276d680072b524ecb395e546e252b8f3a0756377e1e875"
CHECKSUM_SHA256="2fd23805132e5002a4d24930001a7c7d3aaf55e3bd0cd71af5385895160e99e7"
PATCHES="mpd-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"

View File

@@ -1,11 +1,11 @@
From 87bae9cd45f7b44cc403d0ac931b4f119afc670b Mon Sep 17 00:00:00 2001
From 17a0dce9a3f969168a9c9cf62839dabca02fe5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sun, 13 Jul 2014 01:29:05 +0200
Subject: configure.ac: check for socket() in libnetwork for Haiku
diff --git a/configure.ac b/configure.ac
index 107b45a..8582abf 100644
index 66621e6..a89ba23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,7 +198,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt])
@@ -18,10 +18,10 @@ index 107b45a..8582abf 100644
if test x$host_is_linux = xyes; then
--
2.2.2
2.7.0
From 87613b4eb56997a6183092c2104d95cd230c5cb8 Mon Sep 17 00:00:00 2001
From 1868f2ff06a975edc9277ae692e6f09a5c65c96e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 14 Jul 2014 23:10:02 +0200
Subject: unix: define WCOREDUMP() for platforms that don't support it
@@ -29,7 +29,7 @@ Subject: unix: define WCOREDUMP() for platforms that don't support it
Haiku does not dump core, it just starts the debugger.
diff --git a/src/unix/Daemon.cxx b/src/unix/Daemon.cxx
index d283108..1892952 100644
index 67704a9..390d035 100644
--- a/src/unix/Daemon.cxx
+++ b/src/unix/Daemon.cxx
@@ -36,6 +36,10 @@
@@ -44,10 +44,10 @@ index d283108..1892952 100644
/** the Unix user name which MPD runs as */
--
2.2.2
2.7.0
From 5d1677de5e6a39b7586ff4efa77fed97220ae245 Mon Sep 17 00:00:00 2001
From ead553675392ac0e74e5397f39da5a07b29eb5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 14 Jul 2014 23:12:03 +0200
Subject: system/SocketUtil: guard usage of SO_PASSCRED
@@ -68,10 +68,10 @@ index b9df0d5..5a88dd1 100644
(const char *) &reuse, sizeof(reuse));
#endif
--
2.2.2
2.7.0
From 3ea9c2c808a5882701dae90c5d363bb1665cc1b7 Mon Sep 17 00:00:00 2001
From e70adf6a7c1f5df8aba0219ea912af0e11edd4eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 14 Jul 2014 23:16:20 +0200
Subject: output: add native Haiku audio output and mixer support
@@ -98,10 +98,10 @@ index 307fcba..46a07d7 100644
liboutput_plugins_a_SOURCES += \
src/output/plugins/PipeOutputPlugin.cxx \
diff --git a/configure.ac b/configure.ac
index 8582abf..5d4d709 100644
index a89ba23..c5ad46a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,6 +410,11 @@ AC_ARG_ENABLE(gme,
@@ -411,6 +411,11 @@ AC_ARG_ENABLE(gme,
MPD_DEPENDS([enable_gme], [enable_glib],
[Cannot use --enable-gme with --disable-glib])
@@ -113,7 +113,7 @@ index 8582abf..5d4d709 100644
AC_ARG_ENABLE(httpd-output,
AS_HELP_STRING([--enable-httpd-output],
[enables the HTTP server output]),,
@@ -1533,6 +1538,19 @@ fi
@@ -1534,6 +1539,19 @@ fi
AM_CONDITIONAL(HAVE_FIFO, test x$enable_fifo = xyes)
@@ -133,7 +133,7 @@ index 8582abf..5d4d709 100644
dnl ------------------------------- HTTPD Output ------------------------------
if test x$enable_httpd_output = xauto; then
# handle HTTPD auto-detection: disable if no encoder is
@@ -1858,6 +1876,7 @@ printf '\nPlayback support:\n\t'
@@ -1859,6 +1877,7 @@ printf '\nPlayback support:\n\t'
results(alsa,ALSA)
results(fifo,FIFO)
results(recorder_output,[File Recorder])
@@ -754,10 +754,10 @@ index 0000000..f3f224d
+
+#endif
--
2.2.2
2.7.0
From c49e3597247f91640bb56d22077e555c2c9bbd85 Mon Sep 17 00:00:00 2001
From dc90869c1afc55f94f80517572ef5b457ececdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 31 Jul 2014 23:03:07 +0200
Subject: Haiku: add an HVIF icon
@@ -896,10 +896,10 @@ literal 0
HcmV?d00001
--
2.2.2
2.7.0
From a90a64028eece85e72ad1ca2680beda5f55c3b60 Mon Sep 17 00:00:00 2001
From 32fb3f99948ebdf4b8de1f2cdeab465b5d2cd3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 31 Jul 2014 23:09:29 +0200
Subject: Haiku: add icon as resource definition file
@@ -976,10 +976,10 @@ index 0000000..30fcfe4
+ $"2204"
+};
--
2.2.2
2.7.0
From 46537e37995399130690efad5f2ebf724753d6ee Mon Sep 17 00:00:00 2001
From e3f7626fa1b7d8306e7cf5e5d98fc75df30cc901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 31 Jul 2014 23:12:56 +0200
Subject: Haiku: add resources: application signature and flags
@@ -1001,17 +1001,17 @@ index 30fcfe4..6f1aca2 100644
resource vector_icon {
$"6E6369661F050102031604BEE29BBEC5403EC540BEE29B4A10004A10000001C6"
--
2.2.2
2.7.0
From d3a864ddb60cfd49563396792b311ae096b9a8c6 Mon Sep 17 00:00:00 2001
From f02f0f80dc12ec443b7fb34eff399c15860d6880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 1 Aug 2014 19:03:32 +0200
Subject: configure: add tests for Haiku tools (rc, xres)
diff --git a/configure.ac b/configure.ac
index 5d4d709..8f1c594 100644
index c5ad46a..42dd2a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,6 +114,10 @@ darwin*)
@@ -1026,10 +1026,10 @@ index 5d4d709..8f1c594 100644
AM_CONDITIONAL([ANDROID], [test x$host_is_android = xyes])
--
2.2.2
2.7.0
From 4725a5c191a81b26c73b8b6ce9f13378d80ad72b Mon Sep 17 00:00:00 2001
From 2d3483a476e2b60dd1405a528909dcf8f65aae48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 1 Aug 2014 19:03:54 +0200
Subject: Makefile.am: add the Haiku resources to the mpd binary
@@ -1076,10 +1076,10 @@ index 46a07d7..af31b87 100644
+ src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico \
+ src/haiku/App_MusicPD
--
2.2.2
2.7.0
From f9c177cc18e1a1c2d9905abfa7b8fdc6060d2c79 Mon Sep 17 00:00:00 2001
From ddd9c2802fa5567ff2377163312aec018d1ff850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 31 Jul 2014 23:18:06 +0200
Subject: output/haiku: use the icon for notifications
@@ -1191,10 +1191,10 @@ index fa3509f..ca4acdb 100644
}
--
2.2.2
2.7.0
From cb4f358909e5a7dc95962434d3967eaf99ccb3f0 Mon Sep 17 00:00:00 2001
From 2851852830cf4fdbe28557acd13384ec102b35cf Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 21 Dec 2015 23:28:18 +0000
Subject: output/haiku: fix use of tags.
@@ -1225,5 +1225,28 @@ index ca4acdb..5bba640 100644
notification.SetContent(full);
--
2.2.2
2.7.0
From c7292104091cc2018e01195f0a5f00a40e5effc5 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 9 Apr 2016 15:10:12 +0000
Subject: upstream patch
diff --git a/src/notify.hxx b/src/notify.hxx
index 3e62a01..c96390b 100644
--- a/src/notify.hxx
+++ b/src/notify.hxx
@@ -28,7 +28,7 @@ struct notify {
Cond cond;
bool pending;
-#if !defined(WIN32) && !defined(__NetBSD__) && !defined(__BIONIC__)
+#ifdef __GLIBC__
constexpr
#endif
notify():pending(false) {}
--
2.7.0