[PR PATCH] pipewire: fix patch whitespace

[PR PATCH] pipewire: fix patch whitespace

[newbluemoon]

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is a new pull request by newbluemoon against master on the void-packages repository

https://github.com/newbluemoon/void-packages pipewire
https://github.com/void-linux/void-packages/pull/33990

pipewire: fix patch whitespace
#33917

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33990.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-33990.patch --]
[-- Type: text/x-diff, Size: 2827 bytes --]

From d456e2abbba618d20be98b523301282544355f29 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
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
+ 

Re: [PR PATCH] [Merged]: pipewire: fix patch whitespace

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1451 bytes --]

There's a merged pull request on the void-packages repository

pipewire: fix patch whitespace
https://github.com/void-linux/void-packages/pull/33990

Description:
#33917

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->