drop unused getaffinity,memfd patches

include experimental bluetooth patches only on rawhide
This commit is contained in:
Rex Dieter 2018-05-08 14:18:50 -05:00
parent cd9151a64f
commit 4b07df9c2a
3 changed files with 7 additions and 42 deletions

View File

@ -1,15 +0,0 @@
diff -up pulseaudio-11.1/src/pulsecore/memfd-wrappers.h.glibc_memfd pulseaudio-11.1/src/pulsecore/memfd-wrappers.h
--- pulseaudio-11.1/src/pulsecore/memfd-wrappers.h.glibc_memfd 2016-08-23 07:50:11.000000000 -0500
+++ pulseaudio-11.1/src/pulsecore/memfd-wrappers.h 2018-01-22 12:30:23.322574380 -0600
@@ -33,9 +33,9 @@
* a whole conflicts with the original glibc header <fnctl.h>.
*/
-static inline int memfd_create(const char *name, unsigned int flags) {
+/* static inline int memfd_create(const char *name, unsigned int flags) {
return syscall(SYS_memfd_create, name, flags);
-}
+} */
/* memfd_create(2) flags */

View File

@ -1,12 +0,0 @@
diff -up pulseaudio-8.99.2/src/tests/once-test.c.than pulseaudio-8.99.2/src/tests/once-test.c
--- pulseaudio-8.99.2/src/tests/once-test.c.than 2016-06-22 10:20:57.127583628 -0400
+++ pulseaudio-8.99.2/src/tests/once-test.c 2016-06-22 10:59:38.905573634 -0400
@@ -70,7 +70,7 @@ static void thread_func(void *data) {
#endif
CPU_ZERO(&mask);
- CPU_SET((size_t) (pa_atomic_inc(&i_cpu) % n_cpu), &mask);
+ CPU_SET(pthread_getaffinity_np(pthread_self(), sizeof(mask), &mask), &mask);
fail_unless(pthread_setaffinity_np(pthread_self(), sizeof(mask), &mask) == 0);
#endif

View File

@ -39,7 +39,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
Release: 20%{?snap:.%{snap}git%{shortcommit}}%{?dist}
Release: 21%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@ -64,17 +64,9 @@ Patch201: pulseaudio-autostart.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1265267
Patch202: pulseaudio-9.0-disable_flat_volumes.patch
# bz#1067470, only start threads on activ CPUs
# see also https://bugs.freedesktop.org/show_bug.cgi?id=96638
Patch203: pulseaudio-8.99.2-getaffinity.patch
# upstreamed exit_idle_time solution, set to 0 in managed environments
Patch204: pulseaudio-11.1-exit_idle_time-2.patch
# workaround rawhide build failures, avoid dup'd memfd_create declaration
# https://bugs.freedesktop.org/show_bug.cgi?id=104733
Patch205: pulseaudio-11.1-glibc_memfd.patch
# disable autospawn
Patch206: pulseaudio-11.1-autospawn_disable.patch
@ -282,8 +274,8 @@ This package contains GDM integration hooks for the PulseAudio sound server.
## upstream patches
## upstreamable patches
# rawhide-only, for now, on hadess' advice --rex
%if 0%{?fedora} > 27
# experimental, rawhide only
%if 0%{?fedora} > 28
%patch101 -p1
%patch102 -p1
%patch103 -p1
@ -292,11 +284,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
%patch204 -p1 -b .exit_idle_time
#if 0%{?fedora} > 27
#patch205 -p1 -b .glibc_memfd
#endif
%if 0%{?systemd_activation}
%patch206 -p1 -b .autospawn_disable
%endif
@ -684,6 +672,10 @@ exit 0
%changelog
* Tue May 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 11.1-21
- drop unused getaffinity,memfd patches
- include experimental bluetooth patches only on rawhide
* Mon Apr 23 2018 Hans de Goede <hdegoede@redhat.com> - 11.1-20
- Fix Intel LPE HDMI problems:
- Update to upstream gitsnapshot which contains a fix for the crash caused