From d456e2abbba618d20be98b523301282544355f29 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Tue, 9 Nov 2021 19:53:26 +0100 Subject: [PATCH] pipewire: fix patch whitespace --- .../pipewire/patches/autostart-media-session.patch | 6 +++--- srcpkgs/pipewire/patches/fix-neon-detection.patch | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch index a5c1168ae6ec..c5753a3719c2 100644 --- a/srcpkgs/pipewire/patches/autostart-media-session.patch +++ b/srcpkgs/pipewire/patches/autostart-media-session.patch @@ -6,12 +6,12 @@ diff --git a/src/daemon/pipewire.conf.in.orig b/src/daemon/pipewire.conf.in index 95632c2..ab0b097 100644 --- a/src/daemon/pipewire.conf.in.orig +++ b/src/daemon/pipewire.conf.in -@@ -235,7 +235,7 @@ context.exec = [ +@@ -236,7 +236,7 @@ # but it is better to start it as a systemd service. # Run the session manager with -h for options. # -- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } -+ { path = "@session_manager_path@" args = "@session_manager_args@" } +- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } ++ { path = "@session_manager_path@" args = "@session_manager_args@" } # # You can optionally start the pulseaudio-server here as well # but it is better to start it as a systemd service. diff --git a/srcpkgs/pipewire/patches/fix-neon-detection.patch b/srcpkgs/pipewire/patches/fix-neon-detection.patch index 597a4a3d30cd..cf65d1b4cdfd 100644 --- a/srcpkgs/pipewire/patches/fix-neon-detection.patch +++ b/srcpkgs/pipewire/patches/fix-neon-detection.patch @@ -5,9 +5,9 @@ diff --git meson.build meson.build index 29b4b892..0d048a1f 100644 --- a/meson.build +++ b/meson.build -@@ -99,36 +99,16 @@ have_avx = cc.has_argument(avx_args) +@@ -116,37 +116,17 @@ have_avx2 = cc.has_argument(avx2_args) - + have_neon = false -if host_machine.cpu_family() == 'aarch64' - if cc.compiles(''' @@ -15,9 +15,9 @@ index 29b4b892..0d048a1f 100644 - int main () { - float *s; - asm volatile( -- " ld1 { v0.4s }, [%[s]], #16\n" +- " ld1 { v0.4s }, [%[s]], #16\n" - " fcvtzs v0.4s, v0.4s, #31\n" -- : [s] "+r" (s) : :); +- : [s] "+r" (s) : :); - } - ''', - name : 'aarch64 Neon Support') @@ -33,7 +33,7 @@ index 29b4b892..0d048a1f 100644 - asm volatile( - " vld1.32 { q0 }, [%[s]]!\n" - " vcvt.s32.f32 q0, q0, #31\n" -- : [s] "+r" (s) : :); +- : [s] "+r" (s) : :); - } - ''', - args: '-mfpu=neon', @@ -53,3 +53,4 @@ index 29b4b892..0d048a1f 100644 + have_neon = true endif endif +