From fa04e24df135cb658b6f85d026551d601b17574a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 4 Jan 2019 13:15:19 +0100 Subject: [PATCH] Add patch to avoid invalid conversion error with C++ compilers --- ...-conversion-error-with-C-compilators.patch | 25 +++++++++++++++++++ pipewire.spec | 8 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-Avoid-invalid-conversion-error-with-C-compilators.patch diff --git a/0001-Avoid-invalid-conversion-error-with-C-compilators.patch b/0001-Avoid-invalid-conversion-error-with-C-compilators.patch new file mode 100644 index 0000000..380878f --- /dev/null +++ b/0001-Avoid-invalid-conversion-error-with-C-compilators.patch @@ -0,0 +1,25 @@ +From 371da358d1580dc06218d18a12a99611cac39e4e Mon Sep 17 00:00:00 2001 +From: Jan Grulich +Date: Wed, 2 Jan 2019 10:05:40 +0100 +Subject: [PATCH] Avoid invalid conversion error with C++ compilators + +--- + src/pipewire/utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pipewire/utils.h b/src/pipewire/utils.h +index 2ce9fdde..7262ff42 100644 +--- a/src/pipewire/utils.h ++++ b/src/pipewire/utils.h +@@ -58,7 +58,7 @@ pw_spa_pod_copy(const struct spa_pod *pod) + return NULL; + + size = SPA_POD_SIZE(pod); +- if ((c = malloc(size)) == NULL) ++ if ((c = (struct spa_pod *) malloc(size)) == NULL) + return NULL; + + return (struct spa_pod *) memcpy(c, pod, size); +-- +2.19.2 + diff --git a/pipewire.spec b/pipewire.spec index 27c0540..74c7911 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -15,7 +15,7 @@ Name: pipewire Summary: Media Sharing Server Version: 0.2.5 -Release: 1%{?snap:.%{snap}git%{shortcommit}}%{?dist} +Release: 2%{?snap:.%{snap}git%{shortcommit}}%{?dist} License: LGPLv2+ URL: https://pipewire.org/ %if 0%{?gitrel} @@ -27,6 +27,7 @@ Source0: https://github.com/PipeWire/pipewire/archive/%{version}.tar.gz %endif ## upstream patches +Patch0: 0001-Avoid-invalid-conversion-error-with-C-compilators.patch ## upstreamable patches @@ -103,6 +104,8 @@ This package contains command line utilities for the PipeWire media server. %prep %setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}} +%patch0 -p1 -b .0000 + %build %meson -D docs=true -D man=true -D gstreamer=enabled -D systemd=true %meson_build @@ -164,6 +167,9 @@ exit 0 %{_bindir}/spa-inspect %changelog +* Fri Jan 04 2019 Wim Taymans - 0.2.5-2 +- Add patch to avoid invalid conversion error with C++ compilers + * Thu Nov 22 2018 Wim Taymans - 0.2.5-1 - Update to 0.2.5