patch it to use libopenaptx for now, until libfreeaptx is shipped

3 files changed, 63 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd2751b4845e..2451f41082d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pipewire-full-git
 	pkgdesc = Low-latency audio/video router and processor
-	pkgver = 0.3.31.r2.g5497d2d9
+	pkgver = 0.3.32.r58.g1216371f
 	pkgrel = 1
 	url = https://pipewire.org
 	arch = x86_64
@@ -29,7 +29,9 @@ pkgbase = pipewire-full-git
 	makedepends = vulkan-icd-loader
 	makedepends = ffmpeg
 	source = git+https://gitlab.freedesktop.org/pipewire/pipewire.git
+	source = 0001-Revert-bluez5-Use-libfreeaptx-instead-of-libopenaptx.patch
 	sha256sums = SKIP
+	sha256sums = 9545e10d4e702ee175bed80d1c030cb61ae267cc41809e107574a0e4ecba6811
 
 pkgname = pipewire-full-git
 	install = pipewire.install
diff --git a/0001-Revert-bluez5-Use-libfreeaptx-instead-of-libopenaptx.patch b/0001-Revert-bluez5-Use-libfreeaptx-instead-of-libopenaptx.patch
new file mode 100644
index 000000000000..e4aa77e95cd0
--- /dev/null
+++ b/0001-Revert-bluez5-Use-libfreeaptx-instead-of-libopenaptx.patch
@@ -0,0 +1,43 @@
+From 124ddd3c93fe638d82505181a33c411eb46ceffd Mon Sep 17 00:00:00 2001
+From: Huang-Huang Bao <eh5@sokka.cn>
+Date: Fri, 30 Jul 2021 00:16:02 +0800
+Subject: [PATCH] Revert "bluez5: Use libfreeaptx instead of libopenaptx"
+
+See https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/843.
+Revert it to use libopenaptx for now, until libfreeaptx is shipped in Arch.
+
+This reverts commit 1216371f8c06f548f8ade6468b66612f43df1436.
+---
+ spa/meson.build                      | 2 +-
+ spa/plugins/bluez5/a2dp-codec-aptx.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/spa/meson.build b/spa/meson.build
+index 483536b54..e13802e94 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
+     summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+     ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
+     summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+-    aptx_dep = dependency('libfreeaptx', required : get_option('bluez5-codec-aptx'))
++    aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
+     summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
+     summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
+diff --git a/spa/plugins/bluez5/a2dp-codec-aptx.c b/spa/plugins/bluez5/a2dp-codec-aptx.c
+index cb01ede1e..db3a43a9d 100644
+--- a/spa/plugins/bluez5/a2dp-codec-aptx.c
++++ b/spa/plugins/bluez5/a2dp-codec-aptx.c
+@@ -29,7 +29,7 @@
+ 
+ #include <spa/param/audio/format.h>
+ 
+-#include <freeaptx.h>
++#include <openaptx.h>
+ 
+ #include "defs.h"
+ #include "rtp.h"
+-- 
+2.32.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 4dd861d4741b..ae3ec29764a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=(pipewire-full-git
          pipewire-full-vulkan-git
          pipewire-full-ffmpeg-git
          )
-pkgver=0.3.31.r2.g5497d2d9
+pkgver=0.3.32.r58.g1216371f
 pkgrel=1
 pkgdesc="Low-latency audio/video router and processor"
 url="https://pipewire.org"
@@ -31,8 +31,10 @@ makedepends=(git meson doxygen xmltoman ncurses
              vulkan-headers vulkan-icd-loader
              ffmpeg
              )
-source=("git+https://gitlab.freedesktop.org/pipewire/pipewire.git")
-sha256sums=('SKIP')
+source=('git+https://gitlab.freedesktop.org/pipewire/pipewire.git'
+        '0001-Revert-bluez5-Use-libfreeaptx-instead-of-libopenaptx.patch')
+sha256sums=('SKIP'
+            '9545e10d4e702ee175bed80d1c030cb61ae267cc41809e107574a0e4ecba6811')
 
 pkgver() {
   cd $_pkgbase
@@ -41,6 +43,15 @@ pkgver() {
 
 prepare() {
   cd $_pkgbase
+
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    echo "Applying patch $src..."
+    patch -Np1 < "../$src"
+  done
 }
 
 build() {
@@ -163,8 +174,9 @@ package_pipewire-full-jack-git() {
 
 package_pipewire-full-pulse-git() {
   pkgdesc+=" - PulseAudio replacement"
-  depends=(pipewire-full-git libpipewire-$_ver.so
-           libpulse.so libavahi-{client,common}.so)
+  depends=(pipewire-full-git libpipewire-$_ver.so libpulse.so
+           libavahi-{client,common}.so
+           )
   provides=(pipewire-pulse pulseaudio pulseaudio-bluetooth)
   conflicts=(pipewire-pulse pulseaudio pulseaudio-bluetooth)
   install=pipewire-pulse.install