From patchwork Tue Dec 12 19:51:09 2017 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: 847614 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yx9SG1V1zz9s81 for ; Wed, 13 Dec 2017 06:51:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DF7902F2A5; Tue, 12 Dec 2017 19:51:21 +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 oxsUvTKu25oa; Tue, 12 Dec 2017 19:51:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7708930441; Tue, 12 Dec 2017 19:51:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1F0DD1BFDB4 for ; Tue, 12 Dec 2017 19:51:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1C43A865E3 for ; Tue, 12 Dec 2017 19:51:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7rpL5DRmkD8o for ; Tue, 12 Dec 2017 19:51:18 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id C5B5C865E9 for ; Tue, 12 Dec 2017 19:51:17 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id D471D20F30 for ; Tue, 12 Dec 2017 20:51:14 +0100 (CET) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3yx9S20QFSz9rxW for ; Tue, 12 Dec 2017 20:51:13 +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 zhSQ1S8D6-qE; Tue, 12 Dec 2017 20:51:12 +0100 (CET) Received: from nzxt.fritz.box (port-92-195-83-164.dynamic.qsc.de [92.195.83.164]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Tue, 12 Dec 2017 20:51:12 +0100 (CET) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Tue, 12 Dec 2017 20:51:09 +0100 Message-Id: <20171212195109.29683-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.15.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] mpd: add upstream patch to fix build with libupnp 1.6.24 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" Add an upstream patch to fix build with libupnp 1.6.24. libupnp 1.6.24 added some compat helpers for programs making use of libupnp to support 1.6.x and 1.8.x easier [1]. MPD added its own wrappers in version 0.20.12 [2] which are clashing with the newly added compat helpers in libupnp 1.6.24. The patch disables the MPD wrappers for libupnp version 1.6.24+. Fixes: http://autobuild.buildroot.net/results/949bf9d42c82de34f3328a31bb122c81243e5418/ http://autobuild.buildroot.net/results/b12ca93cb3ad52e601cc99f54a867e21a28fd1c9/ http://autobuild.buildroot.net/results/7af8e96fdf823bbc427caa562d6d0a130a4875f0/ .. and many more. Backported from: 78728138a04c2493c6bfadee98060043eca204bf [1] https://sourceforge.net/p/pupnp/code/ci/8177a4195a4d4a5d6cb095eaf4ca5b65ac446381/ [2] https://github.com/MusicPlayerDaemon/MPD/commit/714011c81ed6053f7a35812071499356f337dd70 Signed-off-by: Jörg Krause --- package/mpd/0002-libupnp-1-6-24-compat.patch | 48 ++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create 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 new file mode 100644 index 0000000000..abcafa8616 --- /dev/null +++ b/package/mpd/0002-libupnp-1-6-24-compat.patch @@ -0,0 +1,48 @@ +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