From patchwork Sun Jan 24 12:29:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 572241 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 962E4140BAB for ; Sun, 24 Jan 2016 23:29:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6981E32D88; Sun, 24 Jan 2016 12:29:22 +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 QibmuW8vT2Mb; Sun, 24 Jan 2016 12:29:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AB7C232CEC; Sun, 24 Jan 2016 12:29:19 +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 71A2B1C101F for ; Sun, 24 Jan 2016 12:29:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 184528A97E for ; Sun, 24 Jan 2016 12:29:17 +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 Vt18IENIxDF3 for ; Sun, 24 Jan 2016 12:29:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout11.t-online.de (mailout11.t-online.de [194.25.134.85]) by whitealder.osuosl.org (Postfix) with ESMTPS id D7FA387096 for ; Sun, 24 Jan 2016 12:29:15 +0000 (UTC) Received: from fwd05.aul.t-online.de (fwd05.aul.t-online.de [172.20.27.149]) by mailout11.t-online.de (Postfix) with SMTP id 1807A1F06B for ; Sun, 24 Jan 2016 13:29:15 +0100 (CET) Received: from fli4l.lan.fli4l (G--tKMZpghB8QnDDbTe6Eyqj2mVvwhhSpO8aSxz-MiXaGi3Hgn8wFNQHli7Mn+MQoF@[84.191.213.30]) by fwd05.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1aNJn8-1jLOhk0; Sun, 24 Jan 2016 13:29:14 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:60244 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.86) (envelope-from ) id 1aNJn6-0004lH-My; Sun, 24 Jan 2016 13:29:13 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 24 Jan 2016 13:29:12 +0100 Message-Id: <1453638552-28416-1-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.7.0.rc3 MIME-Version: 1.0 X-ID: G--tKMZpghB8QnDDbTe6Eyqj2mVvwhhSpO8aSxz-MiXaGi3Hgn8wFNQHli7Mn+MQoF X-TOI-MSGID: 4b7a0781-4048-405c-bf9d-bdc5a301f4a0 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] package/tinyalsa: bump version to fix musl build 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" The autobuilders did not catch the error yet because they failed earlier with other packages, but I am continuing the build based on the defconfig from: http://autobuild.buildroot.net/results/6cc/6cc0f8c067e07deea688b9b97284601a596b898c/ The header-related bug In file included from mixer.c:43:0: include/sound/asound.h:337:18: error: field ‘trigger_tstamp’ has incomplete type struct timespec trigger_tstamp; ^ include/sound/asound.h:338:18: error: field ‘tstamp’ has incomplete type struct timespec tstamp; ^ was fixed with this commit: https://github.com/tinyalsa/tinyalsa/commit/c8333f8c7a4e4b9549abeef7530b2cd20a18e537 Removed 0001-tinypcminfo-make-function-pcm_get_format_name-static.patch, applied upstream: https://github.com/tinyalsa/tinyalsa/commit/7d204edfe87f4e22105bcaeb750d69ac769afdd6 Added hash. Signed-off-by: Bernd Kuhls --- ...-make-function-pcm_get_format_name-static.patch | 45 ---------------------- package/tinyalsa/tinyalsa.hash | 2 + package/tinyalsa/tinyalsa.mk | 2 +- 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch create mode 100644 package/tinyalsa/tinyalsa.hash diff --git a/package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch b/package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch deleted file mode 100644 index 4c8d48f..0000000 --- a/package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 10d82df8d920ceec4be9028a4939f96d6f407e81 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 26 Aug 2015 09:20:13 +0200 -Subject: [PATCH] tinypcminfo: make function pcm_get_format_name() static - -When building tinyalsa with gcc 5.x, the following warnings appear: - -tinypcminfo.c:97:52: warning: 'format_lookup' is static but used in inline function 'pcm_get_format_name' which is not static - return bit_index < ARRAY_SIZE(format_lookup) ? format_lookup[bit_index] : NULL; - ^ -tinypcminfo.c:97:35: warning: 'format_lookup' is static but used in inline function 'pcm_get_format_name' which is not static - return bit_index < ARRAY_SIZE(format_lookup) ? format_lookup[bit_index] : NULL; - -And the build fails with: - -tinypcminfo.o: In function `main': -tinypcminfo.c:(.text+0x2f0): undefined reference to `pcm_get_format_name' -collect2: error: ld returned 1 exit status - -To fix this, this patch marks the pcm_get_format_name() as static, -since it's anyway only used in tinypcminfo.c. - -Submitted upstream: https://github.com/tinyalsa/tinyalsa/pull/61 - -Signed-off-by: Thomas Petazzoni ---- - tinypcminfo.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tinypcminfo.c b/tinypcminfo.c -index b2d11bc..99eec34 100644 ---- a/tinypcminfo.c -+++ b/tinypcminfo.c -@@ -92,7 +92,7 @@ static const char *format_lookup[] = { - /* Returns a human readable name for the format associated with bit_index, - * NULL if bit_index is not known. - */ --inline const char *pcm_get_format_name(unsigned bit_index) -+static inline const char *pcm_get_format_name(unsigned bit_index) - { - return bit_index < ARRAY_SIZE(format_lookup) ? format_lookup[bit_index] : NULL; - } --- -2.5.0 - diff --git a/package/tinyalsa/tinyalsa.hash b/package/tinyalsa/tinyalsa.hash new file mode 100644 index 0000000..e4a584c --- /dev/null +++ b/package/tinyalsa/tinyalsa.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 fb355a1cb125c2120cfc36d0af04824c20a4301ffd7f287d4cec00583235a9de tinyalsa-ad66b45add9677c4a732fc3a020f7b5d19c38def.tar.gz diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index e470b47..c18bc7a 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYALSA_VERSION = f2a7b6d3d81bd337a540d56704b4aaa7bdb046fe +TINYALSA_VERSION = ad66b45add9677c4a732fc3a020f7b5d19c38def TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3c TINYALSA_INSTALL_STAGING = YES