diff --git a/media-sound/mpd/mpd-0.19.14.recipe b/media-sound/mpd/mpd-0.19.17.recipe similarity index 94% rename from media-sound/mpd/mpd-0.19.14.recipe rename to media-sound/mpd/mpd-0.19.17.recipe index 7a275fb3c..b877f7bed 100644 --- a/media-sound/mpd/mpd-0.19.14.recipe +++ b/media-sound/mpd/mpd-0.19.17.recipe @@ -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="2fd23805132e5002a4d24930001a7c7d3aaf55e3bd0cd71af5385895160e99e7" +CHECKSUM_SHA256="487ec8ad2b1c1c193c2a7c8975a8b8fe2e4f0335bcc2e9356b2b34a0179fb2f7" PATCHES="mpd-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -24,7 +24,7 @@ REQUIRES=" lib:libmpdclient$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix >= 0.38 lib:libicui18n$secondaryArchSuffix - lib:libao$secondaryArchSuffix >= 1.1.0 + lib:libao$secondaryArchSuffix >= 4 lib:libavcodec$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libcurl$secondaryArchSuffix @@ -53,7 +53,7 @@ BUILD_REQUIRES=" devel:libmpdclient$secondaryArchSuffix devel:libicui18n$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix >= 0.38 - devel:libao$secondaryArchSuffix >= 1.1.0 + devel:libao$secondaryArchSuffix >= 4 devel:libavcodec$secondaryArchSuffix devel:libbz2$secondaryArchSuffix devel:libcurl$secondaryArchSuffix diff --git a/media-sound/mpd/patches/mpd-0.19.14.patchset b/media-sound/mpd/patches/mpd-0.19.17.patchset similarity index 95% rename from media-sound/mpd/patches/mpd-0.19.14.patchset rename to media-sound/mpd/patches/mpd-0.19.17.patchset index 5d72886ee..ddf8e919e 100644 --- a/media-sound/mpd/patches/mpd-0.19.14.patchset +++ b/media-sound/mpd/patches/mpd-0.19.17.patchset @@ -1,11 +1,11 @@ -From 17a0dce9a3f969168a9c9cf62839dabca02fe5e4 Mon Sep 17 00:00:00 2001 +From d9d3a882e602c3f779d3b35a589d2e46dd572459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= 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 66621e6..a89ba23 100644 +index b5d59c2..4c2e3de 100644 --- a/configure.ac +++ b/configure.ac @@ -198,7 +198,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt]) @@ -18,10 +18,10 @@ index 66621e6..a89ba23 100644 if test x$host_is_linux = xyes; then -- -2.7.0 +2.2.2 -From 1868f2ff06a975edc9277ae692e6f09a5c65c96e Mon Sep 17 00:00:00 2001 +From cc3acd3f68a31fc28f4c15db16e257ce891586eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 14 Jul 2014 23:10:02 +0200 Subject: unix: define WCOREDUMP() for platforms that don't support it @@ -44,10 +44,10 @@ index 67704a9..390d035 100644 /** the Unix user name which MPD runs as */ -- -2.7.0 +2.2.2 -From ead553675392ac0e74e5397f39da5a07b29eb5bc Mon Sep 17 00:00:00 2001 +From f9c6d62bba2755916affc1c3553fb9ad4a8fa76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= 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.7.0 +2.2.2 -From e70adf6a7c1f5df8aba0219ea912af0e11edd4eb Mon Sep 17 00:00:00 2001 +From 55860d662a463003705092114a8d50ec41b6a765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 14 Jul 2014 23:16:20 +0200 Subject: output: add native Haiku audio output and mixer support @@ -79,10 +79,10 @@ Subject: output: add native Haiku audio output and mixer support Also uses the notification system to display tags. diff --git a/Makefile.am b/Makefile.am -index 307fcba..46a07d7 100644 +index 7cd68f8..f13b0c8 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -1275,6 +1275,14 @@ liboutput_plugins_a_SOURCES += \ +@@ -1276,6 +1276,14 @@ liboutput_plugins_a_SOURCES += \ src/output/plugins/FifoOutputPlugin.hxx endif @@ -98,7 +98,7 @@ index 307fcba..46a07d7 100644 liboutput_plugins_a_SOURCES += \ src/output/plugins/PipeOutputPlugin.cxx \ diff --git a/configure.ac b/configure.ac -index a89ba23..c5ad46a 100644 +index 4c2e3de..c1e4b85 100644 --- a/configure.ac +++ b/configure.ac @@ -411,6 +411,11 @@ AC_ARG_ENABLE(gme, @@ -113,7 +113,7 @@ index a89ba23..c5ad46a 100644 AC_ARG_ENABLE(httpd-output, AS_HELP_STRING([--enable-httpd-output], [enables the HTTP server output]),, -@@ -1534,6 +1539,19 @@ fi +@@ -1528,6 +1533,19 @@ fi AM_CONDITIONAL(HAVE_FIFO, test x$enable_fifo = xyes) @@ -133,7 +133,7 @@ index a89ba23..c5ad46a 100644 dnl ------------------------------- HTTPD Output ------------------------------ if test x$enable_httpd_output = xauto; then # handle HTTPD auto-detection: disable if no encoder is -@@ -1859,6 +1877,7 @@ printf '\nPlayback support:\n\t' +@@ -1853,6 +1871,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.7.0 +2.2.2 -From dc90869c1afc55f94f80517572ef5b457ececdb5 Mon Sep 17 00:00:00 2001 +From acf6a8b40a989bd177727c6a6caa9ba82c739447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 31 Jul 2014 23:03:07 +0200 Subject: Haiku: add an HVIF icon @@ -896,10 +896,10 @@ literal 0 HcmV?d00001 -- -2.7.0 +2.2.2 -From 32fb3f99948ebdf4b8de1f2cdeab465b5d2cd3aa Mon Sep 17 00:00:00 2001 +From 6f251f3e33a06b2b22585afd82da64dc6d9da65a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= 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.7.0 +2.2.2 -From e3f7626fa1b7d8306e7cf5e5d98fc75df30cc901 Mon Sep 17 00:00:00 2001 +From 31267ac24c9f074af7fe11d90648ff227950e6ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= 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.7.0 +2.2.2 -From f02f0f80dc12ec443b7fb34eff399c15860d6880 Mon Sep 17 00:00:00 2001 +From 77062cd3122f110f23194e52b0825bc1fea5db27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= 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 c5ad46a..42dd2a9 100644 +index c1e4b85..8e6b3e4 100644 --- a/configure.ac +++ b/configure.ac @@ -114,6 +114,10 @@ darwin*) @@ -1026,17 +1026,17 @@ index c5ad46a..42dd2a9 100644 AM_CONDITIONAL([ANDROID], [test x$host_is_android = xyes]) -- -2.7.0 +2.2.2 -From 2d3483a476e2b60dd1405a528909dcf8f65aae48 Mon Sep 17 00:00:00 2001 +From c959d827dda29d56c3f4f4144035029d7153b086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 1 Aug 2014 19:03:54 +0200 Subject: Makefile.am: add the Haiku resources to the mpd binary diff --git a/Makefile.am b/Makefile.am -index 46a07d7..af31b87 100644 +index f13b0c8..3ba7aea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -333,6 +333,28 @@ EXTRA_src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT) @@ -1068,7 +1068,7 @@ index 46a07d7..af31b87 100644 if ENABLE_DATABASE if ENABLE_INOTIFY libmpd_a_SOURCES += \ -@@ -2168,4 +2190,5 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \ +@@ -2172,4 +2194,5 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \ android/src/Bridge.java \ android/src/Loader.java \ android/src/Main.java \ @@ -1076,10 +1076,10 @@ index 46a07d7..af31b87 100644 + src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico \ + src/haiku/App_MusicPD -- -2.7.0 +2.2.2 -From ddd9c2802fa5567ff2377163312aec018d1ff850 Mon Sep 17 00:00:00 2001 +From 398bccd3883d834e5ba9a4d4b0d1e9990f188042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= 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.7.0 +2.2.2 -From 2851852830cf4fdbe28557acd13384ec102b35cf Mon Sep 17 00:00:00 2001 +From 8a8454f33b8cf791e1d104cbbaf2ed0bab9e3072 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 21 Dec 2015 23:28:18 +0000 Subject: output/haiku: fix use of tags. @@ -1225,28 +1225,5 @@ index ca4acdb..5bba640 100644 notification.SetContent(full); -- -2.7.0 - - -From c7292104091cc2018e01195f0a5f00a40e5effc5 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -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 +2.2.2