From patchwork Fri Aug 16 09:06:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Kiagiadakis X-Patchwork-Id: 1973135 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WlbpP0Lgtz1yYl for ; Fri, 16 Aug 2024 19:11:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id EE5626067E; Fri, 16 Aug 2024 09:11:38 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id MjwHy6a2WjcE; Fri, 16 Aug 2024 09:11:38 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 09AAF60698 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 09AAF60698; Fri, 16 Aug 2024 09:11:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 0A4EB1BF292 for ; Fri, 16 Aug 2024 09:11:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id EC9E660698 for ; Fri, 16 Aug 2024 09:11:35 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 5Z70Avw-aRSt for ; Fri, 16 Aug 2024 09:11:35 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=136.143.188.14; helo=sender4-op-o14.zoho.com; envelope-from=george.kiagiadakis@collabora.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 1589C6067E DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1589C6067E Received: from sender4-op-o14.zoho.com (sender4-op-o14.zoho.com [136.143.188.14]) by smtp3.osuosl.org (Postfix) with ESMTPS id 1589C6067E for ; Fri, 16 Aug 2024 09:11:34 +0000 (UTC) Delivered-To: george.kiagiadakis@collabora.com ARC-Seal: i=1; a=rsa-sha256; t=1723799491; cv=none; d=zohomail.com; s=zohoarc; b=l3C1UyjdjrPIZxkwyCtHbKNtg8kX3H+NRImhQHQMSkt40r+Xm/V1YXKjED0SeQ1vLGfsRiBb/hoOOIqmG5OxxSGt5LuyUQoUekDhmnYq105lq+TTGJWlou6llPgON21YB+vPfgDKSzn1Xi7yqln2xi07itP6TwOwj6kvEDimA9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723799491; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=rp5aHGkxNQ7J9e2usjnooHFiCTZLju4Lyle8BUbv9TQ=; b=kjXYAg1OkNxZBeIJHeso+KopIcBP0v97veSVHYDsTmqsmDyU1rIS/9VALFeKzEw0OZ0eyOev3ydRyTbo3E7hsTkz7AYeYKvJ2oOu64NtiHzSP6L3HD2EQ8YZYW1xQI1xQ9K4QXyIB8kIdhLP6d3HhB3tsxIcbCJSH71/2bAwePs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=george.kiagiadakis@collabora.com; dmarc=pass header.from= Received: by mx.zohomail.com with SMTPS id 1723799490118950.3205293237243; Fri, 16 Aug 2024 02:11:30 -0700 (PDT) From: George Kiagiadakis To: buildroot@buildroot.org Date: Fri, 16 Aug 2024 12:06:57 +0300 Message-ID: <20240816091119.38036-1-george.kiagiadakis@collabora.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-ZohoMailClient: External X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1723799491; s=zohomail; d=collabora.com; i=george.kiagiadakis@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=rp5aHGkxNQ7J9e2usjnooHFiCTZLju4Lyle8BUbv9TQ=; b=CCs5s/vcaLMP20OlqI9Uv46Amcj7hXEHtZfYYhCoS7/PAAGOycKvjNTKb3VR8YZr L9IOXdg4ufDgtmYlQ4jln95Ue99EEOk8DtFSUMNSJmlZPpnjMwwGZEFqx/uO0Fl3uoi 7GqKPxYolwV2jhMNP8lKk2aEX1Uo/Pk16zgjEnds= X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=collabora.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=collabora.com header.i=george.kiagiadakis@collabora.com header.a=rsa-sha256 header.s=zohomail header.b=CCs5s/vc Subject: [Buildroot] [PATCH v2 1/4] package/pipewire: bump version to 1.2.2 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: James Hilliard , George Kiagiadakis Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Disabled roc & snap dependencies, which don't exist in buildroot. Added libselinux dependency option. Added missing libglib2 dependency pulled by the bluez plugin. Signed-off-by: George Kiagiadakis --- Changes since v1: - None package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 3370d86641..8ea3890675 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 2b6e0c4d2e544f5030fa7f4ecf1edd9e5eed15dda1c97135e8a1fded9f3425fe pipewire-0.3.81.tar.bz2 +sha256 b3817f7b9abf14a6dbcb6ea18b186ba8771f703cb395e4a38366b4e051c40054 pipewire-1.2.2.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index f0f3cd847c..8df2d03758 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.81 +PIPEWIRE_VERSION = 1.2.2 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) @@ -34,10 +34,12 @@ PIPEWIRE_CONF_OPTS += \ -Dsession-managers=[] \ -Dlegacy-rtkit=false \ -Davb=disabled \ + -Droc=disabled \ -Dlibcanberra=disabled \ -Dlibmysofa=disabled \ -Dlibffado=disabled \ - -Dflatpak=disabled + -Dflatpak=disabled \ + -Dsnap=disabled ifeq ($(BR2_PACKAGE_DBUS),y) PIPEWIRE_CONF_OPTS += -Ddbus=enabled @@ -105,9 +107,9 @@ else PIPEWIRE_CONF_OPTS += -Dpipewire-jack=disabled -Djack=disabled endif -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy) +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC)$(BR2_PACKAGE_LIBGLIB2),yyy) PIPEWIRE_CONF_OPTS += -Dbluez5=enabled -PIPEWIRE_DEPENDENCIES += bluez5_utils sbc +PIPEWIRE_DEPENDENCIES += bluez5_utils sbc libglib2 ifeq ($(BR2_PACKAGE_MODEM_MANAGER),y) PIPEWIRE_CONF_OPTS += -Dbluez5-backend-native-mm=enabled PIPEWIRE_DEPENDENCIES += modem-manager @@ -239,6 +241,13 @@ else PIPEWIRE_CONF_OPTS += -Draop=disabled endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +PIPEWIRE_CONF_OPTS += -Dselinux=enabled +PIPEWIRE_DEPENDENCIES += libselinux +else +PIPEWIRE_CONF_OPTS += -Dselinux=disabled +endif + define PIPEWIRE_USERS pipewire -1 pipewire -1 * - - audio,video PipeWire System Daemon endef From patchwork Fri Aug 16 09:06:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: George Kiagiadakis X-Patchwork-Id: 1973136 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.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wlbpd4vYmz1yYl for ; Fri, 16 Aug 2024 19:11:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 64EFF60B53; Fri, 16 Aug 2024 09:11:51 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id SCJGC7OQSR2j; Fri, 16 Aug 2024 09:11:49 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F35C760698 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id F35C760698; Fri, 16 Aug 2024 09:11:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 590B91BF292 for ; Fri, 16 Aug 2024 09:11:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 462204024A for ; Fri, 16 Aug 2024 09:11:47 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id SDdpuCikvWZx for ; Fri, 16 Aug 2024 09:11:45 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=136.143.188.14; helo=sender4-op-o14.zoho.com; envelope-from=george.kiagiadakis@collabora.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org CA4784023B DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CA4784023B Received: from sender4-op-o14.zoho.com (sender4-op-o14.zoho.com [136.143.188.14]) by smtp4.osuosl.org (Postfix) with ESMTPS id CA4784023B for ; Fri, 16 Aug 2024 09:11:45 +0000 (UTC) Delivered-To: george.kiagiadakis@collabora.com ARC-Seal: i=1; a=rsa-sha256; t=1723799504; cv=none; d=zohomail.com; s=zohoarc; b=kUWqNJt94iSt9xcoF+oh6Y53hZJNfr6ESTzKNMGniv0SxY88Z+dxT9I0ORE5rGJhBhK4+mkTsO/wBLAUcSjIQkxA6iq84WmTcsa4BjeDq/PTJr2XdJZaacEa6R1kaLCYE+8BLbz7xsh3ehEeb3KlyEc8PMoiQiYbUWXWVYb68uI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723799504; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=WZP/Piqk73QU97kMjOVXmgS3KylKSg8+kThBVNQ/Z3g=; b=C5gf6v/sJ9HuepNiOX6R1M42VgO/SIkqBirN8N6CjgQ/qqUDWd31TdsgWd6KPzjkCZktvGQafIaONa8Dl7lt6AWnR9dPRJ9+23kwN0pxckub7PA9vlZAIj4EXfc7HAHxUuts66BWFrEERhwPxTFXY2WPSGnTI0SpY/38XU0rddE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=george.kiagiadakis@collabora.com; dmarc=pass header.from= Received: by mx.zohomail.com with SMTPS id 1723799502698597.3353204968453; Fri, 16 Aug 2024 02:11:42 -0700 (PDT) From: George Kiagiadakis To: buildroot@buildroot.org Date: Fri, 16 Aug 2024 12:06:58 +0300 Message-ID: <20240816091119.38036-2-george.kiagiadakis@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240816091119.38036-1-george.kiagiadakis@collabora.com> References: <20240816091119.38036-1-george.kiagiadakis@collabora.com> MIME-Version: 1.0 X-ZohoMailClient: External X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1723799504; s=zohomail; d=collabora.com; i=george.kiagiadakis@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=WZP/Piqk73QU97kMjOVXmgS3KylKSg8+kThBVNQ/Z3g=; b=bTKObYAFprGsZ2yxrxvAGRQFaTlZWTiktEKVWXoefYxHAKVDVd0a6AtspMn6KTJI qIOu0G106+6VSRoep8RKjoUowJPcezIfYM4Cq8/0FK8Cys+7SuoLG5uNmMm6GYiJWwF uhf0fW/0n5eNN3bemCYVCHZN8VzjTDXwYiCQG1Lk= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=collabora.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=collabora.com header.i=george.kiagiadakis@collabora.com header.a=rsa-sha256 header.s=zohomail header.b=bTKObYAF Subject: [Buildroot] [PATCH v2 2/4] package/wireplumber: bump version to 0.5.5 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: James Hilliard , George Kiagiadakis Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Drop patch that was backported from upstream. Explicitly disable elogind, which doesn't exist in buildroot. Also disable building tests. Signed-off-by: George Kiagiadakis --- Changes since v1: - None .../0001-fix-non-x86_64-architectures.patch | 215 ------------------ package/wireplumber/wireplumber.hash | 2 +- package/wireplumber/wireplumber.mk | 4 +- 3 files changed, 4 insertions(+), 217 deletions(-) delete mode 100644 package/wireplumber/0001-fix-non-x86_64-architectures.patch diff --git a/package/wireplumber/0001-fix-non-x86_64-architectures.patch b/package/wireplumber/0001-fix-non-x86_64-architectures.patch deleted file mode 100644 index 19c34e4e1a..0000000000 --- a/package/wireplumber/0001-fix-non-x86_64-architectures.patch +++ /dev/null @@ -1,215 +0,0 @@ -From e429db7e8c266045aee25e153fb2308bd61fe233 Mon Sep 17 00:00:00 2001 -From: Julian Bouzas -Date: Wed, 9 Feb 2022 07:59:59 -0500 -Subject: [PATCH] spa-json: fix va_list APIs for different architectures - -The va_list type might not always be a pointer in some architectures, so we -cannot guarantee it will be modified after using it for a second time in another -function. This fixes the issue by using macros so args does not get copied, and -always gets modified when using it more than once. - -Signed-off-by: Théo Lebrun -Upstream: https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 ---- - lib/wp/spa-json.c | 156 ++++++++++++++++++++++++---------------------- - 1 file changed, 80 insertions(+), 76 deletions(-) - -diff --git a/lib/wp/spa-json.c b/lib/wp/spa-json.c -index f14f395d..c5e59a3e 100644 ---- a/lib/wp/spa-json.c -+++ b/lib/wp/spa-json.c -@@ -363,33 +363,33 @@ wp_spa_json_new_string (const gchar *value) - wp_spa_json_builder_new_formatted ("\"%s\"", value)); - } - --static void --wp_spa_json_builder_add_value (WpSpaJsonBuilder *self, const gchar *fmt, -- va_list args) --{ -- switch (*fmt) { -- case 'n': -- wp_spa_json_builder_add_null (self); -- break; -- case 'b': -- wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); -- break; -- case 'i': -- wp_spa_json_builder_add_int (self, va_arg(args, gint)); -- break; -- case 'f': -- wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); -- break; -- case 's': -- wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); -- break; -- case 'J': -- wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); -- break; -- default: -- return; -- } --} -+/* Args is not a pointer in some architectures, so this needs to be a macro to -+ * avoid args being copied */ -+#define wp_spa_json_builder_add_value(self,fmt,args) \ -+do { \ -+ switch (*fmt) { \ -+ case 'n': \ -+ wp_spa_json_builder_add_null (self); \ -+ break; \ -+ case 'b': \ -+ wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); \ -+ break; \ -+ case 'i': \ -+ wp_spa_json_builder_add_int (self, va_arg(args, gint)); \ -+ break; \ -+ case 'f': \ -+ wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); \ -+ break; \ -+ case 's': \ -+ wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); \ -+ break; \ -+ case 'J': \ -+ wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); \ -+ break; \ -+ default: \ -+ break; \ -+ } \ -+} while(false) - - /*! - * \brief Creates a spa json of type array -@@ -724,48 +724,46 @@ wp_spa_json_parse_object_valist (WpSpaJson *self, va_list args) - return res; - } - --static gboolean --wp_spa_json_parse_value (const gchar *data, int len, const gchar *fmt, -- va_list args) --{ -- switch (*fmt) { -- case 'n': -- if (!spa_json_is_null (data, len)) -- return FALSE; -- break; -- case 'b': -- if (!wp_spa_json_parse_boolean_internal (data, len, -- va_arg(args, gboolean *))) -- return FALSE; -- break; -- case 'i': -- if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) -- return FALSE; -- break; -- case 'f': -- if (spa_json_parse_float (data, len, -- (float *)va_arg(args, double *)) < 0) -- return FALSE; -- break; -- case 's': { -- gchar *str = wp_spa_json_parse_string_internal (data, len); -- if (!str) -- return FALSE; -- *va_arg(args, gchar **) = str; -- break; -- } -- case 'J': { -- WpSpaJson *j = wp_spa_json_new (data, len); -- if (!j) -- return FALSE; -- *va_arg(args, WpSpaJson **) = j; -- break; -- } -- default: -- return FALSE; -- } -- return TRUE; --} -+/* Args is not a pointer in some architectures, so this needs to be a macro to -+ * avoid args being copied */ -+#define wp_spa_json_parse_value(data,len,fmt,args) \ -+do { \ -+ switch (*fmt) { \ -+ case 'n': \ -+ if (!spa_json_is_null (data, len)) \ -+ return FALSE; \ -+ break; \ -+ case 'b': \ -+ if (!wp_spa_json_parse_boolean_internal (data, len, \ -+ va_arg(args, gboolean *))) \ -+ return FALSE; \ -+ break; \ -+ case 'i': \ -+ if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) \ -+ return FALSE; \ -+ break; \ -+ case 'f': \ -+ if (spa_json_parse_float (data, len, va_arg(args, float *)) < 0) \ -+ return FALSE; \ -+ break; \ -+ case 's': { \ -+ gchar *str = wp_spa_json_parse_string_internal (data, len); \ -+ if (!str) \ -+ return FALSE; \ -+ *va_arg(args, gchar **) = str; \ -+ break; \ -+ } \ -+ case 'J': { \ -+ WpSpaJson *j = wp_spa_json_new (data, len); \ -+ if (!j) \ -+ return FALSE; \ -+ *va_arg(args, WpSpaJson **) = j; \ -+ break; \ -+ } \ -+ default: \ -+ return FALSE; \ -+ } \ -+} while(false) - - /*! - * \brief Parses the object property values of a spa json object -@@ -827,8 +825,7 @@ wp_spa_json_object_get_valist (WpSpaJson *self, va_list args) - value = g_value_get_boxed (&item); - - if (g_strcmp0 (key_str, lookup_key) == 0) { -- if (!wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args)) -- return FALSE; -+ wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args); - lookup_key = va_arg(args, const gchar *); - if (!lookup_key) - return TRUE; -@@ -1366,9 +1363,12 @@ gboolean - wp_spa_json_parser_get_value (WpSpaJsonParser *self, const gchar *fmt, - va_list args) - { -- return wp_spa_json_parser_advance (self) && -- wp_spa_json_parse_value (self->curr.cur, -- self->curr.end - self->curr.cur, fmt, args); -+ if (wp_spa_json_parser_advance (self)) { -+ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, -+ fmt, args); -+ return TRUE; -+ } -+ return FALSE; - } - - /*! -@@ -1419,9 +1419,13 @@ wp_spa_json_parser_get_valist (WpSpaJsonParser *self, va_list args) - if (!format) - return TRUE; - -- /* parse value */ -- if (!wp_spa_json_parser_get_value (self, format, args)) -+ /* advance */ -+ if (!wp_spa_json_parser_advance (self)) - return FALSE; -+ -+ /* parse value */ -+ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, -+ format, args); - } while (TRUE); - - return FALSE; --- -GitLab - diff --git a/package/wireplumber/wireplumber.hash b/package/wireplumber/wireplumber.hash index 206d7d15af..7fff34a7a7 100644 --- a/package/wireplumber/wireplumber.hash +++ b/package/wireplumber/wireplumber.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6429e8a95e355ce21b4c4f1a5ebc769f037e8dbeec51905ad909ce609a38d0ce wireplumber-0.4.8.tar.bz2 +sha256 4926399cffe3da12f1338e1feec53ef944e86ae7c719384bff87490d7e3edbc7 wireplumber-0.5.5.tar.bz2 sha256 ff2eb9af5b05d92ac3a38cffcad27582ef555a31ff1781e1c1d4e087f77c9c81 LICENSE diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 763e3d7639..c8cc1ad106 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREPLUMBER_VERSION = 0.4.8 +WIREPLUMBER_VERSION = 0.5.5 WIREPLUMBER_SOURCE = wireplumber-$(WIREPLUMBER_VERSION).tar.bz2 WIREPLUMBER_SITE = https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION) WIREPLUMBER_LICENSE = MIT @@ -13,6 +13,8 @@ WIREPLUMBER_DEPENDENCIES = host-pkgconf pipewire libglib2 lua WIREPLUMBER_CONF_OPTS = \ -Ddoc=disabled \ + -Dtests=false \ + -Delogind=disabled \ -Dsystem-lua=true \ -Dsystem-lua-version= From patchwork Fri Aug 16 09:06:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Kiagiadakis X-Patchwork-Id: 1973137 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.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wlbph6qHdz1yYl for ; Fri, 16 Aug 2024 19:11:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3580960D72; Fri, 16 Aug 2024 09:11:55 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id arlpKkM-GuaI; Fri, 16 Aug 2024 09:11:52 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0202360698 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 0202360698; Fri, 16 Aug 2024 09:11:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BA5CC1BF292 for ; Fri, 16 Aug 2024 09:11:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A70874024A for ; Fri, 16 Aug 2024 09:11:50 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ni8702l0qjNK for ; Fri, 16 Aug 2024 09:11:50 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=136.143.188.14; helo=sender4-op-o14.zoho.com; envelope-from=george.kiagiadakis@collabora.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org C3BFE4023B DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C3BFE4023B Received: from sender4-op-o14.zoho.com (sender4-op-o14.zoho.com [136.143.188.14]) by smtp4.osuosl.org (Postfix) with ESMTPS id C3BFE4023B for ; Fri, 16 Aug 2024 09:11:49 +0000 (UTC) Delivered-To: george.kiagiadakis@collabora.com ARC-Seal: i=1; a=rsa-sha256; t=1723799507; cv=none; d=zohomail.com; s=zohoarc; b=Nt3S47/YewDryQzC/Glo65tL8joG0D0LMCcnFVlVRThVgekHvXYHgFvqvKmyoLvz9PCiQz71R0PqOEx1QCxNwSI50Bpx7RwdU7GWFf8NvHFLP/EGccD1XFrrn9paEZLy8cCwK7n8o/VOWrhXIiNw7NZf5HPpd+Tu6DQrFGcZTHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723799507; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=EB/flI9TB6yjU4+vQuQYXxxZBn/nBqdRZzbrDXZajE8=; b=FuOaPv9XHtN/1F3PFDvqgtvDNBY9cuyJJh854q5HbS2YmtcGvDR1d0kRKfMHP1e5fs7nXQpYxO2DR5/t2BcdxKXh1qf2NZ8uwLMM0Y9j877I/v/eNQAGzZtTqc9Cck4a8m9ICrt8mMHdu3ai8WeOOMckvEGw3KSIJWIlaF4Neqs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=george.kiagiadakis@collabora.com; dmarc=pass header.from= Received: by mx.zohomail.com with SMTPS id 172379950675787.14161291424273; Fri, 16 Aug 2024 02:11:46 -0700 (PDT) From: George Kiagiadakis To: buildroot@buildroot.org Date: Fri, 16 Aug 2024 12:06:59 +0300 Message-ID: <20240816091119.38036-3-george.kiagiadakis@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240816091119.38036-1-george.kiagiadakis@collabora.com> References: <20240816091119.38036-1-george.kiagiadakis@collabora.com> MIME-Version: 1.0 X-ZohoMailClient: External X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1723799507; s=zohomail; d=collabora.com; i=george.kiagiadakis@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=EB/flI9TB6yjU4+vQuQYXxxZBn/nBqdRZzbrDXZajE8=; b=gsed/1xSqe6Mw4iBpohUFStW8rRIWVpip7aYLKIgudYot1BMGuKK9modDuSwgTNg nKjWoKxyNJC73thwcliaWQC/Q+r5OHX+064rahBTdUendfMBWOHX6R8myuX5ZUW0Ddi Mf1CoEdLxFw1hZqwzOY+hqPhsyo3cDbypS0pVFM0= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=collabora.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=george.kiagiadakis@collabora.com header.a=rsa-sha256 header.s=zohomail header.b=gsed/1xS Subject: [Buildroot] [PATCH v2 3/4] package: move wireplumber from Graphics to Audio/Video 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: James Hilliard , George Kiagiadakis Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" WirePlumber is a PipeWire session manager, essential to the operation of PipeWire in most use cases. It is not a graphical application, nor does it support graphics in any way. It is only there to support PipeWire and it should be kept together with PipeWire in the menus. Signed-off-by: George Kiagiadakis --- Changes since v1: - Reworked to move the option instead of adding it a second time in the Audio/Video section package/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in b/package/Config.in index f2c63ffb6e..8a39e82de4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -61,6 +61,7 @@ menu "Audio and video applications" source "package/vlc/Config.in" source "package/vorbis-tools/Config.in" source "package/wavpack/Config.in" + source "package/wireplumber/Config.in" source "package/yavta/Config.in" source "package/ympd/Config.in" source "package/zynaddsubfx/Config.in" @@ -1763,7 +1764,6 @@ menu "Graphics" source "package/waylandpp/Config.in" source "package/webkitgtk/Config.in" source "package/webp/Config.in" - source "package/wireplumber/Config.in" source "package/wlroots/Config.in" source "package/woff2/Config.in" source "package/wpebackend-fdo/Config.in" From patchwork Fri Aug 16 09:07:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Kiagiadakis X-Patchwork-Id: 1973138 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wlbpl4mjkz1yYl for ; Fri, 16 Aug 2024 19:11:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D8A0160B6F; Fri, 16 Aug 2024 09:11:57 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Fd3fRi9DJuFm; Fri, 16 Aug 2024 09:11:57 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org CE36060E35 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id CE36060E35; Fri, 16 Aug 2024 09:11:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3291E1BF292 for ; Fri, 16 Aug 2024 09:11:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 2A26F4025A for ; Fri, 16 Aug 2024 09:11:55 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id SfI1owJy-AGM for ; Fri, 16 Aug 2024 09:11:54 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=136.143.188.14; helo=sender4-op-o14.zoho.com; envelope-from=george.kiagiadakis@collabora.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 58A0E4023B DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 58A0E4023B Received: from sender4-op-o14.zoho.com (sender4-op-o14.zoho.com [136.143.188.14]) by smtp4.osuosl.org (Postfix) with ESMTPS id 58A0E4023B for ; Fri, 16 Aug 2024 09:11:54 +0000 (UTC) Delivered-To: george.kiagiadakis@collabora.com ARC-Seal: i=1; a=rsa-sha256; t=1723799511; cv=none; d=zohomail.com; s=zohoarc; b=MbB8VqEEbBVIqloeT9cxiUQ/ivMcJFBzG98ekGPoA/oa40bCLk/8sMe6r9jf2kcQraKkdx1osx0LWI/MZmf2HUyHc+KtW/hKyLQScfIR5Nd7vaUfIJYzXxiJB8qKB+NYqGHTeMcYpOAs8o8S3ioFCi4W22IXBc7aEaMpfYs+agM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723799511; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=HSVtMQlVaFwmSgYiAngEtqaWeFelofDKXDqGVVSxkWc=; b=Lzthi9aRY+nf8r4mcXX1K0Lzx2cjkVE9XC63wVtKm7Cgsg/coZNJLXZoUdy20Vc5S9cAvdCEFOaJYgE2QBvnNt4rjTUloh3njsIhcEFJ5x0rheww5XZYDwsj1MGaMsSHQGR69yY/C1naVFKysOSH+MNNYCDg+BH2fXXn2Dj/jd4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=george.kiagiadakis@collabora.com; dmarc=pass header.from= Received: by mx.zohomail.com with SMTPS id 1723799509748168.41032865215925; Fri, 16 Aug 2024 02:11:49 -0700 (PDT) From: George Kiagiadakis To: buildroot@buildroot.org Date: Fri, 16 Aug 2024 12:07:00 +0300 Message-ID: <20240816091119.38036-4-george.kiagiadakis@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240816091119.38036-1-george.kiagiadakis@collabora.com> References: <20240816091119.38036-1-george.kiagiadakis@collabora.com> MIME-Version: 1.0 X-ZohoMailClient: External X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1723799511; s=zohomail; d=collabora.com; i=george.kiagiadakis@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=HSVtMQlVaFwmSgYiAngEtqaWeFelofDKXDqGVVSxkWc=; b=VrXe3WLu2JqnaVlPp0we1gDDVJRa/E3+Pux+gF/FTCX5+UqH6mPt2C/s9E6FRox3 ekQX7GezRPjA9tsoVKEm2dpoBb+4YGDewvouNHUGZoY8c1FzWUpalwLnmKDOuM7inmR u8G55BDC1uXuSewr/4otTWzzuyveQWFYCyFoMPKQ= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=collabora.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=george.kiagiadakis@collabora.com header.a=rsa-sha256 header.s=zohomail header.b=VrXe3WLu Subject: [Buildroot] [PATCH v2 4/4] package/pipewire: add option to build the AAC codec in spa-bluez 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: James Hilliard , George Kiagiadakis Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This allows for more precise control of the AAC codec feature, instead of it being silently enabled if the fdk-aac library happens to be built earlier, or disabled otherwise. Also remove the -Dbluez5-codec-opus=disabled option in the case where the entire bluez5 integration is disabled. -Dbluez5=disabled implies that all codecs are also disabled. Signed-off-by: George Kiagiadakis --- Changes since v1: - Added details about the change in the commit message package/pipewire/pipewire.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 8df2d03758..eb86a98494 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -122,8 +122,14 @@ PIPEWIRE_DEPENDENCIES += opus else PIPEWIRE_CONF_OPTS += -Dbluez5-codec-opus=disabled endif +ifeq ($(BR2_PACKAGE_FDK_AAC),y) +PIPEWIRE_CONF_OPTS += -Dbluez5-codec-aac=enabled +PIPEWIRE_DEPENDENCIES += fdk-aac else -PIPEWIRE_CONF_OPTS += -Dbluez5=disabled -Dbluez5-codec-opus=disabled +PIPEWIRE_CONF_OPTS += -Dbluez5-codec-aac=disabled +endif +else +PIPEWIRE_CONF_OPTS += -Dbluez5=disabled endif ifeq ($(BR2_PACKAGE_FFMPEG),y)