[Buildroot] [git commit] package/pipewire: remove already-applied patch and renumber

Arnout Vandecappelle (Essensium/Mind) arnout at mind.be
Sun Jun 20 16:15:50 UTC 2021


commit: https://git.buildroot.net/buildroot/commit/?id=026d447c2c2a3b0092c45c2afa3d17284aa31276
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Drop 0002-meson.build-fix-build-with-uclibc-ng.patch which is not needed
since 0dda1a44a0859fc15b318e493c151ca1d807ba24 which has been merged in
master in commit 8d07baab43b5624ad6d73ee58f5a9d4ab8b27049

While at it, renumber
0002-meson-fix-getrandom-detection-for-uclibc.patch to
0001-meson-fix-getrandom-detection-for-uclibc.patch (patch number was
wrong since its addition in commit
b003cb5d16de9c92baba7dea7a6626c71cefc4fb) and also renumber remaining
patch

Fixes:
 - http://autobuild.buildroot.org/results/4d442c61b137ca1bd2dd32c6802ff0251d39e7a5

Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
 ...meson-fix-getrandom-detection-for-uclibc.patch} |  0
 ...c.patch => 0002-fix-linking-with-latomic.patch} |  0
 ...0002-meson.build-fix-build-with-uclibc-ng.patch | 52 ----------------------
 3 files changed, 52 deletions(-)

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 <fontaine.fabrice at gmail.com>
-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 <fontaine.fabrice at gmail.com>
-[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 <sys/mman.h>', args : [ '-
-   cdata.set('HAVE_MEMFD_CREATE', 1)
- endif
- 
--if cc.has_function('getrandom', prefix : '#include <sys/random.h>')
-+if cc.has_function('getrandom', prefix : '#include <sys/random.h>', args : [ '-D_GNU_SOURCE' ])
-   cdata.set('HAVE_GETRANDOM', 1)
- endif
- 
--- 
-2.30.2
-


More information about the buildroot mailing list