From patchwork Sun Jul 28 06:10:20 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: 1137923 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.137; helo=fraxinus.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="d3lY21if"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45xC9d71jKz9s7T for ; Sun, 28 Jul 2019 16:10:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 856FB86FFD; Sun, 28 Jul 2019 06:10:42 +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 h6qtc4kaVsIg; Sun, 28 Jul 2019 06:10:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id ECBCB86F77; Sun, 28 Jul 2019 06:10:40 +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 143181BF46A for ; Sun, 28 Jul 2019 06:10:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0F0BC889D4 for ; Sun, 28 Jul 2019 06:10:40 +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 oEVdV1gMob1K for ; Sun, 28 Jul 2019 06:10:39 +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 A956B889D0 for ; Sun, 28 Jul 2019 06:10:38 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 76B5C16005E for ; Sun, 28 Jul 2019 08:10:35 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45xC9Q0NQ3z6tm6; Sun, 28 Jul 2019 08:10:33 +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=1564294231; x=1564899032; bh=jmihHjiGOECnOT6wROSWU4C/n6eGy90zI531f8vjtRA=; b=d3lY21ifST7N fuOul+ohIuWIF6iM4/kJFar3bl1DcIAnP34x8lFw2Bfok+jCWacyh1vYT6jKpZrn FkGNaubzmUYZX8MVjWPW2AGzPXF7GPKOG5lHhJ3gll31LhWDdAVNWMHvpVudqF6Z 5zsbCjsnKDtF3B4Hd1XbRYBl2Aj7k5t/7WWH2RmDoUhapz+/Zr6x9uWsoS9yvt/u Q6cATe45aIpbrIMQXtTkL7Yg0mJd9ERdLmdVsH9XB/zXMaKB7cyEIfjFR7yRzCmF daOADYcHMT0foHvmT7IpKVuL56552nw767jbmXG2Hja8D1erqjvPX5ZMzvcdnuLD WTBG2TyUmA== 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 k2HoXYvGh0QW; Sun, 28 Jul 2019 08:10:31 +0200 (CEST) Received: from nzxt.fritz.box (port-92-195-79-126.dynamic.qsc.de [92.195.79.126]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Sun, 28 Jul 2019 08:10:31 +0200 (CEST) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Sun, 28 Jul 2019 08:10:20 +0200 Message-Id: <20190728061023.5283-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 0/3] package/mpd: bump to version 0.21.11 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: , Cc: Thomas Petazzoni 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. v4 bumps mpd to version 0.21.11 (instead of 0.21.7) and do not uses squased patches. 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.11 ...ult-to-underscore-yes-for-cross-buil.patch | 48 +++++ package/libgcrypt/0001-reconfigure.patch | 27 --- ...-libgcrypt.pc-generated-by-configure.patch | 93 +++++++++ .../0003-build-Fix-libgcrypt.pc.patch | 31 +++ 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 +++++++++--------- 9 files changed, 292 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 create mode 100644 package/libgcrypt/0003-build-Fix-libgcrypt.pc.patch delete mode 100644 package/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch