From patchwork Thu Jan 4 10:40:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 855543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zC48C3xm5z9sRW for ; Thu, 4 Jan 2018 21:40:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7E10489611; Thu, 4 Jan 2018 10:40:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UI7oSG6PYKV5; Thu, 4 Jan 2018 10:40:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0280189604; Thu, 4 Jan 2018 10:40:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id CDA851C2AE1 for ; Thu, 4 Jan 2018 10:40:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C7B30307D0 for ; Thu, 4 Jan 2018 10:40:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0sg10yVf0ODe for ; Thu, 4 Jan 2018 10:40:35 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.141]) by silver.osuosl.org (Postfix) with ESMTPS id 9264E307CD for ; Thu, 4 Jan 2018 10:40:35 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id CD59820F4A for ; Thu, 4 Jan 2018 11:40:32 +0100 (CET) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3zC47t4bkQz9rxd for ; Thu, 4 Jan 2018 11:40:26 +0100 (CET) Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id qz8Kz2K5J70M; Thu, 4 Jan 2018 11:40:25 +0100 (CET) Received: from nzxt.fritz.box (port-92-195-78-177.dynamic.qsc.de [92.195.78.177]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Thu, 4 Jan 2018 11:40:25 +0100 (CET) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Thu, 4 Jan 2018 11:40:23 +0100 Message-Id: <20180104104023.2676-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.15.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] mpd: bump to version 0.20.14 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove upstream patch '0002-libupnp-1-6-24-compat.patch'. Signed-off-by: Jörg Krause --- package/mpd/0002-libupnp-1-6-24-compat.patch | 48 ---------------------------- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 3 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 package/mpd/0002-libupnp-1-6-24-compat.patch diff --git a/package/mpd/0002-libupnp-1-6-24-compat.patch b/package/mpd/0002-libupnp-1-6-24-compat.patch deleted file mode 100644 index abcafa8616..0000000000 --- a/package/mpd/0002-libupnp-1-6-24-compat.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 78728138a04c2493c6bfadee98060043eca204bf Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Sat, 2 Dec 2017 14:47:27 +0100 -Subject: [PATCH] lib/upnp/Compat: disable the 1.8 API emulation with libupnp - 1.6.24 - -libupnp 1.6.24 added a few badly designed macros which break the MPD -build: - - https://sourceforge.net/p/pupnp/code/ci/8177a4195a4d4a5d6cb095eaf4ca5b65ac446381/ - -To work around this, we disable our emulation functions (from -714011c81ed6053f7a35812071499356f337dd70) on this libupnp version. - -Closes #163 - -Backported from: 78728138a04c2493c6bfadee98060043eca204bf - -Signed-off-by: Max Kellermann -[Jörg Krause: Drop patching News file] -Signed-off-by: Jörg Krause - ---- - src/lib/upnp/Compat.hxx | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/lib/upnp/Compat.hxx b/src/lib/upnp/Compat.hxx -index 2e2d2f1de..c9f1cc47f 100644 ---- a/src/lib/upnp/Compat.hxx -+++ b/src/lib/upnp/Compat.hxx -@@ -23,12 +23,15 @@ - #include - - #if UPNP_VERSION < 10800 --#include "Compiler.h" -- - /* emulate the libupnp 1.8 API with older versions */ - - using UpnpDiscovery = Upnp_Discovery; - -+#endif -+ -+#if UPNP_VERSION < 10624 -+#include "Compiler.h" -+ - gcc_pure - static inline int - UpnpDiscovery_get_Expires(const UpnpDiscovery *disco) noexcept diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 16661e5fa4..99ec6c82f2 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 e159ac0608fb85c891bd19375ed7056d5f9ec4ba492b052f24820513e774f709 mpd-0.20.12.tar.xz +sha256 7d59afa1e7aabe5f7ad2d66eb274b0d54568b4110a783dfe8e74bd0f94e3f781 mpd-0.20.14.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 57e3b464af..f9ca1600b5 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.20 -MPD_VERSION = $(MPD_VERSION_MAJOR).12 +MPD_VERSION = $(MPD_VERSION_MAJOR).14 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost