commit: 9e30c063811fec9c679f21c4868e327307aa9ef6
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 03:43:51 2021 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 03:43:51 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9e30c063
net-wireless/bluez: sync with ::gentoo stable
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
net-wireless/bluez/Manifest | 2 +-
.../{bluez-5.61-r1.ebuild => bluez-5.62-r1.ebuild} | 5 +--
.../bluez/files/bluez-5.60-glibc-2.34.patch | 42 ----------------------
3 files changed, 2 insertions(+), 47 deletions(-)
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index a788677f..ff487814 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1 +1 @@
-DIST bluez-5.61.tar.xz 2137412 BLAKE2B
2fc1b44f726d48b4a0e8bbecc664077db1db69bbc87c66e9d7ac85d7b2e066de8b349c18597a5ba140c5fcb1ef867ee3980ebdd839ded69ae30491fb7b836940
SHA512
a2318637258f9db0bf05fecbfbea2c3ca5e21867378e28ab4c77f658fe42f10c8c607939f2b437ec40d1ceb00b99f7916c0275faaedd9edd247f7dc91329937a
+DIST bluez-5.62.tar.xz 2149348 BLAKE2B
db99b36a230fc0be15275d2eda9864b686326ba50648f66b19087ea4309a76d234ab4f1dcb6975f1513a898978b1d5b9332542f5dcee22efd898b79658434a70
SHA512
8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8
diff --git a/net-wireless/bluez/bluez-5.61-r1.ebuild
b/net-wireless/bluez/bluez-5.62-r1.ebuild
similarity index 98%
rename from net-wireless/bluez/bluez-5.61-r1.ebuild
rename to net-wireless/bluez/bluez-5.62-r1.ebuild
index 6fa675c8..6357a74c 100644
--- a/net-wireless/bluez/bluez-5.61-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.62-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev
multilib-minimal
@@ -69,9 +69,6 @@ PATCHES=(
# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
- # https://marc.info/?l=linux-bluetooth&m=161498090629584&w=2
- "${FILESDIR}"/${PN}-5.60-glibc-2.34.patch
-
# Required for musl support
"${FILESDIR}"/0001-include-limits.h-for-PATH_MAX-for-musl-support.patch
)
diff --git a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch
b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch
deleted file mode 100644
index 1e846100..00000000
--- a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]>
-Date: Wed, 3 Mar 2021 08:57:36 +0100
-Subject: [PATCH] media: rename local function conflicting with pause(2)
-
-profiles/audio/media.c:1284:13: error: conflicting types for 'pause'; have
'_Bool(void *)'
- 1284 | static bool pause(void *user_data)
- | ^~~~~
-In file included from /usr/include/bits/sigstksz.h:24,
- from /usr/include/signal.h:315,
- from /usr/include/glib-2.0/glib/gbacktrace.h:36,
- from /usr/include/glib-2.0/glib.h:34,
- from profiles/audio/media.c:21:
-/usr/include/unistd.h:478:12: note: previous declaration of 'pause' with type
'int(void)'
- 478 | extern int pause (void);
- | ^~~~~
----
- profiles/audio/media.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/profiles/audio/media.c b/profiles/audio/media.c
-index c84bbe22dc..3d8c4b69c3 100644
---- a/profiles/audio/media.c
-+++ b/profiles/audio/media.c
-@@ -1281,7 +1281,7 @@ static bool stop(void *user_data)
- return media_player_send(mp, "Stop");
- }
-
--static bool pause(void *user_data)
-+static bool pause_play(void *user_data)
- {
- struct media_player *mp = user_data;
-
-@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = {
- .set_volume = set_volume,
- .play = play,
- .stop = stop,
-- .pause = pause,
-+ .pause = pause_play,
- .next = next,
- .previous = previous,
- };
