From patchwork Thu Jul 4 10:43:19 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: 1127485 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.136; helo=silver.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="MqTtg1B9"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45fZMk0snFz9s8m for ; Thu, 4 Jul 2019 20:43:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B498E220DA; Thu, 4 Jul 2019 10:43:37 +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 pC8K1NbPRuyF; Thu, 4 Jul 2019 10:43:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1663B20493; Thu, 4 Jul 2019 10:43:34 +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 79B001BF23B for ; Thu, 4 Jul 2019 10:43:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6F9A384E74 for ; Thu, 4 Jul 2019 10:43:32 +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 1La0QDUX50ou for ; Thu, 4 Jul 2019 10:43:31 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id E0FB184DE6 for ; Thu, 4 Jul 2019 10:43:30 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E27BF2400FC for ; Thu, 4 Jul 2019 12:43:27 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45fZMM0bDCz9rxY for ; Thu, 4 Jul 2019 12:43:26 +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:references:in-reply-to:x-mailer:message-id:date :date:subject:subject:from:from:received:received; s=default; t= 1562237005; x=1562841806; bh=g5lcVTyVnbVAo49Yd0+I30tXuskeZ2TUQwI A8tk/IRE=; b=MqTtg1B9fZnNtzstxa+/KgLtqJQ9B+2UqMhVv+hHMYoUWhSLcIa BQ2LESDJBpqNBX/eHeYSf2UCeZ05f/F/m991ajf+x56P57mUs2T6sGbzVBvVomVF PnYkP1wLNVIXxfWLcHUQq/Y/Qr0NLz673PTEc1YeixBzStlQHjIlBZ2aFda7Bzk9 3JoB6w+isxCnyVIX6+bMeaO4RwQ9/XH+lHzAwUdA5rfT6Mf0ecRF8BPxDY3lgUlC DDfNMCYZDfP3hr7ZdmnHcINn+a5sNQRGfBOOAY7JdMCn0p+TosTX4x7DG1J298T/ lf8dWhZGvmEqirOBb/LOYV1YUnSxfFAaWeQ== 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 aOlq1T2IkOFn; Thu, 4 Jul 2019 12:43:25 +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:25 +0200 (CEST) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Thu, 4 Jul 2019 12:43:19 +0200 Message-Id: <20190704104321.2598-2-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190704104321.2598-1-joerg.krause@embedded.rocks> References: <20190704104321.2598-1-joerg.krause@embedded.rocks> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] package/libgcrypt: replace reconfigure patch with upstream patch 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" The `ac_cv_sys_symbol_underscore` reconfigure patch was added to Buildroot back in 2007 [1], but was not reported to upstream back then. Meanwhile, the issue has been fixed upstream [2] after the version bump to version 1.8.4. In order to add another upstream patch, which will add a pkg-config file for libgrypt and therefore requires autoreconfiguration as well, replace the current patch with the upstream patch. [1] https://git.buildroot.net/buildroot/commit/package/libgcrypt?id=f1bcdf518fa7868b7819b0248f4b8da02a954dde [2] https://github.com/gpg/libgcrypt/commit/0f4545b441b6fbdd6e9c4e95f5f2a367483e78ad Signed-off-by: Jörg Krause --- ...ult-to-underscore-yes-for-cross-buil.patch | 48 +++++++++++++++++++ package/libgcrypt/0001-reconfigure.patch | 27 ----------- package/libgcrypt/libgcrypt.mk | 4 +- 3 files changed, 50 insertions(+), 29 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 diff --git a/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch b/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch new file mode 100644 index 0000000000..032cb7c84c --- /dev/null +++ b/package/libgcrypt/0001-build-Don-t-default-to-underscore-yes-for-cross-buil.patch @@ -0,0 +1,48 @@ +From 7fec3ac22efb86fce90a9edc5696e16ee88a65c7 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Wed, 24 Oct 2018 14:29:45 +0900 +Subject: [PATCH] build: Don't default to underscore=yes for cross-build. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* acinclude.m4: Don't set ac_cv_sys_symbol_underscore +for cross build. + +-- + +It made sense in the past when cross compile were basically for a.out +system, but nowadays, it's better not to assume that. + +Fetched from: 0f4545b441b6fbdd6e9c4e95f5f2a367483e78ad + +Signed-off-by: NIIBE Yutaka +Signed-off-by: Jörg Krause +--- + acinclude.m4 | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index fc208c53..6f7789d0 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -111,14 +111,10 @@ case "${host}" in + ac_cv_sys_symbol_underscore=yes + ;; + *) +- if test "$cross_compiling" = yes; then +- if test "x$ac_cv_sys_symbol_underscore" = x ; then +- ac_cv_sys_symbol_underscore=yes +- fi +- else ++ if test "$cross_compiling" != yes; then + tmp_do_check="yes" + fi +- ;; ++ ;; + esac + if test "$tmp_do_check" = "yes"; then + AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE]) +-- +2.22.0 + diff --git a/package/libgcrypt/0001-reconfigure.patch b/package/libgcrypt/0001-reconfigure.patch deleted file mode 100644 index 87d29a298b..0000000000 --- a/package/libgcrypt/0001-reconfigure.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/configure b/configure -index 70a6d50..8f55d95 100755 ---- a/configure -+++ b/configure -@@ -22306,14 +22306,15 @@ case "${host}" in - i386-emx-os2 | i345686-pc-os2*emx | i386-pc-msdosdjgpp) - ac_cv_sys_symbol_underscore=yes - ;; -- *) -- if test "$cross_compiling" = yes; then -- if test "x$ac_cv_sys_symbol_underscore" = x ; then -- ac_cv_sys_symbol_underscore=yes -+ *)if test -z "$ac_cv_sys_symbol_underscore";then -+ if test "$cross_compiling" = yes; then -+ if test "x$ac_cv_sys_symbol_underscore" = x ; then -+ ac_cv_sys_symbol_underscore=yes -+ fi -+ else -+ tmp_do_check="yes" -+ fi - fi -- else -- tmp_do_check="yes" -- fi - ;; - esac - if test "$tmp_do_check" = "yes"; then diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 452cf17ce1..5aa44481ae 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -13,8 +13,8 @@ LIBGCRYPT_INSTALL_STAGING = YES LIBGCRYPT_DEPENDENCIES = libgpg-error LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config -LIBGCRYPT_CONF_ENV = \ - ac_cv_sys_symbol_underscore=no +# Patching acinclude.m4 in 0001 +LIBGCRYPT_AUTORECONF = YES LIBGCRYPT_CONF_OPTS = \ --with-gpg-error-prefix=$(STAGING_DIR)/usr From patchwork Thu Jul 4 10:43: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: 1127487 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="lhFCqr30"; 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 45fZMl3D0xz9sNf for ; Thu, 4 Jul 2019 20:43:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C7CB6860E6; Thu, 4 Jul 2019 10:43:41 +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 gK5fUTLPtCw1; Thu, 4 Jul 2019 10:43:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 200F684EA3; Thu, 4 Jul 2019 10:43:37 +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 331391BF23B for ; Thu, 4 Jul 2019 10:43:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2D8F186E26 for ; Thu, 4 Jul 2019 10:43:34 +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 mGIW8PgfA5ne for ; Thu, 4 Jul 2019 10:43:31 +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 D70F586E1F for ; Thu, 4 Jul 2019 10:43:30 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E27722400E6 for ; Thu, 4 Jul 2019 12:43:27 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45fZMM0bBNz9rxN for ; Thu, 4 Jul 2019 12:43:27 +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:references:in-reply-to:x-mailer:message-id:date :date:subject:subject:from:from:received:received; s=default; t= 1562237005; x=1562841806; bh=X4GKteEzJmj1FkSmXrKFWDgBvP9NhaAkQzo jxvNYt1k=; b=lhFCqr30iRy+EPqjayQ/hMunje4K1PMQarfIWaHSeAVRVxE/+RS +cvvpWmL6p05b3sNte9ydL2maOwwXAkt7jJORJkfhJ0FEp8UYE6TmYm2UCX4RnkT Yayrtgff0FUvmA5KiLnktq0DK0/fUEFEL5im+lW2//dgF7AAooJiDy9NM1LaoaxG FwL22siR3GLUJ+mrtTAVrrswmInV7vFd4HBzakSWTp4wbbNGangie8uO+2n/IiEE atTY1MBIl88bo3pFsIdxQDmCZZmpwxGcyiMbgMOc8i0lMhdUW00VPqP+0RufhWPn IxgmdsohGzvUjb3DdTIilmCVMaPUTMkndDA== 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 CN9J5jk9QxJx; Thu, 4 Jul 2019 12:43:25 +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:25 +0200 (CEST) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Thu, 4 Jul 2019 12:43:20 +0200 Message-Id: <20190704104321.2598-3-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190704104321.2598-1-joerg.krause@embedded.rocks> References: <20190704104321.2598-1-joerg.krause@embedded.rocks> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/3] package/libgcrypt: add upstream patch to add pkg-config file 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" libgrypt provides a config file `libgcrypt-config`. After the version bump to 1.8.4 upstream added a pkg-config file as well [1]. Using the pkg-config file is preferred over using the package provided config file. For example, the Meson build system requires that for every special config file an entry is added to the `[binary]` section in the cross-compilation.conf file, otherwise it will use the config file found in `PATH`. This is bad when cross-compiling as `PATH` will include pathes to the host and therefore Meson will wrongly use the host config file. To simplify using libgcrypt for packages using the meson infrastructure lets add the pkg-config file. [1] https://github.com/gpg/libgcrypt/commit/97194b422bc89a6137f4e218d4cdee118c63e96e Signed-off-by: Jörg Krause --- ...-libgcrypt.pc-generated-by-configure.patch | 102 ++++++++++++++++++ package/libgcrypt/libgcrypt.mk | 1 + 2 files changed, 103 insertions(+) create mode 100644 package/libgcrypt/0002-build-Provide-libgcrypt.pc-generated-by-configure.patch diff --git a/package/libgcrypt/0002-build-Provide-libgcrypt.pc-generated-by-configure.patch b/package/libgcrypt/0002-build-Provide-libgcrypt.pc-generated-by-configure.patch new file mode 100644 index 0000000000..4f4d86c975 --- /dev/null +++ b/package/libgcrypt/0002-build-Provide-libgcrypt.pc-generated-by-configure.patch @@ -0,0 +1,102 @@ +From ef6f53ae7f9938a672f96c0c43707bc808c78221 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Wed, 24 Oct 2018 14:57:53 +0900 +Subject: [PATCH] build: Provide libgcrypt.pc, generated by configure. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* configure.ac: Generate src/libgcrypt.pc. +* src/Makefile.am (pkgconfigdir, pkgconfig_DATA): New. +(EXTRA_DIST): Add libgcrypt.pc.in. +* src/libgcrypt-config.in: Use @PACKAGE_VERSION@. +* src/libgcrypt.pc.in: New. + +Fetched from: 97194b422bc89a6137f4e218d4cdee118c63e96e + +Signed-off-by: NIIBE Yutaka + +build: Fix libgcrypt.pc. + +* src/libgcrypt.pc.in: Fix typo. + +Fetched from: 0e071372fc0e6fed4a449955ed0789803ba5e709 + +Signed-off-by: NIIBE Yutaka +Signed-off-by: Jörg Krause +--- + configure.ac | 1 + + src/Makefile.am | 5 ++++- + src/libgcrypt-config.in | 2 +- + src/libgcrypt.pc.in | 17 +++++++++++++++++ + 4 files changed, 23 insertions(+), 2 deletions(-) + create mode 100644 src/libgcrypt.pc.in + +diff --git a/configure.ac b/configure.ac +index ce11162d..4e788714 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2613,6 +2613,7 @@ doc/Makefile + src/Makefile + src/gcrypt.h + src/libgcrypt-config ++src/libgcrypt.pc + src/versioninfo.rc + tests/Makefile + ]) +diff --git a/src/Makefile.am b/src/Makefile.am +index 3cc4a552..82d6e8a0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -20,8 +20,11 @@ + + ## Process this file with automake to produce Makefile.in + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = libgcrypt.pc ++ + EXTRA_DIST = libgcrypt-config.in libgcrypt.m4 libgcrypt.vers \ +- gcrypt.h.in libgcrypt.def ++ gcrypt.h.in libgcrypt.def libgcrypt.pc.in + + bin_SCRIPTS = libgcrypt-config + m4datadir = $(datadir)/aclocal +diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in +index c052638c..f7a13afe 100644 +--- a/src/libgcrypt-config.in ++++ b/src/libgcrypt-config.in +@@ -14,7 +14,7 @@ + # General. + prefix="@prefix@" + exec_prefix="@exec_prefix@" +-version="@VERSION@" ++version="@PACKAGE_VERSION@" + includedir="@includedir@" + libdir="@libdir@" + gpg_error_libs="@GPG_ERROR_LIBS@" +diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in +new file mode 100644 +index 00000000..ec68fa2d +--- /dev/null ++++ b/src/libgcrypt.pc.in +@@ -0,0 +1,17 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++includedir=@includedir@ ++libdir=@libdir@ ++host=@LIBGCRYPT_CONFIG_HOST@ ++api_version=@LIBGCRYPT_CONFIG_API_VERSION@ ++symmetric_ciphers="@LIBGCRYPT_CIPHERS@" ++asymmetric_ciphers="@LIBGCRYPT_PUBKEY_CIPHERS@" ++digests="@LIBGCRYPT_DIGESTS@" ++ ++Name: libgcrypt ++Description: General purpose cryptographic library ++Requires: gpg-error ++Version: @PACKAGE_VERSION@ ++Cflags: @LIBGCRYPT_CONFIG_CFLAGS@ ++Libs: @LIBGCRYPT_CONFIG_LIBS@ ++URL: https://www.gnupg.org/software/libgcrypt/index.html +-- +2.22.0 + diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 5aa44481ae..2799a6fba2 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -14,6 +14,7 @@ LIBGCRYPT_DEPENDENCIES = libgpg-error LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config # Patching acinclude.m4 in 0001 +# Patching configure.ac and Makefile.am in 0002 LIBGCRYPT_AUTORECONF = YES LIBGCRYPT_CONF_OPTS = \ --with-gpg-error-prefix=$(STAGING_DIR)/usr From patchwork Thu Jul 4 10:43:21 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: 1127488 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.136; helo=silver.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="1M/fBGRI"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45fZMq4YfNz9s8m for ; Thu, 4 Jul 2019 20:43:51 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F228022176; Thu, 4 Jul 2019 10:43:49 +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 JgGCRSmSRR+N; Thu, 4 Jul 2019 10:43:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C068220494; Thu, 4 Jul 2019 10:43:43 +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 582BE1BF23B for ; Thu, 4 Jul 2019 10:43:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4927E20494 for ; Thu, 4 Jul 2019 10:43:39 +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 z6tD9VIGBmWp 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 silver.osuosl.org (Postfix) with ESMTPS id DC53420490 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 039B0160065 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 45fZMM5x81z6tmS for ; Thu, 4 Jul 2019 12:43:27 +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:references:in-reply-to:x-mailer:message-id:date :date:subject:subject:from:from:received:received; s=default; t= 1562237006; x=1562841807; bh=xbJ7Bmi1wF2OUkbmw93SOcdeoy0uXwa1QQp 9BVgokzQ=; b=1M/fBGRIlpVNR888ZyY25YCK/35yckNtTAsU9ylY9loStUJYau4 lVlXVxeCD/eUOWKy6Ld8Y/uvui6o9NImJt7Wia3hCglPqzfkyrYn3Y32IIwI2Bsg cOk73V//z0NOD1R5bw7LTrCiT2fWLi3J8PVOJTc59/w2mkKfly93aw/UaeggryYT 5Vh5QEq6jZ85v6lHfe1xt0L4RVHd3klsNn4JlsxF/du7LGKV6r91Nlld/puvwvTH 1KRlih10J5gR1w2a8yGf9Ib56gLPRSYozzG6kJguxxB9tb9nDW2Tu2FHCWYvgCoy PGGmU4Cl9AjB90K9hNAqJE6JImP1TaAx52Q== 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 HlzFpc4qdQwy; Thu, 4 Jul 2019 12:43:26 +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:26 +0200 (CEST) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Thu, 4 Jul 2019 12:43:21 +0200 Message-Id: <20190704104321.2598-4-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190704104321.2598-1-joerg.krause@embedded.rocks> References: <20190704104321.2598-1-joerg.krause@embedded.rocks> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 3/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 changed from Autotools to the Meson build system. Add config options for the qobuz and tidal plugins and group them together with the soundcloud plugin under "Commercial services". Signed-off-by: Jörg Krause Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- v3: * rebased on current master * do not pass staging dir to PATH (as done in v2) [Thomas Petazonni] * requires libcrypt patched to provide pkg-config file * drop MPD_AUTORECONF v2: * do not add the `libgrypt-config` entry the Meson cross file, but pass the staging dir early through PATH, so that the fallback mechanism finds the `libgcrypt-config` program installed in the staging dir and not the one installed on the host [Thomas Petazonni] --- ...gure.ac-check-if-libatomic-is-needed.patch | 40 ---- package/mpd/Config.in | 29 ++- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 176 +++++++++--------- 4 files changed, 117 insertions(+), 130 deletions(-) delete mode 100644 package/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch diff --git a/package/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch b/package/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch deleted file mode 100644 index a9873a741f..0000000000 --- a/package/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8eaf14a17244aaf000b4d19e4fde4a637576939f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Feb 2016 21:40:47 +0100 -Subject: [PATCH] configure.ac: check if libatomic is needed - -The mpd source code uses the C++11 functionality, which -internally is implemented using the __atomic_*() gcc built-ins. On -certain architectures, the __atomic_*() built-ins are implemented in -the libatomic library that comes with the rest of the gcc runtime. Due -to this, code using might need to link against libatomic, -otherwise one hits build issues such as: - -GlobalEvents.cxx:(.text._ZN12GlobalEvents4EmitENS_5EventE+0x14): undefined reference to `__atomic_fetch_or_4' - -on an architecture like SPARC. - -To solve this, a configure.ac check is added to know if we need to -link against libatomic or not. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 107b45a..8e6fab7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -233,6 +233,8 @@ if test x$have_pthread_setname_np = xyes; then - AC_DEFINE(HAVE_PTHREAD_SETNAME_NP, 1, [Is pthread_setname_np() available?]) - fi - -+AC_SEARCH_LIBS([__atomic_load_4], [atomic]) -+ - dnl --------------------------------------------------------------------------- - dnl Event loop selection - dnl --------------------------------------------------------------------------- --- -2.6.4 - diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 923f0c2201..16bea27428 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -34,6 +34,29 @@ config BR2_PACKAGE_MPD_SQLITE Enable sqlite database support. If you don't use sqlite it will use an ASCII database. +comment "Commercial services" + +config BR2_PACKAGE_MPD_QOBUZ + bool "qobuz" + select BR2_PACKAGE_MPD_CURL + select BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_YAJL + help + Play songs from the commercial streaming service Qobuz. + +config BR2_PACKAGE_MPD_SOUNDCLOUD + bool "soundcloud" + select BR2_PACKAGE_YAJL + help + Enable soundcloud.com playlist support. + +config BR2_PACKAGE_MPD_TIDAL + bool "tidal" + select BR2_PACKAGE_MPD_CURL + select BR2_PACKAGE_YAJL + help + Play songs from the commercial streaming service TIDAL. + comment "Converter plugins" config BR2_PACKAGE_MPD_LIBSAMPLERATE @@ -217,12 +240,6 @@ config BR2_PACKAGE_MPD_LIBSMBCLIENT help Enable Samba support. -config BR2_PACKAGE_MPD_SOUNDCLOUD - bool "soundcloud" - select BR2_PACKAGE_YAJL - help - Enable soundcloud.com playlist support. - comment "Output plugins" config BR2_PACKAGE_MPD_ALSA diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index b80bfc82a4..cb9749cd52 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 503e5f9f237290f568ff7956ab2f9aed563594bf749f19b8fe994fb21434afea mpd-0.20.23.tar.xz +sha256 512062bc529bee04d4ccfaa2c6e720afc85bb071e49850a096b5ed518b3b412c mpd-0.21.7.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index f410c1fd95..2cdfca0605 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -4,279 +4,289 @@ # ################################################################################ -MPD_VERSION_MAJOR = 0.20 -MPD_VERSION = $(MPD_VERSION_MAJOR).23 +MPD_VERSION_MAJOR = 0.21 +MPD_VERSION = $(MPD_VERSION_MAJOR).7 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING -MPD_AUTORECONF = YES - -# Some options need an explicit --disable or --enable # Zeroconf support depends on libdns_sd from avahi. ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y) MPD_DEPENDENCIES += avahi -MPD_CONF_OPTS += --with-zeroconf=avahi +MPD_CONF_OPTS += -Dzeroconf=avahi else -MPD_CONF_OPTS += --with-zeroconf=no +MPD_CONF_OPTS += -Dzeroconf=disabled endif # MPD prefers libicu for utf8 collation instead of libglib2. ifeq ($(BR2_PACKAGE_ICU),y) MPD_DEPENDENCIES += icu -MPD_CONF_OPTS += --enable-icu +MPD_CONF_OPTS += -Dicu=enabled else -MPD_CONF_OPTS += --disable-icu +MPD_CONF_OPTS += -Dicu=disabled endif ifeq ($(BR2_PACKAGE_MPD_ALSA),y) MPD_DEPENDENCIES += alsa-lib -MPD_CONF_OPTS += --enable-alsa +MPD_CONF_OPTS += -Dalsa=enabled else -MPD_CONF_OPTS += --disable-alsa +MPD_CONF_OPTS += -Dalsa=disabled endif ifeq ($(BR2_PACKAGE_MPD_AO),y) MPD_DEPENDENCIES += libao -MPD_CONF_OPTS += --enable-ao +MPD_CONF_OPTS += -Dao=enabled else -MPD_CONF_OPTS += --disable-ao +MPD_CONF_OPTS += -Dao=disabled endif ifeq ($(BR2_PACKAGE_MPD_AUDIOFILE),y) MPD_DEPENDENCIES += audiofile -MPD_CONF_OPTS += --enable-audiofile +MPD_CONF_OPTS += -Daudiofile=enabled else -MPD_CONF_OPTS += --disable-audiofile +MPD_CONF_OPTS += -Daudiofile=disabled endif ifeq ($(BR2_PACKAGE_MPD_BZIP2),y) MPD_DEPENDENCIES += bzip2 -MPD_CONF_OPTS += --enable-bzip2 +MPD_CONF_OPTS += -Dbzip2=enabled else -MPD_CONF_OPTS += --disable-bzip2 +MPD_CONF_OPTS += -Dbzip2=disabled endif ifeq ($(BR2_PACKAGE_MPD_CDIO_PARANOIA),y) MPD_DEPENDENCIES += libcdio-paranoia -MPD_CONF_OPTS += --enable-cdio-paranoia +MPD_CONF_OPTS += -Dcdio_paranoia=enabled else -MPD_CONF_OPTS += --disable-cdio-paranoia +MPD_CONF_OPTS += -Dcdio_paranoia=disabled endif ifeq ($(BR2_PACKAGE_MPD_CURL),y) MPD_DEPENDENCIES += libcurl -MPD_CONF_OPTS += --enable-curl +MPD_CONF_OPTS += -Dcurl=enabled else -MPD_CONF_OPTS += --disable-curl +MPD_CONF_OPTS += -Dcurl=disabled endif ifeq ($(BR2_PACKAGE_MPD_DSD),y) -MPD_CONF_OPTS += --enable-dsd +MPD_CONF_OPTS += -Ddsd=true else -MPD_CONF_OPTS += --disable-dsd +MPD_CONF_OPTS += -Ddsd=false endif ifeq ($(BR2_PACKAGE_MPD_FAAD2),y) MPD_DEPENDENCIES += faad2 -MPD_CONF_OPTS += --enable-aac +MPD_CONF_OPTS += -Dfaad=enabled else -MPD_CONF_OPTS += --disable-aac +MPD_CONF_OPTS += -Dfaad=disabled endif ifeq ($(BR2_PACKAGE_MPD_FFMPEG),y) MPD_DEPENDENCIES += ffmpeg -MPD_CONF_OPTS += --enable-ffmpeg +MPD_CONF_OPTS += -Dffmpeg=enabled else -MPD_CONF_OPTS += --disable-ffmpeg +MPD_CONF_OPTS += -Dffmpeg=disabled endif ifeq ($(BR2_PACKAGE_MPD_FLAC),y) MPD_DEPENDENCIES += flac -MPD_CONF_OPTS += --enable-flac +MPD_CONF_OPTS += -Dflac=enabled else -MPD_CONF_OPTS += --disable-flac +MPD_CONF_OPTS += -Dflac=disabled endif ifeq ($(BR2_PACKAGE_MPD_HTTPD_OUTPUT),y) -MPD_CONF_OPTS += --enable-httpd-output +MPD_CONF_OPTS += -Dhttpd=true else -MPD_CONF_OPTS += --disable-httpd-output +MPD_CONF_OPTS += -Dhttpd=false endif ifeq ($(BR2_PACKAGE_MPD_JACK2),y) MPD_DEPENDENCIES += jack2 -MPD_CONF_OPTS += --enable-jack +MPD_CONF_OPTS += -Djack=enabled else -MPD_CONF_OPTS += --disable-jack +MPD_CONF_OPTS += -Djack=disabled endif ifeq ($(BR2_PACKAGE_MPD_LAME),y) MPD_DEPENDENCIES += lame -MPD_CONF_OPTS += --enable-lame-encoder +MPD_CONF_OPTS += -Dlame=enabled else -MPD_CONF_OPTS += --disable-lame-encoder +MPD_CONF_OPTS += -Dlame=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBMPDCLIENT),y) MPD_DEPENDENCIES += libmpdclient -MPD_CONF_OPTS += --enable-libmpdclient +MPD_CONF_OPTS += -Dlibmpdclient=enabled else -MPD_CONF_OPTS += --disable-libmpdclient +MPD_CONF_OPTS += -Dlibmpdclient=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBMMS),y) MPD_DEPENDENCIES += libmms -MPD_CONF_OPTS += --enable-mms +MPD_CONF_OPTS += -Dmms=enabled else -MPD_CONF_OPTS += --disable-mms +MPD_CONF_OPTS += -Dmms=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBNFS),y) MPD_DEPENDENCIES += libnfs -MPD_CONF_OPTS += --enable-nfs +MPD_CONF_OPTS += -Dnfs=enabled else -MPD_CONF_OPTS += --disable-nfs +MPD_CONF_OPTS += -Dnfs=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBSMBCLIENT),y) MPD_DEPENDENCIES += samba4 -MPD_CONF_OPTS += --enable-smbclient +MPD_CONF_OPTS += -Dsmbclient=enabled else -MPD_CONF_OPTS += --disable-smbclient +MPD_CONF_OPTS += -Dsmbclient=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBSAMPLERATE),y) MPD_DEPENDENCIES += libsamplerate -MPD_CONF_OPTS += --enable-lsr +MPD_CONF_OPTS += -Dlibsamplerate=enabled else -MPD_CONF_OPTS += --disable-lsr +MPD_CONF_OPTS += -Dlibsamplerate=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBSNDFILE),y) MPD_DEPENDENCIES += libsndfile -MPD_CONF_OPTS += --enable-sndfile +MPD_CONF_OPTS += -Dsndfile=enabled else -MPD_CONF_OPTS += --disable-sndfile +MPD_CONF_OPTS += -Dsndfile=disabled endif ifeq ($(BR2_PACKAGE_MPD_LIBSOXR),y) MPD_DEPENDENCIES += libsoxr -MPD_CONF_OPTS += --enable-soxr +MPD_CONF_OPTS += -Dsoxr=enabled else -MPD_CONF_OPTS += --disable-soxr +MPD_CONF_OPTS += -Dsoxr=disabled endif ifeq ($(BR2_PACKAGE_MPD_MAD),y) MPD_DEPENDENCIES += libid3tag libmad -MPD_CONF_OPTS += --enable-mad +MPD_CONF_OPTS += -Dmad=enabled else -MPD_CONF_OPTS += --disable-mad +MPD_CONF_OPTS += -Dmad=disabled endif ifeq ($(BR2_PACKAGE_MPD_MPG123),y) MPD_DEPENDENCIES += libid3tag mpg123 -MPD_CONF_OPTS += --enable-mpg123 +MPD_CONF_OPTS += -Dmpg123=enabled else -MPD_CONF_OPTS += --disable-mpg123 +MPD_CONF_OPTS += -Dmpg123=disabled endif ifeq ($(BR2_PACKAGE_MPD_MUSEPACK),y) MPD_DEPENDENCIES += musepack -MPD_CONF_OPTS += --enable-mpc +MPD_CONF_OPTS += -Dmpcdec=enabled else -MPD_CONF_OPTS += --disable-mpc +MPD_CONF_OPTS += -Dmpcdec=disabled endif ifeq ($(BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT),y) -MPD_CONF_OPTS += --enable-neighbor-plugins +MPD_CONF_OPTS += -Dneighbor=true else -MPD_CONF_OPTS += --disable-neighbor-plugins +MPD_CONF_OPTS += -Dneighbor=false endif ifeq ($(BR2_PACKAGE_MPD_OPUS),y) MPD_DEPENDENCIES += opus libogg -MPD_CONF_OPTS += --enable-opus +MPD_CONF_OPTS += -Dopus=enabled else -MPD_CONF_OPTS += --disable-opus +MPD_CONF_OPTS += -Dopus=disabled endif ifeq ($(BR2_PACKAGE_MPD_OSS),y) -MPD_CONF_OPTS += --enable-oss +MPD_CONF_OPTS += -Doss=enabled else -MPD_CONF_OPTS += --disable-oss +MPD_CONF_OPTS += -Doss=disabled endif ifeq ($(BR2_PACKAGE_MPD_PULSEAUDIO),y) MPD_DEPENDENCIES += pulseaudio -MPD_CONF_OPTS += --enable-pulse +MPD_CONF_OPTS += -Dpulse=enabled else -MPD_CONF_OPTS += --disable-pulse +MPD_CONF_OPTS += -Dpulse=disabled +endif + +ifeq ($(BR2_PACKAGE_MPD_QOBUZ),y) +MPD_DEPENDENCIES += libgcrypt yajl +MPD_CONF_OPTS += -Dqobuz=enabled +else +MPD_CONF_OPTS += -Dqobuz=disabled endif ifeq ($(BR2_PACKAGE_MPD_SHOUTCAST),y) MPD_DEPENDENCIES += libshout -MPD_CONF_OPTS += --enable-shout +MPD_CONF_OPTS += -Dshout=enabled else -MPD_CONF_OPTS += --disable-shout +MPD_CONF_OPTS += -Dshout=disabled endif ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y) MPD_DEPENDENCIES += yajl -MPD_CONF_OPTS += --enable-soundcloud +MPD_CONF_OPTS += -Dsoundcloud=enabled else -MPD_CONF_OPTS += --disable-soundcloud +MPD_CONF_OPTS += -Dsoundcloud=disabled endif ifeq ($(BR2_PACKAGE_MPD_SQLITE),y) MPD_DEPENDENCIES += sqlite -MPD_CONF_OPTS += --enable-sqlite +MPD_CONF_OPTS += -Dsqlite=enabled else -MPD_CONF_OPTS += --disable-sqlite +MPD_CONF_OPTS += -Dsqlite=disabled endif ifneq ($(BR2_PACKAGE_MPD_TCP),y) -MPD_CONF_OPTS += --disable-tcp +MPD_CONF_OPTS += -Dtcp=true +endif + +ifeq ($(BR2_PACKAGE_MPD_TIDAL),y) +MPD_DEPENDENCIES += yajl +MPD_CONF_OPTS += -Dtidal=enabled +else +MPD_CONF_OPTS += -Dtidal=disabled endif ifeq ($(BR2_PACKAGE_MPD_TREMOR),y) MPD_DEPENDENCIES += tremor -# Help mpd to find tremor in static linking scenarios -MPD_CONF_ENV += \ - TREMOR_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs vorbisidec`" -MPD_CONF_OPTS += --with-tremor=$(STAGING_DIR)/usr +MPD_CONF_OPTS += -Dtremor=enabled +else +MPD_CONF_OPTS += -Dtremor=disabled endif ifeq ($(BR2_PACKAGE_MPD_TWOLAME),y) MPD_DEPENDENCIES += twolame -MPD_CONF_OPTS += --enable-twolame-encoder +MPD_CONF_OPTS += -Dtwolame=enabled else -MPD_CONF_OPTS += --disable-twolame-encoder +MPD_CONF_OPTS += -Dtwolame=disabled endif ifeq ($(BR2_PACKAGE_MPD_UPNP),y) MPD_DEPENDENCIES += \ expat \ $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18) -MPD_CONF_OPTS += --enable-upnp +MPD_CONF_OPTS += -Dupnp=enabled else -MPD_CONF_OPTS += --disable-upnp +MPD_CONF_OPTS += -Dupnp=disabled endif ifeq ($(BR2_PACKAGE_MPD_VORBIS),y) MPD_DEPENDENCIES += libvorbis -MPD_CONF_OPTS += --enable-vorbis --enable-vorbis-encoder +MPD_CONF_OPTS += -Dvorbis=enabled -Dvorbisenc=enabled else -MPD_CONF_OPTS += --disable-vorbis --disable-vorbis-encoder +MPD_CONF_OPTS += -Dvorbis=disabled -Dvorbisenc=disabled endif ifeq ($(BR2_PACKAGE_MPD_WAVPACK),y) MPD_DEPENDENCIES += wavpack -MPD_CONF_OPTS += --enable-wavpack +MPD_CONF_OPTS += -Dwavpack=enabled else -MPD_CONF_OPTS += --disable-wavpack +MPD_CONF_OPTS += -Dwavpack=disabled endif define MPD_INSTALL_EXTRA_FILES @@ -290,4 +300,4 @@ define MPD_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S95mpd endef -$(eval $(autotools-package)) +$(eval $(meson-package))