Update to 0.1.7

Add to build when memfd_create is already defined
This commit is contained in:
Wim Taymans 2017-11-24 17:26:16 +01:00
parent 08102e5353
commit 02b8014a00
2 changed files with 37 additions and 0 deletions

View File

@ -0,0 +1,32 @@
From 78fa6b851fc5f3ed669cb1487aee315ad6a45389 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 24 Nov 2017 17:23:40 +0100
Subject: [PATCH] Only define memfd_create when not already defined
---
src/pipewire/memfd-wrappers.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/pipewire/memfd-wrappers.h b/src/pipewire/memfd-wrappers.h
index 05958fe..75ed628 100644
--- a/src/pipewire/memfd-wrappers.h
+++ b/src/pipewire/memfd-wrappers.h
@@ -20,6 +20,7 @@
#include <sys/syscall.h>
#include <fcntl.h>
+#ifndef memfd_create
/*
* No glibc wrappers exist for memfd_create(2), so provide our own.
*
@@ -32,6 +33,7 @@ static inline int
memfd_create(const char *name, unsigned int flags) {
return syscall(SYS_memfd_create, name, flags);
}
+#endif
/* memfd_create(2) flags */
--
2.14.3

View File

@ -26,6 +26,8 @@ Source0: http://freedesktop.org/software/pipewire/releases/pipewire-%{ver
%endif
## upstream patches
Patch1: 0001-Only-define-memfd_create-when-not-already-defined.patch
## upstreamable patches
@ -96,6 +98,8 @@ This package contains command line utilities for the PipeWire media server.
%prep
%setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
%patch1 -p1 -b .0001
%build
%meson -D enable_docs=true -D enable_man=true -D enable_gstreamer=true
%meson_build
@ -158,6 +162,7 @@ exit 0
%changelog
* Fri Nov 24 2017 Wim Taymans <wtaymans@redhat.com> - 0.1.7-1
- Update to 0.1.7
- Add to build when memfd_create is already defined
* Fri Nov 03 2017 Wim Taymans <wtaymans@redhat.com> - 0.1.6-1
- Update to 0.1.6