From patchwork Sun Jul 11 12:19:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Jean Texier X-Patchwork-Id: 1503641 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=G4JiPNpY; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GN5Yt3Kvsz9sWS for ; Sun, 11 Jul 2021 22:19:43 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 16C04839DB; Sun, 11 Jul 2021 12:19:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UmDvf_6WwODj; Sun, 11 Jul 2021 12:19:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 5948E839BF; Sun, 11 Jul 2021 12:19:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 418421BF3EC for ; Sun, 11 Jul 2021 12:19:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 30D614013D for ; Sun, 11 Jul 2021 12:19:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rHfz9LGib6SR for ; Sun, 11 Jul 2021 12:19:34 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by smtp2.osuosl.org (Postfix) with ESMTPS id 1A0A7400D0 for ; Sun, 11 Jul 2021 12:19:34 +0000 (UTC) Received: by mail-wm1-x329.google.com with SMTP id q18-20020a1ce9120000b02901f259f3a250so9397105wmc.2 for ; Sun, 11 Jul 2021 05:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mlJcYxiSMbxCeoSF7ZItpQr3YieYsDG7TcJ+irTdICk=; b=G4JiPNpY7W46j1UOOtuWRtuUS7hqsIFUy7fYv0jsOsGEgVMlhIDun612EDeQc/GQkU QqwSGNiHX4SKVfGn691xpkf+zmo8ONBRA0YEFpb5Tv07VqaYvee4RpB4a2Xq/SaG/Sw3 beoQfErqsZF1shu6UU9+Qzje97ePvSi0WIIRefN1nzDJD9V9bLe/3AdKsSwWiISihuiL oZnvFqpEVFpqKXz9hLaqIKX3pnmaiM6Nq09eEQOKP4FTa/XNmCTbJeZvezn2qs6/oesY eAMKW3Mld+xmuC1RoZQIcRVBwkNVL50YB3IhhrK05vxVKlzjbTuOAdEvFlDG8Zl+q0kU wKxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mlJcYxiSMbxCeoSF7ZItpQr3YieYsDG7TcJ+irTdICk=; b=mJUD+LzRd/etzA4bBoPL0ulbHIBvliTPDa6uc5HGtZxtq58PRA/LiJRgZdCjKhJPgm hyy/y/jvZBEATYwFne/NugFe7WbZ7KgsneXfZSPCEC8pRuOGlTF4ucmHcfPC6wcKbtaG TdfnMcjvmeZuTo1TAOBr9GdyqFFZf+T6PNwoY+NfLmJ40CjV6Hl+LEmnnRstTG1NbwPA NWYXn7k+e/diJePiPCEPe8HhbRbd6e97YU9jQMvdLD7xbEmT83zGgaHwFop8PHh7pe70 Ky2qC6yvUNaNvtNQGsy8HfwW/Csvv2v/+uTk5xXgN/J8Qzvrk5eWtMgEpIpo9BE8vYre 7vxQ== X-Gm-Message-State: AOAM532a1PhBMqSO88bZisyb6HRcZNCEx5t/kV20Ha45XIVe71xqTkkJ 4htn69knI1kvkIgmzBKGgCnDB4kOu0I= X-Google-Smtp-Source: ABdhPJzkLacc0IhEdMITy9lK+T/Kgkuju9qkHW4TcKAkPArf9OzYFOej/W9DvF36cTZDSWt4TtebKw== X-Received: by 2002:a05:600c:b48:: with SMTP id k8mr9349942wmr.180.1626005972006; Sun, 11 Jul 2021 05:19:32 -0700 (PDT) Received: from menoah.home ([2a01:cb19:190:c500:6124:3cc5:cb2b:3a19]) by smtp.gmail.com with ESMTPSA id v11sm10948710wrs.4.2021.07.11.05.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 05:19:31 -0700 (PDT) From: Pierre-Jean Texier To: buildroot@buildroot.org Date: Sun, 11 Jul 2021 14:19:29 +0200 Message-Id: <20210711121929.24767-1-texier.pj2@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/sbc: bump to version 1.5 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: Pierre-Jean Texier Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" We need to backport a commit to fix a build failure on non-x86. Also update hash file formatting (2 spaces) Signed-off-by: Pierre-Jean Texier --- ...-sbc_primitives-Fix-build-on-non-x86.patch | 49 +++++++++++++++++++ package/sbc/sbc.hash | 6 +-- package/sbc/sbc.mk | 2 +- 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 package/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch diff --git a/package/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch b/package/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch new file mode 100644 index 0000000000..3ed73ebd88 --- /dev/null +++ b/package/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch @@ -0,0 +1,49 @@ +From 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf Mon Sep 17 00:00:00 2001 +From: Marius Bakke +Date: Tue, 22 Dec 2020 11:04:26 +0000 +Subject: [PATCH] sbc_primitives: Fix build on non-x86. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Don't call __builtin_cpu_init unless targeting i386 or x86_64. +Otherwise we get an error at link time: + + CC sbc/sbc_primitives.lo +sbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’: +sbc/sbc_primitives.c:596:2: warning: implicit declaration of function ‘__builtin_cpu_init’; did you mean ‘__builtin_irint’? [-Wimplicit-function-declaration] +[...] + CCLD src/sbcdec +ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives': +sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init' + +Signed-off-by: Pierre-Jean Texier +[Upstream status: backport from upstream commit 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf] + +--- + sbc/sbc_primitives.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c +index 97a75be..09c214a 100644 +--- a/sbc/sbc_primitives.c ++++ b/sbc/sbc_primitives.c +@@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j( + + static void sbc_init_primitives_x86(struct sbc_encoder_state *state) + { ++#if defined(__x86_64__) || defined(__i386__) + __builtin_cpu_init(); + + #ifdef SBC_BUILD_WITH_MMX_SUPPORT +@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state) + if (__builtin_cpu_supports("sse4.2")) + sbc_init_primitives_sse(state); + #endif ++#endif + } + + /* +-- +2.17.1 + diff --git a/package/sbc/sbc.hash b/package/sbc/sbc.hash index d703f23437..beb3b232a8 100644 --- a/package/sbc/sbc.hash +++ b/package/sbc/sbc.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256 518bf46e6bb3dc808a95e1eabad26fdebe8a099c1e781c27ed7fca6c2f4a54c9 sbc-1.4.tar.xz +sha256 0cbad69823a99e8421fe0700e8cf9eeb8fa0c1ad28e8dbc2182b3353507931d2 sbc-1.5.tar.xz # sha256 locally computed -sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING -sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB +sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING +sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/sbc/sbc.mk b/package/sbc/sbc.mk index 73e4aceb85..af5cf291a3 100644 --- a/package/sbc/sbc.mk +++ b/package/sbc/sbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -SBC_VERSION = 1.4 +SBC_VERSION = 1.5 SBC_SOURCE = sbc-$(SBC_VERSION).tar.xz SBC_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth SBC_INSTALL_STAGING = YES