From patchwork Tue Jun 20 17:38:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Hardin X-Patchwork-Id: 1797490 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qlv4K1k4Yz20XS for ; Wed, 21 Jun 2023 03:38:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E4FC640901; Tue, 20 Jun 2023 17:38:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E4FC640901 X-Virus-Scanned: amavisd-new at osuosl.org 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 JEYcvzfFd5Fd; Tue, 20 Jun 2023 17:38:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 215C241768; Tue, 20 Jun 2023 17:38:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 215C241768 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D722A1BF83B for ; Tue, 20 Jun 2023 17:38:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B03DC82314 for ; Tue, 20 Jun 2023 17:38:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B03DC82314 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 mGGXgQ1hM6pr for ; Tue, 20 Jun 2023 17:38:19 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0515D82312 Received: from mail-yw1-x112b.google.com (mail-yw1-x112b.google.com [IPv6:2607:f8b0:4864:20::112b]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0515D82312 for ; Tue, 20 Jun 2023 17:38:18 +0000 (UTC) Received: by mail-yw1-x112b.google.com with SMTP id 00721157ae682-56ff9cc91b4so56638997b3.0 for ; Tue, 20 Jun 2023 10:38:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687282697; x=1689874697; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MRwyGUlA7E5yfH/hdG19JBebdZncrnhz07lyfT/Wch4=; b=XQ+BpppnueBqMD+k9yUZ7FVxuaioXNlJMCY38dpJPjgEVqEgZ1Bwge1a6zGLV4jvmc +2Rj+3eTRT21WdtFurYV/D+lYejvOszykZm4dCHSDzZ/netgcefUY4N3XXMfxBdQLgO7 UWghdzI8cEK+wXi+g1JwMNWeaEaxIaXCmTSUcyekRD6ZjL8r3cXZ4lqnViCzNuEAnWv9 t6dq19s8jhTWKQySc4kiYpDkEAc5uNQG8Y3WaTU2beAd6reKvzXczTmwr6Ewo2yZ2cdA NiRv3sfhatnkrM9Cf/deTdtUSnvQ8RmQIMbnetRG1gWUyLSnIvgFmMk991N4XnE7hQFB AQEg== X-Gm-Message-State: AC+VfDwYr75XEHbBB5ghtq3czV32FJW6LtroAcdMBVxfgVMvCUitH84M VCvlPnl23HUD7dnN+WEBTKFH304eORw= X-Google-Smtp-Source: ACHHUZ728F8QuWFs7ODk9c7qfFwc8LnDX7g2m5j02lSUMa0ngUoos6VdCoG5+Q3+oaWloWc57a/b7Q== X-Received: by 2002:a81:6887:0:b0:565:cf47:7331 with SMTP id d129-20020a816887000000b00565cf477331mr15321932ywc.2.1687282697503; Tue, 20 Jun 2023 10:38:17 -0700 (PDT) Received: from CP-WR7J591QQC.attlocal.net (108-193-1-150.lightspeed.sntcca.sbcglobal.net. [108.193.1.150]) by smtp.gmail.com with ESMTPSA id m125-20020a817183000000b0056d4c86b639sm609213ywc.9.2023.06.20.10.38.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 20 Jun 2023 10:38:16 -0700 (PDT) From: Charles Hardin To: buildroot@buildroot.org Date: Tue, 20 Jun 2023 10:38:12 -0700 Message-Id: <20230620173813.4590-1-ckhardin@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687282697; x=1689874697; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MRwyGUlA7E5yfH/hdG19JBebdZncrnhz07lyfT/Wch4=; b=cXxDHGDDCw/4dm++Nn/UPWb4h3gtb1LRDqrathUpAM6pg1Z7XSZMGEn+Y89Mvm4qyR l4+/XRgfCJ5P0y3vkVb92WAPdr7jK0KQVfFS3csSwFgzEsWLfTddkLoyUYmLfa53CFGp bLrxxWQaWTf7m737fdQ2SYDM793qwUTrYR3UQuSrIdjcV0+/m801vwxi8eb4gqC+QlXv IMhl3J6kBXE0k3u/AhLsEtg6BVVIS++hM5WhGqdlPFhGXYhzpaGZgVmvWgau9+hS+gxa BfmTRETF1w5yXUOMELUislsr7Kr8nZkHJc29RvqVlvlgE1htFSpzyiqHwJQmyo2FC5fc ytAQ== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=cXxDHGDD Subject: [Buildroot] [PATCH 1/2] package/alsa-plugins: fix dependencies for the alsa plugin package X-BeenThere: buildroot@buildroot.org 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: Charles Hardin Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The alsa-utils will remove and create the /usr/share/alsa dir as a whole and since the alsa plugins needs to add config into this same directory it should come after those install steps. Also, the bluez alsa needs the plugins installed to find them during the configuration phases - so, interlock the plugins when configured. Signed-off-by: Charles Hardin --- package/alsa-plugins/alsa-plugins.mk | 4 ++++ package/bluez-alsa/bluez-alsa.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index 5728ebfe37..d23a81c5ee 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -20,6 +20,10 @@ ALSA_PLUGINS_CONF_OPTS = \ --disable-maemo-resource-manager \ --with-speex=no +ifeq ($(BR2_PACKAGE_ALSA_UTILS),y) +ALSA_PLUGINS_DEPENDENCIES += alsa-utils +endif + ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) ALSA_PLUGINS_CONF_OPTS += --enable-samplerate ALSA_PLUGINS_DEPENDENCIES += libsamplerate diff --git a/package/bluez-alsa/bluez-alsa.mk b/package/bluez-alsa/bluez-alsa.mk index 83dfce6177..649810b0ad 100644 --- a/package/bluez-alsa/bluez-alsa.mk +++ b/package/bluez-alsa/bluez-alsa.mk @@ -20,6 +20,10 @@ BLUEZ_ALSA_CONF_OPTS = \ --with-alsaplugindir=/usr/lib/alsa-lib \ --with-alsaconfdir=/etc/alsa/conf.d +ifeq ($(BR2_PACKAGE_ALSA_PLUGINS),y) +BLUEZ_ALSA_DEPENDENCIES += alsa-plugins +endif + ifeq ($(BR2_PACKAGE_FDK_AAC),y) BLUEZ_ALSA_DEPENDENCIES += fdk-aac BLUEZ_ALSA_CONF_OPTS += --enable-aac From patchwork Tue Jun 20 17:38:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Hardin X-Patchwork-Id: 1797491 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qlv4Y68DWz20XS for ; Wed, 21 Jun 2023 03:38:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 955A94176D; Tue, 20 Jun 2023 17:38:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 955A94176D X-Virus-Scanned: amavisd-new at osuosl.org 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 GsXNVb-OLjC8; Tue, 20 Jun 2023 17:38:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id C2D2E41778; Tue, 20 Jun 2023 17:38:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C2D2E41778 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 40CB11BF83B for ; Tue, 20 Jun 2023 17:38:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1A80A405FC for ; Tue, 20 Jun 2023 17:38:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 1A80A405FC X-Virus-Scanned: amavisd-new at osuosl.org 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 om7H_WZMlQPJ for ; Tue, 20 Jun 2023 17:38:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 17EB040901 Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by smtp2.osuosl.org (Postfix) with ESMTPS id 17EB040901 for ; Tue, 20 Jun 2023 17:38:21 +0000 (UTC) Received: by mail-ot1-x335.google.com with SMTP id 46e09a7af769-6b2c3ec38f0so3171245a34.1 for ; Tue, 20 Jun 2023 10:38:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687282699; x=1689874699; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iPAB3kwB+mBkrz+d8ntumvf2vmw7CCBWfKIo9HTm8w8=; b=M6oCswkEzeySGEawmIQRFvroPT/Sxs7pTiQYE9cdXNELAfcPt3dkYB8Vm9U5kEat3f 4iJWGUsqE72NxPSDcc4xzkwd1csnZ1E3EHNzf3lJKceDqQdoQIHUQkBklj2ghp/LHMjA WwAXycR2soAD84xMynM2FC4PCJEGWp7ft0qYi/lCk6uXb8WpbJF/WqejJ24UGlaQrRm4 CRedwhsYEer9QWNpHkMxl639rBgfnvG855Ysyp0Q1Lw26O1iIVNN/xxD9hXsG2WbwJ29 +dtNEiutvuLfah0QbdUJyH1CpGhGDN4o6rjRJcFr76VFsaaLgxxEHSY2+RQ5nXsQ7w70 r7EA== X-Gm-Message-State: AC+VfDyx6KQw2VhXcQtG2plprn2m5rFCu7H4sp5jLAeMm4HrblniugDZ A/TyTLc0mnKcf6Gjj/9N1jvZtUtpM4c= X-Google-Smtp-Source: ACHHUZ5NyrjX7ngJLgvhDMy3F9CXFd4OCNuMbLQH+wUvCMixGFk1vu25f6whptxn4f+RLIqyTbnpiw== X-Received: by 2002:a05:6358:5110:b0:131:9c:2dd4 with SMTP id 16-20020a056358511000b00131009c2dd4mr871998rwi.9.1687282699494; Tue, 20 Jun 2023 10:38:19 -0700 (PDT) Received: from CP-WR7J591QQC.attlocal.net (108-193-1-150.lightspeed.sntcca.sbcglobal.net. [108.193.1.150]) by smtp.gmail.com with ESMTPSA id m125-20020a817183000000b0056d4c86b639sm609213ywc.9.2023.06.20.10.38.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 20 Jun 2023 10:38:19 -0700 (PDT) From: Charles Hardin To: buildroot@buildroot.org Date: Tue, 20 Jun 2023 10:38:13 -0700 Message-Id: <20230620173813.4590-2-ckhardin@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230620173813.4590-1-ckhardin@gmail.com> References: <20230620173813.4590-1-ckhardin@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687282699; x=1689874699; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iPAB3kwB+mBkrz+d8ntumvf2vmw7CCBWfKIo9HTm8w8=; b=iwzjoCCjUY/LIkjEsnZo0BjfWm5fq6Xx+657LF5gSuFQfAxbggMHgmARB7AHL43CTC i4NFlgsbcvQbzxy9KCUJ5fhk0jQPtxQYnpADCWD5DIBVbkBebfSc2NVKOp7t48Ykmplx tlFTdj5+0miw/+5l+w0VoOhkn+rjrgVka/osbnHdBzi/RXzL9zwf97OwaDKeULRDubzN C21w1ZeuNFIG3mOKqrMSJph6suKSnRTMbx2lg6m/rMyvI/8dVXv26eZVqpevwX1nGLzG xX0H29YhKxgOoe5wChN+3N3Kf3+PqoRqe0EghstmYFR9Bu+o3U1SRcIo12bu5eBQf568 a9fg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=iwzjoCCj Subject: [Buildroot] [PATCH 2/2] package/alsa-plugins: require libsamplerate for the plugins X-BeenThere: buildroot@buildroot.org 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: Charles Hardin Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" During the execution of the alsa plugins on a test application, the library would not function without samplerate being enabled and present. So, this is a patch to just include the samplerate since the latest versions seem to require it for the plugins to work. There might be another fix instead of this patch, but this got the sound to play for the bluez alsa stack as expected. Signed-off-by: Charles Hardin --- package/alsa-plugins/Config.in | 1 + package/alsa-plugins/alsa-plugins.mk | 22 ++++++---------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/package/alsa-plugins/Config.in b/package/alsa-plugins/Config.in index ee0fb4c1d5..e85ff218dd 100644 --- a/package/alsa-plugins/Config.in +++ b/package/alsa-plugins/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_ALSA_PLUGINS bool "alsa-plugins" depends on BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_ALSA_LIB_HWDEP + select BR2_PACKAGE_LIBSAMPLERATE help Advanced Linux Sound Architecture Plugins diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index d23a81c5ee..8046720297 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -7,30 +7,20 @@ ALSA_PLUGINS_VERSION = 1.2.7.1 ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins -ALSA_PLUGINS_LICENSE = LGPL-2.1+ -ALSA_PLUGINS_LICENSE_FILES = COPYING -ALSA_PLUGINS_DEPENDENCIES = host-pkgconf alsa-lib +ALSA_PLUGINS_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (samplerate) +ALSA_PLUGINS_LICENSE_FILES = COPYING COPYING.GPL +ALSA_PLUGINS_DEPENDENCIES = host-pkgconf alsa-lib libsamplerate ALSA_PLUGINS_CONF_OPTS = \ + --enable-samplerate \ --disable-jack \ --disable-usbstream \ --disable-pulseaudio \ - --disable-libav \ - --disable-maemo-plugin \ - --disable-maemo-resource-manager \ - --with-speex=no + --disable-avcodec \ + --with-speex=builtin ifeq ($(BR2_PACKAGE_ALSA_UTILS),y) ALSA_PLUGINS_DEPENDENCIES += alsa-utils endif -ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) -ALSA_PLUGINS_CONF_OPTS += --enable-samplerate -ALSA_PLUGINS_DEPENDENCIES += libsamplerate -ALSA_PLUGINS_LICENSE += , GPL-2.0+ (samplerate plugin) -ALSA_PLUGINS_LICENSE_FILES += COPYING.GPL -else -ALSA_PLUGINS_CONF_OPTS += --disable-samplerate -endif - $(eval $(autotools-package))