mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2026-05-06 07:27:03 -04:00
media-sound/bluez-alsa: drop 4.2.0
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST bluez-alsa-4.2.0.tar.gz 326233 BLAKE2B 7bea22d45e9897dd8dc62ee31bba381fb2e2dc616673d711ffb2144f9d03ff8312342f175256946cac828cc1ad04fc263ea11e0c0685e3e28e72c80357914f33 SHA512 1c8816d0baf031c5823fb49fac1409f4034f2f5cc8506ba1f377260cfc6437baa3f6ff1611eac72751f9d56c08f525dc43db05d30820baf394c75f3537d65162
|
||||
DIST bluez-alsa-4.3.1.tar.gz 334765 BLAKE2B 363eb8672132b0168d2e00dee7d0fc1f1933029412e35cb2d2d6fddb22b5b8b6bf225141fb770088e1f0cec0f4c78f9d55cef36186f1ecb9ce1465131204b141 SHA512 db9ac0ce58c03062d65eab2a0ccaed3ddd23de6eda3572ac0d038557c6bb7f243a3551eebae70593c519bc4db070923b9997a6cc4e6546000a2279c56fe1f2e5
|
||||
|
||||
@@ -1,120 +0,0 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
inherit autotools bash-completion-r1 multilib-minimal readme.gentoo-r1 systemd
|
||||
|
||||
DESCRIPTION="Bluetooth Audio ALSA Backend"
|
||||
HOMEPAGE="https://github.com/Arkq/bluez-alsa"
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/Arkq/${PN}"
|
||||
else
|
||||
SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE="aac aptx debug hcitop lame ldac liblc3 man mpg123 ofono static-libs systemd test unwind upower"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# bluez-alsa does not directly link to upower but
|
||||
# is using the upower interface via dbus calls.
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.58.2[${MULTILIB_USEDEP}]
|
||||
>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
|
||||
>=media-libs/sbc-1.5[${MULTILIB_USEDEP}]
|
||||
>=net-wireless/bluez-5.51[${MULTILIB_USEDEP}]
|
||||
sys-apps/dbus[${MULTILIB_USEDEP}]
|
||||
sys-libs/readline:0=
|
||||
aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
|
||||
aptx? ( >=media-libs/libfreeaptx-0.1.1 )
|
||||
hcitop? (
|
||||
dev-libs/libbsd
|
||||
sys-libs/ncurses:0=
|
||||
)
|
||||
lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
|
||||
ldac? ( >=media-libs/libldac-2.0.0 )
|
||||
liblc3? ( >=media-sound/liblc3-1.0.0 )
|
||||
mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
|
||||
ofono? ( net-misc/ofono )
|
||||
systemd? ( sys-apps/systemd )
|
||||
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
|
||||
upower? ( sys-power/upower )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
>=dev-libs/check-0.11.0
|
||||
media-libs/libsndfile
|
||||
)
|
||||
"
|
||||
BDEPEND="
|
||||
>=dev-util/gdbus-codegen-2.80.5-r1
|
||||
virtual/pkgconfig
|
||||
man? ( virtual/pandoc )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-fix-include-freeaptx.patch"
|
||||
# https://github.com/arkq/bluez-alsa/issues/718
|
||||
"${FILESDIR}/${P}-test-alsa-midi-checkdev.patch"
|
||||
# https://github.com/arkq/bluez-alsa/issues/717
|
||||
"${FILESDIR}/${P}-ldpreload.patch"
|
||||
)
|
||||
|
||||
DOC_CONTENTS="Users can use this service when they are members of the \"audio\" group."
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myeconfargs=(
|
||||
--enable-cli
|
||||
--enable-faststream
|
||||
--enable-midi
|
||||
--enable-rfcomm
|
||||
--with-bash-completion="$(get_bashcompdir)"
|
||||
$(use_enable aac)
|
||||
$(use_enable debug)
|
||||
$(use_enable lame mp3lame)
|
||||
$(use_enable man manpages)
|
||||
$(use_enable mpg123)
|
||||
$(use_enable static-libs static)
|
||||
$(use_enable systemd)
|
||||
$(use_enable test)
|
||||
$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir))
|
||||
$(multilib_native_use_enable aptx)
|
||||
$(multilib_native_use_enable aptx aptx-hd)
|
||||
$(multilib_native_use_with aptx libfreeaptx)
|
||||
$(multilib_native_use_enable hcitop)
|
||||
$(multilib_native_use_enable ldac)
|
||||
$(multilib_native_use_enable liblc3 lc3-swb)
|
||||
$(multilib_native_use_enable ofono)
|
||||
$(multilib_native_use_enable upower)
|
||||
$(use_with unwind libunwind)
|
||||
)
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
default
|
||||
find "${ED}" -type f -name "*.la" -delete || die
|
||||
|
||||
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
|
||||
newconfd "${FILESDIR}"/bluealsa-conf.d-2-r1 bluealsa
|
||||
|
||||
# Add config file to alsa datadir as well to preserve changes in /etc
|
||||
insinto "/usr/share/alsa/alsa.conf.d/"
|
||||
doins "src/asound/20-bluealsa.conf.in"
|
||||
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
readme.gentoo_print_elog
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
# Config file for /etc/init.d/bluealsa
|
||||
|
||||
# Allow additional options to be set
|
||||
BLUEALSA_CONF=""
|
||||
@@ -1,31 +0,0 @@
|
||||
https://github.com/arkq/bluez-alsa/commit/14a02d1b06d0ba34c5b61516d7a3c1d6fc467567
|
||||
|
||||
From 14a02d1b06d0ba34c5b61516d7a3c1d6fc467567 Mon Sep 17 00:00:00 2001
|
||||
From: Jochen Sprickerhof <jspricke@debian.org>
|
||||
Date: Wed, 15 May 2024 08:37:53 +0200
|
||||
Subject: [PATCH] Fix include for freeaptx library
|
||||
|
||||
---
|
||||
src/codec-aptx.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/codec-aptx.c b/src/codec-aptx.c
|
||||
index a3f056f..e69858d 100644
|
||||
--- a/src/codec-aptx.c
|
||||
+++ b/src/codec-aptx.c
|
||||
@@ -21,7 +21,11 @@
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
-#include <openaptx.h>
|
||||
+#if WITH_LIBFREEAPTX
|
||||
+# include <freeaptx.h>
|
||||
+#else
|
||||
+# include <openaptx.h>
|
||||
+#endif
|
||||
|
||||
#include "shared/log.h"
|
||||
|
||||
--
|
||||
2.42.2
|
||||
|
||||
@@ -1,164 +0,0 @@
|
||||
From a51e0603c3c9657dbddc6f2d5e92b51209ed2d13 Mon Sep 17 00:00:00 2001
|
||||
From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
|
||||
Date: Mon, 10 Jun 2024 17:36:32 +0200
|
||||
Subject: [PATCH] Fix LD_PRELOAD environment variable overwrite
|
||||
|
||||
Fixes #717
|
||||
---
|
||||
test/Makefile.am | 8 ++++----
|
||||
test/inc/preload.inc | 17 ++++-------------
|
||||
test/inc/spawn.inc | 3 +--
|
||||
test/{aloader.c => libaloader.c} | 0
|
||||
test/test-alsa-ctl.c | 4 ++--
|
||||
test/test-alsa-pcm.c | 4 ++--
|
||||
test/test-utils-aplay.c | 4 ++--
|
||||
test/test-utils-cli.c | 4 ++--
|
||||
8 files changed, 17 insertions(+), 27 deletions(-)
|
||||
rename test/{aloader.c => libaloader.c} (100%)
|
||||
|
||||
diff --git a/test/Makefile.am b/test/Makefile.am
|
||||
index c120c29a6..cf844472c 100644
|
||||
--- a/test/Makefile.am
|
||||
+++ b/test/Makefile.am
|
||||
@@ -57,12 +57,12 @@ check_PROGRAMS += test-msbc
|
||||
endif
|
||||
|
||||
check_LTLIBRARIES = \
|
||||
- aloader.la
|
||||
-aloader_la_LDFLAGS = \
|
||||
+ libaloader.la
|
||||
+libaloader_la_LDFLAGS = \
|
||||
-rpath /nowhere \
|
||||
-avoid-version \
|
||||
- -shared -module
|
||||
-aloader_la_LIBADD = \
|
||||
+ -shared
|
||||
+libaloader_la_LIBADD = \
|
||||
@ALSA_LIBS@
|
||||
|
||||
test_a2dp_SOURCES = \
|
||||
diff --git a/test/inc/preload.inc b/test/inc/preload.inc
|
||||
index 3dbb1522d..a6d0b9f09 100644
|
||||
--- a/test/inc/preload.inc
|
||||
+++ b/test/inc/preload.inc
|
||||
@@ -2,7 +2,7 @@
|
||||
* preload.inc
|
||||
* vim: ft=c
|
||||
*
|
||||
- * Copyright (c) 2016-2022 Arkadiusz Bokowy
|
||||
+ * Copyright (c) 2016-2024 Arkadiusz Bokowy
|
||||
*
|
||||
* This file is a part of bluez-alsa.
|
||||
*
|
||||
@@ -16,12 +16,10 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
-#include "shared/defs.h"
|
||||
-
|
||||
#define LD_PRELOAD "LD_PRELOAD"
|
||||
#define LD_PRELOAD_SANITIZER "LD_PRELOAD_SANITIZER"
|
||||
|
||||
-int preload(int argc, char * const argv[], char * const envp[], const char *filename) {
|
||||
+int preload(int argc, char * const argv[], const char *filename) {
|
||||
(void)argc;
|
||||
|
||||
const char *env_preload;
|
||||
@@ -40,17 +38,10 @@ int preload(int argc, char * const argv[], char * const envp[], const char *file
|
||||
|
||||
char app[1024];
|
||||
char preload[1024];
|
||||
- char *envp2[256] = { preload, NULL };
|
||||
-
|
||||
char *dir = dirname(strncpy(app, argv[0], sizeof(app) - 1));
|
||||
snprintf(preload, sizeof(preload), "%s=%s:%s/%s:%s",
|
||||
LD_PRELOAD, env_preload_sanitizer, dir, filename, env_preload);
|
||||
|
||||
- size_t i = 1, j = 0;
|
||||
- while (i < ARRAYSIZE(envp2) - 1 && envp[j] != NULL)
|
||||
- envp2[i++] = envp[j++];
|
||||
- if (i == ARRAYSIZE(envp2) - 1 && envp[j] != NULL)
|
||||
- fprintf(stderr, "WARNING: Couldn't forward ENV variables\n");
|
||||
-
|
||||
- return execve(argv[0], argv, envp2);
|
||||
+ putenv(preload);
|
||||
+ return execv(argv[0], argv);
|
||||
}
|
||||
diff --git a/test/inc/spawn.inc b/test/inc/spawn.inc
|
||||
index 4ac1b531d..14eac6a19 100644
|
||||
--- a/test/inc/spawn.inc
|
||||
+++ b/test/inc/spawn.inc
|
||||
@@ -97,8 +97,7 @@ int spawn(struct spawn_process *sp, char *argv[], FILE *f_stdin, int flags) {
|
||||
close(pipe_stderr[1]);
|
||||
}
|
||||
|
||||
- execv(argv[0], argv);
|
||||
- return -1;
|
||||
+ return execv(argv[0], argv);
|
||||
}
|
||||
|
||||
close(pipe_stdout[1]);
|
||||
diff --git a/test/aloader.c b/test/libaloader.c
|
||||
similarity index 100%
|
||||
rename from test/aloader.c
|
||||
rename to test/libaloader.c
|
||||
diff --git a/test/test-alsa-ctl.c b/test/test-alsa-ctl.c
|
||||
index 2d3d03453..b0c0f3350 100644
|
||||
--- a/test/test-alsa-ctl.c
|
||||
+++ b/test/test-alsa-ctl.c
|
||||
@@ -576,8 +576,8 @@ CK_START_TEST(test_alsa_high_level_control_interface) {
|
||||
|
||||
} CK_END_TEST
|
||||
|
||||
-int main(int argc, char *argv[], char *envp[]) {
|
||||
- preload(argc, argv, envp, ".libs/aloader.so");
|
||||
+int main(int argc, char *argv[]) {
|
||||
+ preload(argc, argv, ".libs/libaloader.so");
|
||||
|
||||
char *argv_0 = strdup(argv[0]);
|
||||
snprintf(bluealsa_mock_path, sizeof(bluealsa_mock_path),
|
||||
diff --git a/test/test-alsa-pcm.c b/test/test-alsa-pcm.c
|
||||
index aaff9d1bf..724316869 100644
|
||||
--- a/test/test-alsa-pcm.c
|
||||
+++ b/test/test-alsa-pcm.c
|
||||
@@ -1100,8 +1100,8 @@ CK_START_TEST(ba_test_playback_device_unplug) {
|
||||
|
||||
} CK_END_TEST
|
||||
|
||||
-int main(int argc, char *argv[], char *envp[]) {
|
||||
- preload(argc, argv, envp, ".libs/aloader.so");
|
||||
+int main(int argc, char *argv[]) {
|
||||
+ preload(argc, argv, ".libs/libaloader.so");
|
||||
|
||||
int opt;
|
||||
const char *opts = "hD:c:f:r:";
|
||||
diff --git a/test/test-utils-aplay.c b/test/test-utils-aplay.c
|
||||
index e3a492851..7925a2710 100644
|
||||
--- a/test/test-utils-aplay.c
|
||||
+++ b/test/test-utils-aplay.c
|
||||
@@ -307,8 +307,8 @@ CK_START_TEST(test_play_dbus_signals) {
|
||||
|
||||
} CK_END_TEST
|
||||
|
||||
-int main(int argc, char *argv[], char *envp[]) {
|
||||
- preload(argc, argv, envp, ".libs/aloader.so");
|
||||
+int main(int argc, char *argv[]) {
|
||||
+ preload(argc, argv, ".libs/libaloader.so");
|
||||
|
||||
char *argv_0 = strdup(argv[0]);
|
||||
char *argv_0_dir = dirname(argv_0);
|
||||
diff --git a/test/test-utils-cli.c b/test/test-utils-cli.c
|
||||
index 53510e02e..378c6f2f3 100644
|
||||
--- a/test/test-utils-cli.c
|
||||
+++ b/test/test-utils-cli.c
|
||||
@@ -461,8 +461,8 @@ CK_START_TEST(test_open) {
|
||||
|
||||
} CK_END_TEST
|
||||
|
||||
-int main(int argc, char *argv[], char *envp[]) {
|
||||
- preload(argc, argv, envp, ".libs/aloader.so");
|
||||
+int main(int argc, char *argv[]) {
|
||||
+ preload(argc, argv, ".libs/libaloader.so");
|
||||
|
||||
char *argv_0 = strdup(argv[0]);
|
||||
char *argv_0_dir = dirname(argv_0);
|
||||
@@ -1,23 +0,0 @@
|
||||
From 4b0ec2e0e36b839161a4ef15da1c2a39ee325af4 Mon Sep 17 00:00:00 2001
|
||||
From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
|
||||
Date: Wed, 5 Jun 2024 22:30:17 +0200
|
||||
Subject: [PATCH] Check for sequencer read/write access before test
|
||||
|
||||
Fixes #718
|
||||
---
|
||||
test/test-alsa-midi.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/test-alsa-midi.c b/test/test-alsa-midi.c
|
||||
index 45e09d73..7ee80f96 100644
|
||||
--- a/test/test-alsa-midi.c
|
||||
+++ b/test/test-alsa-midi.c
|
||||
@@ -161,7 +161,7 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
/* Check whether current host supports ALSA sequencer. If not, then
|
||||
* there is no point in running this test, because it will fail. */
|
||||
- if (access("/dev/snd/seq", F_OK) != 0) {
|
||||
+ if (access("/dev/snd/seq", F_OK | R_OK | W_OK) != 0) {
|
||||
warn("ALSA sequencer not available, skipping test!");
|
||||
return 77 /* magic number for skipping tests */;
|
||||
}
|
||||
Reference in New Issue
Block a user