From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6AF8B138359 for ; Tue, 10 Nov 2020 07:54:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6A89E0821; Tue, 10 Nov 2020 07:54:32 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B6A9E0821 for ; Tue, 10 Nov 2020 07:54:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA43A34081F for ; Tue, 10 Nov 2020 07:54:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C1E8443 for ; Tue, 10 Nov 2020 07:54:29 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1604994864.9407e03e735de4044a2f4bd1d4f754613ffc4b3a.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/bluez-alsa/files/, media-sound/bluez-alsa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/bluez-alsa/Manifest media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild media-sound/bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch X-VCS-Directories: media-sound/bluez-alsa/files/ media-sound/bluez-alsa/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 9407e03e735de4044a2f4bd1d4f754613ffc4b3a X-VCS-Branch: master Date: Tue, 10 Nov 2020 07:54:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e0df901b-55f5-4539-84b1-023d76234e1d X-Archives-Hash: 07334863768ef3f26e097d1bd2a2f7aa commit: 9407e03e735de4044a2f4bd1d4f754613ffc4b3a Author: Lars Wendler gentoo org> AuthorDate: Tue Nov 10 07:52:35 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Nov 10 07:54:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9407e03e media-sound/bluez-alsa: Removed old Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> media-sound/bluez-alsa/Manifest | 1 - media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild | 83 ------------ .../bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch | 145 --------------------- 3 files changed, 229 deletions(-) diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest index 1f278685cce..d44d76abd81 100644 --- a/media-sound/bluez-alsa/Manifest +++ b/media-sound/bluez-alsa/Manifest @@ -1,2 +1 @@ -DIST bluez-alsa-2.1.0.tar.gz 129650 BLAKE2B 6ab1b618828b5ad6f35c62a711cd24a51536ae4e013227addff8193bb522e0e7322d054fa8e688b5322ec59f6d08a654760ebb5792a637fa11536afc41c5dba5 SHA512 8b6d520f5733799b1c509052ac527377cbe5e0106b75180f783f83071246937b5dc7a22c2d27f3e9e331c52c74be59f3bc6d78caab97b41f06cfd6ed5191b584 DIST bluez-alsa-3.0.0.tar.gz 157776 BLAKE2B 68cc67dcfd303e624333d7dafa53a3ce0f91f55e58a9a1a51f17153eadfdca5acc1b12b2e41a11c4780909fe8283e0a9c859a7d755e38dd9aeebbf4ae9e0daf2 SHA512 094c91636c3f1803b3eb88e295683acc604be9f86d00022c196784b4ec88aa4a6cc20bdff0fdab2a7e5af3efe95ed8bd8c5486a8cd7896ec572bfa9e8e0f13d0 diff --git a/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild deleted file mode 100644 index f654ac56596..00000000000 --- a/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools multilib-minimal 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 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="aac debug hcitop ldac ofono static-libs test 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.26[dbus,${MULTILIB_USEDEP}] - >=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}] - >=media-libs/sbc-1.2[${MULTILIB_USEDEP}] - >=net-wireless/bluez-5.0[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-libs/readline:0= - aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] ) - hcitop? ( - dev-libs/libbsd - sys-libs/ncurses:0= - ) - ldac? ( >=media-libs/libldac-2.0.0 ) - upower? ( sys-power/upower ) -" -DEPEND="${RDEPEND} - test? ( dev-libs/check )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-gcc10.patch" #706680 -) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --enable-rfcomm - $(use_enable aac) - $(use_enable debug) - $(use_enable ofono) - $(use_enable static-libs static) - $(use_enable test) - $(multilib_native_use_enable hcitop) - $(multilib_native_use_enable ldac) - $(multilib_native_use_enable upower) - ) - 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 bluealsa - systemd_dounit "${FILESDIR}"/bluealsa.service - - # 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" -} - -pkg_postinst() { - elog "Users can use this service when they are members of the \"audio\" group." -} diff --git a/media-sound/bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch b/media-sound/bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch deleted file mode 100644 index df8e148842e..00000000000 --- a/media-sound/bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 450ba2c898303cea2cba9a5efa99c7d919fc9e55 Mon Sep 17 00:00:00 2001 -From: Arkadiusz Bokowy -Date: Sun, 9 Feb 2020 22:26:16 +0100 -Subject: [PATCH] Fix linkage - mark external variable as extern - ---- - src/bluealsa-iface.h | 6 +++--- - src/bluez-a2dp.h | 4 ++-- - src/bluez-iface.h | 6 +++--- - src/ofono-iface.h | 4 ++-- - test/server-mock.c | 1 + - test/test-ba.c | 1 + - test/test-io.c | 1 + - test/test-rfcomm.c | 1 + - 8 files changed, 14 insertions(+), 10 deletions(-) - -diff --git a/src/bluealsa-iface.h b/src/bluealsa-iface.h -index 262fb76..1d3366d 100644 ---- a/src/bluealsa-iface.h -+++ b/src/bluealsa-iface.h -@@ -32,8 +32,8 @@ - #define BLUEALSA_RFCOMM_MODE_HSP_AG "HSP-AG" - #define BLUEALSA_RFCOMM_MODE_HSP_HS "HSP-HS" - --const GDBusInterfaceInfo bluealsa_iface_manager; --const GDBusInterfaceInfo bluealsa_iface_pcm; --const GDBusInterfaceInfo bluealsa_iface_rfcomm; -+extern const GDBusInterfaceInfo bluealsa_iface_manager; -+extern const GDBusInterfaceInfo bluealsa_iface_pcm; -+extern const GDBusInterfaceInfo bluealsa_iface_rfcomm; - - #endif -diff --git a/src/bluez-a2dp.h b/src/bluez-a2dp.h -index 7c0e33b..4a695d9 100644 ---- a/src/bluez-a2dp.h -+++ b/src/bluez-a2dp.h -@@ -1,6 +1,6 @@ - /* - * BlueALSA - bluez-a2dp.h -- * Copyright (c) 2016-2019 Arkadiusz Bokowy -+ * Copyright (c) 2016-2020 Arkadiusz Bokowy - * - * This file is a part of bluez-alsa. - * -@@ -58,6 +58,6 @@ struct bluez_a2dp_codec { - }; - - /* NULL-terminated list of available A2DP codecs */ --const struct bluez_a2dp_codec **bluez_a2dp_codecs; -+extern const struct bluez_a2dp_codec **bluez_a2dp_codecs; - - #endif -diff --git a/src/bluez-iface.h b/src/bluez-iface.h -index 34269c5..ca8fba5 100644 ---- a/src/bluez-iface.h -+++ b/src/bluez-iface.h -@@ -1,6 +1,6 @@ - /* - * BlueALSA - bluez-iface.h -- * Copyright (c) 2016-2019 Arkadiusz Bokowy -+ * Copyright (c) 2016-2020 Arkadiusz Bokowy - * - * This file is a part of bluez-alsa. - * -@@ -27,7 +27,7 @@ - #define BLUEZ_TRANSPORT_STATE_PENDING "pending" - #define BLUEZ_TRANSPORT_STATE_ACTIVE "active" - --const GDBusInterfaceInfo bluez_iface_endpoint; --const GDBusInterfaceInfo bluez_iface_profile; -+extern const GDBusInterfaceInfo bluez_iface_endpoint; -+extern const GDBusInterfaceInfo bluez_iface_profile; - - #endif -diff --git a/src/ofono-iface.h b/src/ofono-iface.h -index d5a6715..d5b9065 100644 ---- a/src/ofono-iface.h -+++ b/src/ofono-iface.h -@@ -1,6 +1,6 @@ - /* - * BlueALSA - ofono-iface.h -- * Copyright (c) 2016-2019 Arkadiusz Bokowy -+ * Copyright (c) 2016-2020 Arkadiusz Bokowy - * 2018 Thierry Bultel - * - * This file is a part of bluez-alsa. -@@ -27,6 +27,6 @@ - #define OFONO_AUDIO_CODEC_CVSD 0x01 - #define OFONO_AUDIO_CODEC_MSBC 0x02 - --const GDBusInterfaceInfo ofono_iface_hf_audio_agent; -+extern const GDBusInterfaceInfo ofono_iface_hf_audio_agent; - - #endif -diff --git a/test/server-mock.c b/test/server-mock.c -index 34934e8..a42e845 100644 ---- a/test/server-mock.c -+++ b/test/server-mock.c -@@ -36,6 +36,7 @@ - #include "../src/ba-adapter.c" - #include "../src/ba-device.c" - #include "../src/ba-transport.c" -+#include "../src/bluez-a2dp.c" - #include "../src/hci.c" - #include "../src/msbc.c" - #include "../src/rfcomm.c" -diff --git a/test/test-ba.c b/test/test-ba.c -index f9eb145..97d57d6 100644 ---- a/test/test-ba.c -+++ b/test/test-ba.c -@@ -22,6 +22,7 @@ - #include "../src/utils.c" - #include "../src/shared/log.c" - -+const struct bluez_a2dp_codec **bluez_a2dp_codecs = NULL; - int a2dp_thread_create(struct ba_transport *t) { (void)t; return 0; } - void *rfcomm_thread(struct ba_transport *t) { (void)t; return 0; } - void *sco_thread(struct ba_transport *t) { (void)t; return 0; } -diff --git a/test/test-io.c b/test/test-io.c -index 9dbd0e9..85d3fe7 100644 ---- a/test/test-io.c -+++ b/test/test-io.c -@@ -33,6 +33,7 @@ - #include "../src/shared/log.c" - #include "../src/shared/rt.c" - -+const struct bluez_a2dp_codec **bluez_a2dp_codecs = NULL; - unsigned int bluealsa_dbus_pcm_register(struct ba_transport *t, GError **error) { - debug("%s: %p", __func__, (void *)t); (void)error; return 0; } - void bluealsa_dbus_pcm_update(struct ba_transport *t, unsigned int mask) { -diff --git a/test/test-rfcomm.c b/test/test-rfcomm.c -index d14a7bd..248939f 100644 ---- a/test/test-rfcomm.c -+++ b/test/test-rfcomm.c -@@ -34,6 +34,7 @@ static pthread_mutex_t transport_codec_updated_mtx = PTHREAD_MUTEX_INITIALIZER; - static pthread_cond_t transport_codec_updated = PTHREAD_COND_INITIALIZER; - static unsigned int transport_codec_updated_cnt = 0; - -+const struct bluez_a2dp_codec **bluez_a2dp_codecs = NULL; - unsigned int bluealsa_dbus_pcm_register(struct ba_transport *t, GError **error) { - debug("%s: %p", __func__, (void *)t); (void)error; return 0; } - void bluealsa_dbus_pcm_update(struct ba_transport *t, unsigned int mask) { --- -2.24.1 -