Attachment 226211 Details for Bug 256970 – v1.1 (revert upstream change)

[patch] v1.1 (revert upstream change)

bug256970.diff (text/plain), 3.64 KB, created by Jan Beich on 2021-07-04 10:41:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2021-07-04 10:41:46 UTC

Size: 3.64 KB

patch

obsolete

>From d141d6c1364c9b5d71184336da00c4c647a19cdc Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 4 Jul 2021 10:15:04 +0000
>Subject: [PATCH] multimedia/pipewire: unbreak xdg-desktop-portal-wlr after
> ea3170c51fd4
>
>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 */
>        ^
>/usr/include/sys/mount.h:68:2: error: unknown type name 'u_short'; did you mean 'short'?
>        u_short         fid_len;                /* length of data in bytes */
>        ^
>/usr/include/sys/mount.h:69:2: error: unknown type name 'u_short'; did you mean 'short'?
>        u_short         fid_data0;              /* force longword alignment */
>        ^
>/usr/include/sys/mount.h:552:2: error: unknown type name 'u_char'; did you mean 'char'?
>        u_char  ex_addrlen;             /* and the net address length */
>        ^
>/usr/include/sys/mount.h:554:2: error: unknown type name 'u_char'; did you mean 'char'?
>        u_char  ex_masklen;             /* and the smask length */
>        ^
>/usr/include/sys/mount.h:567:2: error: unknown type name 'u_char'; did you mean 'char'?
>        u_char  ex_addrlen;             /* and the net address length */
>        ^
>/usr/include/sys/mount.h:569:2: error: unknown type name 'u_char'; did you mean 'char'?
>        u_char  ex_masklen;             /* and the smask length */
>        ^
>/usr/include/sys/mount.h:585:2: error: unknown type name 'u_char'; did you mean 'char'?
>        u_char  ex_addrlen;             /* and the net address length */
>        ^
>/usr/include/sys/mount.h:587:2: error: unknown type name 'u_char'; did you mean 'char'?
>        u_char  ex_masklen;             /* and the smask length */
>        ^
>/usr/include/sys/mount.h:612:2: error: unknown type name 'u_int'
>        u_int   vfc_version;            /* ABI version number */
>        ^
>
>PR:		256970
>Approved by:	?
>---
> multimedia/pipewire/Makefile          |  1 +
> multimedia/pipewire/files/patch-posix | 23 +++++++++++++++++++++++
> 2 files changed, 24 insertions(+)
> create mode 100644 multimedia/pipewire/files/patch-posix
>
>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-posix b/multimedia/pipewire/files/patch-posix
>new file mode 100644
>index 000000000000..b346e3672a47
>--- /dev/null
>+++ b/multimedia/pipewire/files/patch-posix
>@@ -0,0 +1,23 @@
>+Revert https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/cb6dbd165a37
>+to make public API compatible with POSIX again.
>+
>+--- src/modules/module-protocol-pulse/utils.h.orig	2021-06-28 13:32:38 UTC
>++++ src/modules/module-protocol-pulse/utils.h
>+@@ -26,4 +26,6 @@
>+ #define PULSE_SERVER_UTILS_H
>+ 
>+ #include <stddef.h>
>++#include <sys/un.h>
>++#include <sys/mount.h>
>+ 
>+--- src/pipewire/utils.h.orig	2021-06-28 13:32:38 UTC
>++++ src/pipewire/utils.h
>+@@ -30,8 +30,6 @@ extern "C" {
>+ #endif
>+ 
>+ #include <string.h>
>+-#include <sys/un.h>
>+-#include <sys/mount.h>
>+ 
>+ #include <spa/utils/defs.h>
>+ #include <spa/pod/pod.h>

Actions: View | Diff

Attachments on bug 256970: 226210 | 226211 | 226225