From patchwork Thu Jul 4 10:43:18 2019 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: 1127486 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embedded.rocks Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b="I4sRSnOf"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45fZMl3QfYz9sNw for ; Thu, 4 Jul 2019 20:43:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BCE9D86E6A; Thu, 4 Jul 2019 10:43:43 +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 PekbiIprW6lu; Thu, 4 Jul 2019 10:43:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DDC1186E1F; Thu, 4 Jul 2019 10:43:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 39D801BF23B for ; Thu, 4 Jul 2019 10:43:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 362CF87E56 for ; Thu, 4 Jul 2019 10:43:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aluHR3gBC-bs for ; Thu, 4 Jul 2019 10:43:34 +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 hemlock.osuosl.org (Postfix) with ESMTPS id 19A4987E55 for ; Thu, 4 Jul 2019 10:43:33 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 03C84160066 for ; Thu, 4 Jul 2019 12:43:29 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45fZMK72Swz6tmf for ; Thu, 4 Jul 2019 12:43:25 +0200 (CEST) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1562237004; x=1562841805; bh=DxE3m6TEib72bGtqGOchVoQ2NZnpSIPz5DNn1otI1no=; b=I4sRSnOfPRf3 p/As4gY2aOrR/CUvuJ1m29OW/2L7YJy0nx2cA56tDSW1tMPcYxK+zs6QPuNSt3qb yrEkOIGolRDOkHn2laddLHJ3WUj4m/uFMpLIfNJqP5uDs8OqY+NHfDOW630qNYxO vYW60UR1E7FplZFepMmj6dzW3SSRiv99WHRWKwxTfURsEiznzp0u9oMFbaKfileC 1x/vlJosRPbNMRZV/ZFRMgZ+ysCRRMokoWR180hv2+/mltpfe5hDo3qVjr9UGBsh HnA2C8UKmknhY9wNFoQ527/r4BSjoJul4hr7pkYUir7n6GQlKGSVErimRI6vwrb5 TURbZr32SA== 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 QF1NuRfYHtkF; Thu, 4 Jul 2019 12:43:24 +0200 (CEST) Received: from nzxt.fritz.box (port-92-195-9-84.dynamic.qsc.de [92.195.9.84]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Thu, 4 Jul 2019 12:43:24 +0200 (CEST) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Thu, 4 Jul 2019 12:43:18 +0200 Message-Id: <20190704104321.2598-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 0/3] package/mpd: bump to version 0.21.7 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 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" MPD switched from Autotools to the Meson build system. This is not really a big deal except that the Qobuz plugin depends on libgcrypt. The issue is, that libgcrypt version 1.8.4 only provides its own config file `libgcrypt-config` instead of a pkg-config file. Every custom config file needs to be added to the `[binary]` section in the cross-compilation.conf file, so that Meson correctly detects the path for the custom config file instead of using the one find in `PATH`, which directs to the host. v1 of bumping mpd to the 0.21 version added `libgcrypt-config` to the cross-compilation.conf.in file which has the drawback, that this variable is creeping into the global cross-compilation file. v2 added the staging path early to PATH, which is not a wise idea, because $(STAGING_DIR)/usr/bin contains binaries compiled for the target. There was an ongoing discussion, how to add support to the meson infrastructure to allow adding entries to the `[binaries]` section on the per-package cross-compilation file. It turned out, that the current meson infrastructure needs some changes to support adding multi-line entries. v3 does not try to fix the meson build infrastructure, but adds an upstream patch to libgcrypt to provide a pkg-config file. pkg-config files are preferred over custom config files and meson will correctly detect libgcrypt without changing the meson infrastructure. This makes bumping mpd to the 0.21.x version branch much easier. Note, that meanwhile mpd released version 0.21.11. As soon as this series is applied, a follow up patch will bump mpd to the latest version. Jörg Krause (3): package/libgcrypt: replace reconfigure patch with upstream patch package/libgcrypt: add upstream patch to add pkg-config file package/mpd: bump to version 0.21.7 ...ult-to-underscore-yes-for-cross-buil.patch | 48 +++++ package/libgcrypt/0001-reconfigure.patch | 27 --- ...-libgcrypt.pc-generated-by-configure.patch | 102 ++++++++++ package/libgcrypt/libgcrypt.mk | 5 +- ...gure.ac-check-if-libatomic-is-needed.patch | 40 ---- package/mpd/Config.in | 29 ++- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 176 +++++++++--------- 8 files changed, 270 insertions(+), 159 deletions(-) create mode 100644 package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch delete mode 100644 package/libgcrypt/0001-reconfigure.patch create mode 100644 package/libgcrypt/0002-build-Provide-libgcrypt.pc-generated-by-configure.patch delete mode 100644 package/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch