From patchwork Sat Jun 19 06:49:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asaf Kahlon X-Patchwork-Id: 1494600 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=140.211.166.133; helo=smtp2.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=hvABAF2Q; dkim-atps=neutral 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G6RH60WTVz9sCD for ; Sat, 19 Jun 2021 16:49:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 52C434011B; Sat, 19 Jun 2021 06:49:33 +0000 (UTC) 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 POUaT_NJgBot; Sat, 19 Jun 2021 06:49:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 81E044011F; Sat, 19 Jun 2021 06:49:31 +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 9F48F1BF425 for ; Sat, 19 Jun 2021 06:49:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9BD7A4011F for ; Sat, 19 Jun 2021 06:49:30 +0000 (UTC) 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 pMmyWGB3zoz8 for ; Sat, 19 Jun 2021 06:49:29 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by smtp2.osuosl.org (Postfix) with ESMTPS id 4BE4D4011B for ; Sat, 19 Jun 2021 06:49:29 +0000 (UTC) Received: by mail-wm1-x32c.google.com with SMTP id w13so296919wmc.3 for ; Fri, 18 Jun 2021 23:49:29 -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=wETlA02x3cuP8cs4/3skIVSslvHrgJKcQkADSzhsD14=; b=hvABAF2QrKArHoNLj8y+CoWydEf57JEn2nERrC1Ji/an3FmTFcUv9tiRP1YVa8IA4Q 87c8LwntLZ1D3ZjF/5liPJ2mt4xIr6JP9DSBX/lsNY08zUMe4ahzY+/GrWCsbaezOWh3 XPIdkChzBOnAfjSAQdRj9yfLJpnIp6vOSGZrNKdyq3o09TaTSD2OifSjzO9oZLlaEmMn dPYUzsiyKskIu3KbMQLyDQCQ3Sa+WS/ON4utnL1LD5Jd4K650F+lwW0RrfFjXkIqQ+2a jO3b/kEw5FtVkkfApyWymKdjF4DQ0kzGIidgWRpXgjUUCB/vxpNJ1/ZHG5WOKzT53CdJ qQ+w== 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=wETlA02x3cuP8cs4/3skIVSslvHrgJKcQkADSzhsD14=; b=Rls4+kL1TBQRbvzJG2xrfPflfpn1+aVcTnhdq8gFRcQN48fFIagU1oGXuMyPe29gpu RnhgZ9V7udio4X8rHu0/+JUq7mZKcMl9+NlBgMePaqIA1VaQkWG0LdLRzOjgClpDWPK6 +NOx0k34WrJMMtwILuYuHFHH996B0iMnLkyLLd3JUbmt/wmqXLIYL8QrG5OugwLJrh5b neQ/fFCoWfhPiGA4J/9jdZtgPFSV1hfDWSOiezY+AF0YOdPkhkyuinwiF726/qMPCg/4 jiXYbJdq9Aw2x7BmlvI1sFWZVpRH7RkxHCS9uJRpvVqDKpgJEB/2n+HI0CU9sMhsQxJq /yMw== X-Gm-Message-State: AOAM530xDERBOjy8yRC2aMt3NY0jHCJxQ75IP0YfC0Dg1/WTZpnkL8UM I23IZYHhDwsk7Fzlh8GSwxqFgqHPsSkskw== X-Google-Smtp-Source: ABdhPJyA0YYaIhMAnDIkz/nYvZU/xWBQIVtGCwHXPd5SiKucPipXhJFuKS+nkAKIpIZmadulb3i5ww== X-Received: by 2002:a1c:f014:: with SMTP id a20mr14649218wmb.67.1624085367192; Fri, 18 Jun 2021 23:49:27 -0700 (PDT) Received: from asaf.. ([2a10:8002:6b25:0:65ca:6034:100d:9715]) by smtp.gmail.com with ESMTPSA id n10sm10246442wri.77.2021.06.18.23.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jun 2021 23:49:26 -0700 (PDT) From: Asaf Kahlon To: buildroot@buildroot.org Date: Sat, 19 Jun 2021 09:49:22 +0300 Message-Id: <20210619064922.134185-1-asafka7@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/pipewire: remove already-applied patch (and renumber) 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: Asaf Kahlon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.net/results/a6f96a11490462dfed615a69dbfab0980e6b0ebd/ Signed-off-by: Asaf Kahlon --- ...-fix-getrandom-detection-for-uclibc.patch} | 0 ...ch => 0002-fix-linking-with-latomic.patch} | 0 ...meson.build-fix-build-with-uclibc-ng.patch | 52 ------------------- 3 files changed, 52 deletions(-) rename package/pipewire/{0002-meson-fix-getrandom-detection-for-uclibc.patch => 0001-meson-fix-getrandom-detection-for-uclibc.patch} (100%) rename package/pipewire/{0003-fix-linking-with-latomic.patch => 0002-fix-linking-with-latomic.patch} (100%) delete mode 100644 package/pipewire/0002-meson.build-fix-build-with-uclibc-ng.patch diff --git a/package/pipewire/0002-meson-fix-getrandom-detection-for-uclibc.patch b/package/pipewire/0001-meson-fix-getrandom-detection-for-uclibc.patch similarity index 100% rename from package/pipewire/0002-meson-fix-getrandom-detection-for-uclibc.patch rename to package/pipewire/0001-meson-fix-getrandom-detection-for-uclibc.patch diff --git a/package/pipewire/0003-fix-linking-with-latomic.patch b/package/pipewire/0002-fix-linking-with-latomic.patch similarity index 100% rename from package/pipewire/0003-fix-linking-with-latomic.patch rename to package/pipewire/0002-fix-linking-with-latomic.patch diff --git a/package/pipewire/0002-meson.build-fix-build-with-uclibc-ng.patch b/package/pipewire/0002-meson.build-fix-build-with-uclibc-ng.patch deleted file mode 100644 index 36b14d3f16..0000000000 --- a/package/pipewire/0002-meson.build-fix-build-with-uclibc-ng.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 8f1de87381d270a8f4e5927187ae0466a9c9504a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 4 May 2021 22:56:54 +0200 -Subject: [PATCH] meson.build: fix build with uclibc-ng - -Build with uclib-ng fails since commit -a4b0b9afe5a782a7f4a8fe153ecf51bcb0180ae3 on: - -FAILED: src/pipewire/libpipewire-0.3.so.0.326.0.p/impl-core.c.o -/srv/storage/autobuild/run/instance-2/output-1/host/bin/mips64el-linux-gcc -Isrc/pipewire/libpipewire-0.3.so.0.326.0.p -Isrc/pipewire -I../src/pipewire -Isrc -I../src -I. -I.. -Ispa/include -I../spa/include -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -Wextra -Wpedantic -std=gnu99 -O3 -fvisibility=hidden -Werror=suggest-attribute=format -Wsign-compare -Wpointer-arith -Wpointer-sign -Wformat -Wformat-security -Wimplicit-fallthrough -Wmissing-braces -Wtype-limits -Wvariadic-macros -Wno-missing-field-initializers -Wno-unused-parameter -Wno-pedantic -Wold-style-declaration -Wunused-result -DFASTPATH -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -fPIC -pthread -DHAVE_CONFIG_H -D_GNU_SOURCE -D_POSIX_C_SOURCE -MD -MQ src/pipewire/libpipewire-0.3.so.0.326.0.p/impl-core.c.o -MF src/pipewire/libpipewire-0.3.so.0.326.0.p/impl-core.c.o.d -o src/pipewire/libpipewire-0.3.so.0.326.0.p/impl-core.c.o -c ../src/pipewire/impl-core.c -../src/pipewire/impl-core.c:54:9: error: conflicting types for 'getrandom' - ssize_t getrandom(void *buf, size_t buflen, unsigned int flags) { - ^~~~~~~~~ -In file included from ../src/pipewire/impl-core.c:34: -/srv/storage/autobuild/run/instance-2/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:28:12: note: previous declaration of 'getrandom' was here - extern int getrandom(void *__buf, size_t count, unsigned int flags) - ^~~~~~~~~ - -Fix this build failure by adding -D_GNU_SOURCE as getrandom is protected -by: - -if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU - -Extracted from: - - https://github.com/wbx-github/uclibc-ng/blob/master/libc/sysdeps/linux/common/sys/random.h - -Fixes: - - http://autobuild.buildroot.org/results/a45f0ee009d90cef867dee4b1093225610fa10df - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/649] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 0a9963fb..11b63c08 100644 ---- a/meson.build -+++ b/meson.build -@@ -274,7 +274,7 @@ if cc.has_function('memfd_create', prefix : '#include ', args : [ '- - cdata.set('HAVE_MEMFD_CREATE', 1) - endif - --if cc.has_function('getrandom', prefix : '#include ') -+if cc.has_function('getrandom', prefix : '#include ', args : [ '-D_GNU_SOURCE' ]) - cdata.set('HAVE_GETRANDOM', 1) - endif - --- -2.30.2 -