From patchwork Wed Feb 15 09:33:31 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: 728112 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vNYy41T32z9ryv for ; Wed, 15 Feb 2017 20:33:47 +1100 (AEDT) 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="TYqTu0MA"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 51DAF86F27; Wed, 15 Feb 2017 09:33:46 +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 KaiOkX9kCW8X; Wed, 15 Feb 2017 09:33:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id EC2B686DD7; Wed, 15 Feb 2017 09:33:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4EB4B1C0378 for ; Wed, 15 Feb 2017 09:33:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4B4C686204 for ; Wed, 15 Feb 2017 09:33: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 clUUJRKxUFKd for ; Wed, 15 Feb 2017 09:33:41 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by whitealder.osuosl.org (Postfix) with ESMTPS id 47D7286180 for ; Wed, 15 Feb 2017 09:33:41 +0000 (UTC) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3vNYxs5bkSz104X; Wed, 15 Feb 2017 10:33:37 +0100 (CET) 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=1487151215; x=1487756016; bh=X+33sGkwOk8sNAPQFI9cTWEvB05M6oGVyVpf6bhNOfM=; b=TYqTu0MAJGkA HpTiaCPiELGAPJgLmspQ2/cUquhZkFZt/QnzU+0J4kwa+kN7VlouBPQaUhFWo8fW 06xX+88tK1c+gBNo01rDBUthBUsylmn/sKWSIVAr+iEhPB/cjHTsXAspvLF/RujR 176Zxev8NTMBj4pAWr9ZEzn+pRrdspZk7tdVKou60Em8GhLZSIJNw0ipJV7Gcp4s jRfZNcJyu7k2QSr5BbYIwdQ6/8zgAbzqiZt6dAe8cQFcBwkVCFzhfVJvVJ9l8NfS U37qy/Fir+Ckt3dBiy+ZBTlIZOC6yZgpcdjEqjfaLuAY6c3TzYxthPRQpUtWh2rp klj/ID5iCg== 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 Sy7x-_FoS7Gc; Wed, 15 Feb 2017 10:33:35 +0100 (CET) Received: from hp.lintech.bln (ip5b40bc83.dynamic.kabel-deutschland.de [91.64.188.131]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Wed, 15 Feb 2017 10:33:35 +0100 (CET) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Wed, 15 Feb 2017 10:33:31 +0100 Message-Id: <20170215093331.31040-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH v2] package/mpd: add choice between version 0.19 and 0.20 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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 version 0.20 being affected by GCC PR libstdc++/64735 means no mpd package available in Buildroot for the architectures NIOSII, ARMv4, ARMv5 and SPARCv8 until GCC 7 is released. As the next Buildroot release is in 2017.02, which is before GCC 7 is expected to be finished we add hidden config symbols to select the version branch to use. Note, that we bumped the version from 0.19 to 0.20 quite recently within the current Buildroot release cycle. This way we can keep the support for mpd on the affected architectures, like ARMv5, until GCC 7 is out. Note, that version 0.19 requires libglib2. Signed-off-by: Jörg Krause Cc: Thomas Petazzoni --- Changes v2: * add missing hash for version 0.19.21 * remove of visible options (suggested by Thomas) --- package/mpd/Config.in | 26 +++++++++++++++++++++----- package/mpd/mpd.hash | 1 + package/mpd/mpd.mk | 10 +++++++++- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 8a28b4f1a..8eabbbc79 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -4,9 +4,10 @@ menuconfig BR2_PACKAGE_MPD depends on BR2_USE_WCHAR # flac depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 depends on BR2_TOOLCHAIN_HAS_ATOMIC + # 0.19.x could be built with GCC 4.6, but for simplicity we require + # the same toolchain dependencies for all versions. + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG) @@ -20,6 +21,24 @@ menuconfig BR2_PACKAGE_MPD if BR2_PACKAGE_MPD +# Hidden config symbols to select the branch 0.20 by default and fallback +# to branch 0.19 for toolchains affected by GCC bug PR 64735. This way we +# keep support for mpd on some architectures, like ARMv5, until GCC 7 is +# released, which will fix this issue. +config BR2_PACKAGE_MPD_VERSION_STRING + string + default "0.20" if !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + default "0.19" + +config BR2_PACKAGE_MPD_VERSION_0_20 + bool + default y if BR2_PACKAGE_MPD_VERSION_STRING = "0.20" + +config BR2_PACKAGE_MPD_VERSION_0_19 + bool + default y if BR2_PACKAGE_MPD_VERSION_STRING = "0.19" + select BR2_PACKAGE_LIBGLIB2 + comment "Archive plugins" config BR2_PACKAGE_MPD_BZIP2 @@ -320,6 +339,3 @@ comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - -comment "mpd needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index ee46f3cc5..ecd78e97c 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature sha256 712b25351c12616630c580204e1c3dcba3ae2993a56cff1c346c87e334d69728 mpd-0.20.4.tar.xz +sha256 8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730 mpd-0.19.21.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 0efc8685f..74f966c9f 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -4,8 +4,12 @@ # ################################################################################ -MPD_VERSION_MAJOR = 0.20 +MPD_VERSION_MAJOR = $(BR2_PACKAGE_MPD_VERSION_STRING) +ifeq ($(BR2_PACKAGE_MPD_VERSION_0_20),y) MPD_VERSION = $(MPD_VERSION_MAJOR).4 +else +MPD_VERSION = $(MPD_VERSION_MAJOR).21 +endif MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost @@ -13,6 +17,10 @@ MPD_LICENSE = GPLv2+ MPD_LICENSE_FILES = COPYING MPD_AUTORECONF = YES +ifeq ($(BR2_MPD_VERSION_0_19),y) +MPD_DEPENDENCIES += libglib2 +endif + # Some options need an explicit --disable or --enable # Zeroconf support depends on libdns_sd from avahi.