From 2d6ef54f778aab464b075f847048c163d0b140e9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 22 2018 22:06:17 +0000 Subject: more build fixes - enable webrtc support for all archs - getaffinity.patch (no longer needed) - make tests non-fatal on i686 (in case anyone wonders, it fails the same with or without the aforementioned getaffinity.patch) --- diff --git a/pulseaudio.spec b/pulseaudio.spec index f9760ad..2121106 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -6,12 +6,10 @@ #global gitcommit aec811798cd883a454b9b5cd82c77831906bbd2d #global shortcommit (c=%{gitcommit}; echo ${c:0:5}) -# FIXME/TODO: webrtc support currently FTBFS on f28+ -%if 0%{?fedora} < 28 -%ifarch x86_64 %{arm} +# webrtc bits go wonky without this +# see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/ +%undefine _strict_symbol_defs_build %global with_webrtc 1 -%endif -%endif # https://bugzilla.redhat.com/983606 %global _hardened_build 1 @@ -296,7 +294,7 @@ This package contains GDM integration hooks for the PulseAudio sound server. %patch201 -p1 -b .autostart %patch202 -p1 -b .disable_flat_volumes -%patch203 -p1 -b .affinity +#patch203 -p1 -b .affinity %patch204 -p1 -b .exit_idle_time %if 0%{?fedora} > 27 %patch205 -p1 -b .glibc_memfd @@ -385,7 +383,11 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/pulse-%{pa_major}/modules/module-detect.so %check %if 0%{?tests} -make %{?_smp_mflags} check +%ifarch %{ix86} +# FIXME: i686 fails at least one: cpu-remap-test +%global tests_nonfatal ||: +%endif +make %{?_smp_mflags} check %{?tests_nonfatal} %endif @@ -643,7 +645,10 @@ exit 0 %changelog * Mon Jan 08 2018 Rex Dieter - 11.1-8 - exit-idle-time = 4 (#1510301) -- f28+ ftbfs: memfd_create conflicts, disable webrtc support +- f28+ ftbfs: memfd_create conflicts +- drop getaffinity.patch (no longer needed) +- enable webrtc support for all archs +- make tests non-fatal on i686 * Mon Dec 04 2017 Rex Dieter - 11.1-7 - backport 'pa_sink_input_assert_ref()' crashfix (#1472285)