Attachment 226225 Details for Bug 256970 – v2

[patch] v2

0001-multimedia-pipewire-unbreak-xdg-desktop-portal-wlr-a.patch (text/plain), 2.90 KB, created by Evgeniy Khramtsov on 2021-07-04 19:03:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Evgeniy Khramtsov

Created: 2021-07-04 19:03:15 UTC

Size: 2.90 KB

patch

obsolete

>From a2070006583101c9606a54d35d0bce1eb1ed9408 Mon Sep 17 00:00:00 2001
>From: Evgeniy Khramtsov <evgeniy@khramtsov.org>
>Date: Sun, 4 Jul 2021 21:57:11 +0300
>Subject: [PATCH] multimedia/pipewire: unbreak xdg-desktop-portal-wlr after
> ea3170c51fd4
>
>In 0.3.31 update ( ports ea3170c51fd4)
>https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/cb6dbd165a37
>made public API incompatible with consumers using _POSIX_SOURCE,
>_POSIX_C_SOURCE or _XOPEN_SOURCE: <sys/mount.h> isn't standalone
>but depends on BSD-specific types in <sys/types.h> which are hidden
>when POSIX compliance is requested. xdg-desktop-portal-wlr passes
>-D_POSIX_C_SOURCE=200809L via meson.build which works for its own code
>and all other dependencies.
>
>In file included from ../src/core/main.c:7:
>In file included from /usr/local/include/pipewire-0.3/pipewire/pipewire.h:35:
>In file included from /usr/local/include/pipewire-0.3/pipewire/client.h:35:
>In file included from /usr/local/include/pipewire-0.3/pipewire/proxy.h:108:
>In file included from /usr/local/include/pipewire-0.3/pipewire/protocol.h:48:
>In file included from /usr/local/include/pipewire-0.3/pipewire/utils.h:34:
>In file included from /usr/include/sys/mount.h:38:
>/usr/include/sys/ucred.h:99:2: error: unknown type name 'u_int'
>        u_int   cr_version;             /* structure layout version */
>        ^
>In file included from ../src/core/main.c:7:
>In file included from /usr/local/include/pipewire-0.3/pipewire/pipewire.h:35:
>In file included from /usr/local/include/pipewire-0.3/pipewire/client.h:35:
>In file included from /usr/local/include/pipewire-0.3/pipewire/proxy.h:108:
>In file included from /usr/local/include/pipewire-0.3/pipewire/protocol.h:48:
>In file included from /usr/local/include/pipewire-0.3/pipewire/utils.h:34:
>
>Reported by: Jan Beich <jbeich@FreeBSD.org>
>PR: 256970
>---
> multimedia/pipewire/Makefile                        |  1 +
> .../pipewire/files/patch-src_pipewire_utils.h       | 13 +++++++++++++
> 2 files changed, 14 insertions(+)
> create mode 100644 multimedia/pipewire/files/patch-src_pipewire_utils.h
>
>diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
>index 09d8728ccedc..90611b126a62 100644
>--- a/multimedia/pipewire/Makefile
>+++ b/multimedia/pipewire/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	pipewire
> DISTVERSION=	0.3.31
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> 
> MAINTAINER=	arrowd@FreeBSD.org
>diff --git a/multimedia/pipewire/files/patch-src_pipewire_utils.h b/multimedia/pipewire/files/patch-src_pipewire_utils.h
>new file mode 100644
>index 000000000000..ac452416b181
>--- /dev/null
>+++ b/multimedia/pipewire/files/patch-src_pipewire_utils.h
>@@ -0,0 +1,13 @@
>+--- src/pipewire/utils.h.orig	2021-06-28 13:32:38 UTC
>++++ src/pipewire/utils.h
>+@@ -31,7 +31,9 @@ extern "C" {
>+ 
>+ #include <string.h>
>+ #include <sys/un.h>
>+-#include <sys/mount.h>
>++#ifndef _POSIX_C_SOURCE
>++# include <sys/mount.h>
>++#endif
>+ 
>+ #include <spa/utils/defs.h>
>+ #include <spa/pod/pod.h>
>-- 
>2.32.0
>

Flags:

evgeniy: maintainer-approval?

Actions: View | Diff

Attachments on bug 256970: 226210 | 226211 | 226225