libfreeaptx is now shipped, use it instead

3 files changed, 8 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2451f41082d0..e70ec89640eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pipewire-full-git
 	pkgdesc = Low-latency audio/video router and processor
-	pkgver = 0.3.32.r58.g1216371f
+	pkgver = 0.3.32.r60.g6773ea7e
 	pkgrel = 1
 	url = https://pipewire.org
 	arch = x86_64
@@ -20,7 +20,7 @@ pkgbase = pipewire-full-git
 	makedepends = bluez-libs
 	makedepends = sbc
 	makedepends = libldac
-	makedepends = libopenaptx
+	makedepends = libfreeaptx
 	makedepends = libfdk-aac
 	makedepends = avahi
 	makedepends = gst-plugins-base-libs
@@ -29,9 +29,7 @@ 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
@@ -50,7 +48,7 @@ pkgname = pipewire-full-git
 	depends = libsbc.so
 	depends = libldacBT_enc.so
 	depends = libldacBT_abr.so
-	depends = libopenaptx.so
+	depends = libfreeaptx.so
 	depends = libfdk-aac.so
 	optdepends = pipewire-full-docs-git: Documentation
 	optdepends = pipewire-full-alsa-git: ALSA configuration
diff --git a/0001-Revert-bluez5-Use-libfreeaptx-instead-of-libopenaptx.patch b/0001-Revert-bluez5-Use-libfreeaptx-instead-of-libopenaptx.patch
deleted file mode 100644
index e4aa77e95cd0..000000000000
--- a/0001-Revert-bluez5-Use-libfreeaptx-instead-of-libopenaptx.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 ae3ec29764a7..5203a2a00fe3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=(pipewire-full-git
          pipewire-full-vulkan-git
          pipewire-full-ffmpeg-git
          )
-pkgver=0.3.32.r58.g1216371f
+pkgver=0.3.32.r60.g6773ea7e
 pkgrel=1
 pkgdesc="Low-latency audio/video router and processor"
 url="https://pipewire.org"
@@ -24,17 +24,15 @@ arch=(x86_64)
 makedepends=(git meson doxygen xmltoman ncurses
              libsndfile alsa-lib dbus rtkit libpulse
              webrtc-audio-processing libusb bluez-libs
-             sbc libldac libopenaptx libfdk-aac
+             sbc libldac libfreeaptx libfdk-aac
              avahi
              gst-plugins-base-libs
              jack2
              vulkan-headers vulkan-icd-loader
              ffmpeg
              )
-source=('git+https://gitlab.freedesktop.org/pipewire/pipewire.git'
-        '0001-Revert-bluez5-Use-libfreeaptx-instead-of-libopenaptx.patch')
-sha256sums=('SKIP'
-            '9545e10d4e702ee175bed80d1c030cb61ae267cc41809e107574a0e4ecba6811')
+source=('git+https://gitlab.freedesktop.org/pipewire/pipewire.git')
+sha256sums=('SKIP')
 
 pkgver() {
   cd $_pkgbase
@@ -91,7 +89,7 @@ package_pipewire-full-git() {
            libudev.so libasound.so libsystemd.so
            libwebrtc_audio_processing.so libusb-1.0.so
            libbluetooth.so libsbc.so libldacBT_{enc,abr}.so
-           libopenaptx.so libfdk-aac.so)
+           libfreeaptx.so libfdk-aac.so)
   optdepends=('pipewire-full-docs-git: Documentation'
               'pipewire-full-alsa-git: ALSA configuration'
               'pipewire-full-jack-git: JACK support'