[PR PATCH] New package: pulseaudio-modules-bt-1.4

[PaperMountainStudio <PaperMountainStudio@users.noreply.github.com>]

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

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

https://github.com/PaperMountainStudio/void-packages 0001-pulseaudio-build-with-disable-force-preopen.patch
https://github.com/void-linux/void-packages/pull/25693

New package: pulseaudio-modules-bt-1.4
pulseaudio-modules-bt replaces some files from pulseaudio, so there is a conflict. How should this conflict be handled so that when user installs this package, files from it are used?

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-pulseaudio-build-with-disable-force-preopen.patch-25693.patch --]
[-- Type: text/x-diff, Size: 2924 bytes --]

From cff4800d41846836cf422725d10a91401b5da4be Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 17 Oct 2020 18:24:49 +0200
Subject: [PATCH 1/2] pulseaudio: build with --disable-force-preopen

---
 srcpkgs/pulseaudio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 391c187bd83..8f4c3c81d73 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=13.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
  --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc
@@ -9,7 +9,7 @@ configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
  --disable-gtk3 --enable-bluez5 --disable-bluez5-ofono-headset --disable-systemd-login
  --disable-systemd-daemon --disable-systemd-journal --enable-webrtc-aec
  --with-bash-completion-dir=/usr/share/bash-completion/completions
- --enable-bluez5-native-headset"
+ --enable-bluez5-native-headset --disable-force-preopen"
 hostmakedepends="automake gettext libtool orc-devel perl-XML-Parser pkg-config"
 makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
  libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel

From 9c1960310b6da2896020b3284b9d152f33bf621b Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 17 Oct 2020 18:26:43 +0200
Subject: [PATCH 2/2] New package: pulseaudio-modules-bt-1.4

---
 srcpkgs/pulseaudio-modules-bt/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/pulseaudio-modules-bt/template

diff --git a/srcpkgs/pulseaudio-modules-bt/template b/srcpkgs/pulseaudio-modules-bt/template
new file mode 100644
index 00000000000..ed46ced486d
--- /dev/null
+++ b/srcpkgs/pulseaudio-modules-bt/template
@@ -0,0 +1,23 @@
+# Template file for 'pulseaudio-modules-bt'
+pkgname=pulseaudio-modules-bt
+_pulse_version=13.0
+version=1.4
+revision=1
+build_style=cmake
+hostmakedepends="bluez dbus cmake pkg-config git"
+makedepends="pulseaudio-devel sbc-devel fdk-aac-devel libbluetooth-devel
+ ffmpeg-devel libltdl-devel"
+depends="pulseaudio bluez dbus sbc fdk-aac libbluetooth"
+short_desc="AptX, aptX HD, AAC codecs support to PulseAudio"
+maintainer="Paper <paper@tilde.institute>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/EHfive/pulseaudio-modules-bt"
+distfiles="${homepage}/archive/v${version}.tar.gz
+ ${FREEDESKTOP_SITE}/pulseaudio/releases/pulseaudio-${_pulse_version}.tar.xz"
+checksum="72f8ffa46f842c2637b4d51d6db88a013002737acd36abb5f44ad049e8ccdf13
+961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057"
+
+pre_build() {
+	rmdir pa || true
+	ln -s ../pulseaudio-${_pulse_version} pa
+}