| Message ID | 20170104154723.17946-1-joerg.krause@embedded.rocks |
|---|---|
| State | Accepted |
| Commit | cd8dc719259bba67427720ea943696455dded35e |
| Headers | show |
>>>>> "Jörg" == Jörg Krause <joerg.krause@embedded.rocks> writes: > Drop patch #0002 which was already fixed upstream long time ago in > commit 276a0d9500b8efc879e4f0c23e9d0e361849e295 using a slightly > different approach. > Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Committed, thanks.
Hi Peter, On Wed, Jan 04, 2017 at 05:03:33PM +0100, Peter Korsgaard wrote: > >>>>> "Jörg" == Jörg Krause <joerg.krause@embedded.rocks> writes: > > > Drop patch #0002 which was already fixed upstream long time ago in > > commit 276a0d9500b8efc879e4f0c23e9d0e361849e295 using a slightly > > different approach. > > > Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> > > Committed, thanks. Not in master as of e8872a5873 (firmware-imx: remove Makefile from target). baruch
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes: > Hi Peter, > On Wed, Jan 04, 2017 at 05:03:33PM +0100, Peter Korsgaard wrote: >> >>>>> "Jörg" == Jörg Krause <joerg.krause@embedded.rocks> writes: >> >> > Drop patch #0002 which was already fixed upstream long time ago in >> > commit 276a0d9500b8efc879e4f0c23e9d0e361849e295 using a slightly >> > different approach. >> >> > Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> >> >> Committed, thanks. > Not in master as of e8872a5873 (firmware-imx: remove Makefile from target). Sorry, it is now.
diff --git a/package/mpd/0002-thread-Name-include-stdio.h-for-prctl-as-well.patch b/package/mpd/0002-thread-Name-include-stdio.h-for-prctl-as-well.patch deleted file mode 100644 index 1943623ed..000000000 --- a/package/mpd/0002-thread-Name-include-stdio.h-for-prctl-as-well.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a0a9fed68126eb24e04af924c0d46351ff5eeb0f Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <gustavo@zacarias.com.ar> -Date: Mon, 26 Jan 2015 09:55:04 -0300 -Subject: [PATCH] thread/Name: include stdio.h for prctl as well - -We're still using snprintf so we need it, otherwise it leads to build -failure. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> ---- - src/thread/Name.hxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/thread/Name.hxx b/src/thread/Name.hxx -index a99208d..8f9d7d3 100644 ---- a/src/thread/Name.hxx -+++ b/src/thread/Name.hxx -@@ -25,6 +25,7 @@ - # include <pthread.h> - #elif defined(HAVE_PRCTL) - # include <sys/prctl.h> -+# include <stdio.h> - # ifdef PR_SET_NAME - # define HAVE_THREAD_NAME - # endif --- -2.6.4 - diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index daa185efe..258f87b7b 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730 mpd-0.19.21.tar.xz +sha256 48e9dde0f5c22dc26ff36e8d13e3dc575a1ee7558b5537a064f78a3b9dee1619 mpd-0.20.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index eb74f4f52..10e6b90dd 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -4,8 +4,8 @@ # ################################################################################ -MPD_VERSION_MAJOR = 0.19 -MPD_VERSION = $(MPD_VERSION_MAJOR).21 +MPD_VERSION_MAJOR = 0.20 +MPD_VERSION = $(MPD_VERSION_MAJOR) MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost libglib2
Drop patch #0002 which was already fixed upstream long time ago in commit 276a0d9500b8efc879e4f0c23e9d0e361849e295 using a slightly different approach. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> --- ...ad-Name-include-stdio.h-for-prctl-as-well.patch | 28 ---------------------- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 4 ++-- 3 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 package/mpd/0002-thread-Name-include-stdio.h-for-prctl-as-well.patch