[gentoo-commits] repo/gentoo:master commit in: media-sound/bluez-alsa/files/, media-sound/bluez-alsa/

2020-11-09 Thread Lars Wendler
commit: 9407e03e735de4044a2f4bd1d4f754613ffc4b3a
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Nov 10 07:52:35 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Nov 10 07:54:24 2020 +
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..000
--- 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} == "" ]] ; 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..000
--- 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 +
- 

[gentoo-commits] repo/gentoo:master commit in: media-sound/bluez-alsa/files/, media-sound/bluez-alsa/

2020-05-20 Thread Lars Wendler
commit: 6752a6eacf490069b294be8fa97e59ef3b7d8577
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 20 11:40:30 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 20 11:41:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6752a6ea

media-sound/bluez-alsa: Fixed build with gcc10

Thanks-to: Arkadiusz Bokowy  gmail.com>
Closes: https://bugs.gentoo.org/706680
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild |   4 +
 .../bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch  | 145 +
 2 files changed, 149 insertions(+)

diff --git a/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild 
b/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild
index fc03fb3b79e..c0b3a72b1ab 100644
--- a/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild
@@ -40,6 +40,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+   "${FILESDIR}/${P}-gcc10.patch" #706680
+)
+
 src_prepare() {
default
eautoreconf

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
new file mode 100644
index 000..df8e148842e
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluez-alsa-2.1.0-gcc10.patch
@@ -0,0 +1,145 @@
+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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/bluez-alsa/files/, media-sound/bluez-alsa/

2020-01-26 Thread Lars Wendler
commit: 36b0121d4c946ea5ba538ace4fb2657ce4801174
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jan 26 16:54:13 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jan 26 16:54:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36b0121d

media-sound/bluez-alsa: Removed old

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/bluez-alsa/Manifest|  1 -
 media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild | 70 --
 .../bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch   | 31 --
 3 files changed, 102 deletions(-)

diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index ca261553f76..6528732b7c7 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,3 +1,2 @@
-DIST bluez-alsa-1.4.0.tar.gz 102539 BLAKE2B 
8e640ba5c0cadfa5478885dc6affef790bd50fe04821602156a598082efc8733f0917a91240af7881f980e89ec0e36801e537feedec3ce357087b040f852eeb0
 SHA512 
fa4ad21c7b9ac200cdc7628bf0276bbb0beac94066a6c5e69c47a5286f6e13a7dc61caab23acbb14a37c2b97894c425052a09adb8f967038f6fd99557208629f
 DIST bluez-alsa-2.0.0.tar.gz 116895 BLAKE2B 
97dfd3364259e8a633de0259c84efe4dc4a80a9f388620200c44136844af6f3e101bf6d49931e1b5cd466d4b1ff13b2a7b9284d4599db72039ee3c5afa5800ba
 SHA512 
21152be594421cd00056e94065dcf767ca01f7b040117974315f97aab45db020264e33dabddac7fee12834a4ada9073b9ff680c25d8775b47604cb0bec638a7b
 DIST bluez-alsa-2.1.0.tar.gz 129650 BLAKE2B 
6ab1b618828b5ad6f35c62a711cd24a51536ae4e013227addff8193bb522e0e7322d054fa8e688b5322ec59f6d08a654760ebb5792a637fa11536afc41c5dba5
 SHA512 
8b6d520f5733799b1c509052ac527377cbe5e0106b75180f783f83071246937b5dc7a22c2d27f3e9e331c52c74be59f3bc6d78caab97b41f06cfd6ed5191b584

diff --git a/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild 
b/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild
deleted file mode 100644
index ebcf1d25324..000
--- a/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="Bluetooth Audio ALSA Backend"
-HOMEPAGE="https://github.com/Arkq/bluez-alsa;
-
-if [[ ${PV} == "" ]] ; 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"
-RESTRICT="!test? ( test )"
-
-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-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 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.4.0-ldac_pkgconfig_checks.patch
-)
-
-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)
-   )
-   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-   default
-   find "${ED}" -name "*.la" -delete || die
-
-   newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
-   newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
-}
-
-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-1.4.0-ldac_pkgconfig_checks.patch 
b/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch
deleted file mode 100644
index 55530ea8b83..000
--- a/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 52b08766b08ec7ef8393343553934ca148c175af Mon Sep 17 00:00:00 2001
-From: Lars Wendler 
-Date: Sun, 24 Mar 2019 13:04:24 +0100
-Subject: [PATCH] configure.ac: Fix pkg-config checks for libldac
-
-libldac actually provides the following two pkgconfig files:
-
-ldacBT-enc.pc
-ldacBT-abr.pc

- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 270a74c..6f0b04b 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -81,8 +81,8 @@ AC_ARG_ENABLE([ldac],
-   [AS_HELP_STRING([--enable-ldac], [enable LDAC support])])

[gentoo-commits] repo/gentoo:master commit in: media-sound/bluez-alsa/files/, media-sound/bluez-alsa/

2019-04-28 Thread Lars Wendler
commit: 6ef7c69333e13ef4d5369b0dde81216aa05a14b5
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr 29 00:35:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 29 00:36:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef7c693

media-sound/bluez-alsa: Added systemd unit file

Thanks-to: Chris Mayo  gmail.com>
Closes: https://bugs.gentoo.org/677928
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/bluez-alsa/bluez-alsa-.ebuild |  3 ++-
 media-sound/bluez-alsa/files/bluealsa.service | 10 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/media-sound/bluez-alsa/bluez-alsa-.ebuild 
b/media-sound/bluez-alsa/bluez-alsa-.ebuild
index cc736065095..0e5b0d27ae8 100644
--- a/media-sound/bluez-alsa/bluez-alsa-.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools multilib-minimal
+inherit autotools multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa;
@@ -58,6 +58,7 @@ multilib_src_install_all() {
 
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
+   systemd_dounit "${FILESDIR}"/bluealsa.service
 }
 
 pkg_postinst() {

diff --git a/media-sound/bluez-alsa/files/bluealsa.service 
b/media-sound/bluez-alsa/files/bluealsa.service
new file mode 100644
index 000..12451ccb618
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluealsa.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Bluetooth Audio ALSA Backend
+Requisite=dbus.service
+After=bluetooth.service dbus.service
+
+[Service]
+ExecStart=/usr/bin/bluealsa
+
+[Install]
+WantedBy=bluetooth.target



[gentoo-commits] repo/gentoo:master commit in: media-sound/bluez-alsa/files/, media-sound/bluez-alsa/

2018-07-02 Thread Lars Wendler
commit: 6d06f1f17739c5d5b3d5f23a9f1339ffc1f8afef
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jul  2 11:28:07 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jul  2 11:28:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d06f1f1

media-sound/bluez-alsa: Sync with upstream changes.

Thanks-to: Arkadiusz Bokowy
Closes: https://bugs.gentoo.org/659838
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 media-sound/bluez-alsa/bluez-alsa-.ebuild  | 20 ++--
 media-sound/bluez-alsa/files/bluealsa-conf.d-2 |  4 
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/media-sound/bluez-alsa/bluez-alsa-.ebuild 
b/media-sound/bluez-alsa/bluez-alsa-.ebuild
index 8b3787db68d..186e2b9681c 100644
--- a/media-sound/bluez-alsa/bluez-alsa-.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils multilib-minimal
+EAPI=7
+inherit autotools multilib-minimal
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa;
@@ -29,7 +29,6 @@ RDEPEND=">=dev-libs/glib-2.16[dbus,${MULTILIB_USEDEP}]
sys-libs/ncurses:0=
)"
 DEPEND="${RDEPEND}
-   net-libs/ortp
virtual/pkgconfig"
 
 src_prepare() {
@@ -38,19 +37,20 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-   ECONF_SOURCE="${S}" \
-   econf \
-   $(use_enable aac) \
-   $(use_enable debug) \
+   local myeconfargs=(
+   $(use_enable aac)
+   $(use_enable debug)
$(multilib_native_use_enable hcitop)
+   )
+   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
default
-   prune_libtool_files --modules
+   find "${ED}" -name "*.la" -delete || die
 
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
-   newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
+   newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
 }
 
 pkg_postinst() {

diff --git a/media-sound/bluez-alsa/files/bluealsa-conf.d-2 
b/media-sound/bluez-alsa/files/bluealsa-conf.d-2
new file mode 100644
index 000..29d52f4a1fc
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluealsa-conf.d-2
@@ -0,0 +1,4 @@
+# Config file for /etc/init.d/bluealsa
+
+# Allow additional options to be set
+BLUEALSA_CONF=""



[gentoo-commits] repo/gentoo:master commit in: media-sound/bluez-alsa/files/, media-sound/bluez-alsa/

2017-02-05 Thread Lars Wendler
commit: 8554d7d102cbbf958d287711a6fc52f8fddce6c5
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Feb  5 23:57:19 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Feb  6 00:00:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8554d7d1

media-sound/bluez-alsa: Added conf.d file (bug #608354).

This enables users to submit their own set of options.
Thanks to Sander Sweers for opening the bug and providing the initial
patches.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../{bluez-alsa-1.1.0-r1.ebuild => bluez-alsa-1.1.0-r2.ebuild}| 3 ++-
 media-sound/bluez-alsa/bluez-alsa-.ebuild | 3 ++-
 media-sound/bluez-alsa/files/bluealsa-conf.d  | 4 
 media-sound/bluez-alsa/files/bluealsa-init.d  | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/media-sound/bluez-alsa/bluez-alsa-1.1.0-r1.ebuild 
b/media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild
similarity index 91%
rename from media-sound/bluez-alsa/bluez-alsa-1.1.0-r1.ebuild
rename to media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild
index 20e4c0d..4cdd673 100644
--- a/media-sound/bluez-alsa/bluez-alsa-1.1.0-r1.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -43,6 +43,7 @@ src_install() {
prune_libtool_files --modules
 
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+   newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
 }
 
 pkg_postinst() {

diff --git a/media-sound/bluez-alsa/bluez-alsa-.ebuild 
b/media-sound/bluez-alsa/bluez-alsa-.ebuild
index 263c3be..fc34300 100644
--- a/media-sound/bluez-alsa/bluez-alsa-.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -51,6 +51,7 @@ multilib_src_install_all() {
prune_libtool_files --modules
 
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+   newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
 }
 
 pkg_postinst() {

diff --git a/media-sound/bluez-alsa/files/bluealsa-conf.d 
b/media-sound/bluez-alsa/files/bluealsa-conf.d
new file mode 100644
index ..feb2e1e
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluealsa-conf.d
@@ -0,0 +1,4 @@
+# Config file for /etc/init.d/bluealsa
+
+# Allow additional options to be set
+BLUEALSA_CONF="--disable-hsp"

diff --git a/media-sound/bluez-alsa/files/bluealsa-init.d 
b/media-sound/bluez-alsa/files/bluealsa-init.d
index 1b61e83..0f60e93 100644
--- a/media-sound/bluez-alsa/files/bluealsa-init.d
+++ b/media-sound/bluez-alsa/files/bluealsa-init.d
@@ -1,11 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 pidfile="/var/run/bluealsa.pid"
 command="/usr/bin/bluealsa"
-command_args="--disable-hsp"
+command_args="${BLUEALSA_CONF}"
 command_background="true"
 
 depend() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/bluez-alsa/files/, media-sound/bluez-alsa/

2016-10-18 Thread Lars Wendler
commit: 948ee771c65417ab41ec2d41fbe32a12a7673dd8
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Oct 18 08:09:18 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Oct 18 08:09:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=948ee771

media-sound/bluez-alsa: Initial commit (bug #592310).

Kudos to Arkadiusz Bokowy (bug, ebuild, init script) and to
Sander Sweers (ebuild, init script).

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/bluez-alsa/Manifest|  1 +
 media-sound/bluez-alsa/bluez-alsa-1.1.0.ebuild | 50 +
 media-sound/bluez-alsa/bluez-alsa-.ebuild  | 52 ++
 media-sound/bluez-alsa/files/bluealsa-init.d   | 18 +
 media-sound/bluez-alsa/metadata.xml| 11 ++
 5 files changed, 132 insertions(+)

diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
new file mode 100644
index ..17dfe12
--- /dev/null
+++ b/media-sound/bluez-alsa/Manifest
@@ -0,0 +1 @@
+DIST bluez-alsa-1.1.0.tar.gz 73676 SHA256 
93396e581c196f9283d5907c7b8059ded21f5ec75a58f1c96f01d9ba295f5179 SHA512 
167fa45994b57b0b44d5827762638d36ef782d7789c229e5c1ca99b59c13636dc53161cd45bec41e61890acd38b44d20778bc2085385582329a1c666530b21f1
 WHIRLPOOL 
2faba9fbd57fac2a519fe382c8a98654159a51819fea11da93ea3e198d31e51d3357bf2effa9df31713c2f201717dbd395a721efa81c9000a4da15df7e542a70

diff --git a/media-sound/bluez-alsa/bluez-alsa-1.1.0.ebuild 
b/media-sound/bluez-alsa/bluez-alsa-1.1.0.ebuild
new file mode 100644
index ..20e4c0d
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-1.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="Bluetooth Audio ALSA Backend"
+HOMEPAGE="https://github.com/Arkq/bluez-alsa;
+
+if [[ ${PV} == "" ]] ; 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="debug"
+
+RDEPEND=">=dev-libs/glib-2.16[dbus]
+   >=media-libs/alsa-lib-1.0
+   >=media-libs/sbc-1.2
+   >=net-wireless/bluez-5"
+DEPEND="${RDEPEND}
+   net-libs/ortp
+   virtual/pkgconfig"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable debug)
+}
+
+src_install() {
+   default
+   prune_libtool_files --modules
+
+   newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+}
+
+pkg_postinst() {
+   elog "Users can use this service when they are members of the \"audio\" 
group."
+}

diff --git a/media-sound/bluez-alsa/bluez-alsa-.ebuild 
b/media-sound/bluez-alsa/bluez-alsa-.ebuild
new file mode 100644
index ..35d35a0
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="Bluetooth Audio ALSA Backend"
+HOMEPAGE="https://github.com/Arkq/bluez-alsa;
+
+if [[ ${PV} == "" ]] ; 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"
+
+RDEPEND=">=dev-libs/glib-2.16[dbus]
+   >=media-libs/alsa-lib-1.0
+   >=media-libs/sbc-1.2
+   >=net-wireless/bluez-5"
+DEPEND="${RDEPEND}
+   net-libs/ortp
+   aac? ( >=media-libs/fdk-aac-0.1.1 )
+   virtual/pkgconfig"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable aac) \
+   $(use_enable debug)
+}
+
+src_install() {
+   default
+   prune_libtool_files --modules
+
+   newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+}
+
+pkg_postinst() {
+   elog "Users can use this service when they are members of the \"audio\" 
group."
+}

diff --git a/media-sound/bluez-alsa/files/bluealsa-init.d 
b/media-sound/bluez-alsa/files/bluealsa-init.d
new file mode 100644
index ..1e2b2a7
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluealsa-init.d
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+pidfile="/var/run/bluealsa.pid"
+command="/usr/bin/bluealsa"
+command_args="--disable-hsp"
+command_background="true"
+
+depend() {
+   after bluetooth
+   need dbus localmount
+}
+
+start_pre() {
+   checkpath -q -D -m 0700 -o :audio /var/run/bluealsa
+}

diff --git a/media-sound/bluez-alsa/metadata.xml 
b/media-sound/bluez-alsa/metadata.xml
new file mode