mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-02-04 03:39:58 +00:00
chore: Update bluez to 5.75
This commit is contained in:
Kyle Gospodnetich
parent
80ca1e3e67
commit
d99f19a7d4
@ -5,25 +5,17 @@
|
||||
%endif
|
||||
|
||||
Name: bluez
|
||||
Version: 5.73
|
||||
Release: 3%{?dist}.bazzite.{{{ git_dir_version }}}
|
||||
Version: 5.75
|
||||
Release: 1%{?dist}.bazzite.{{{ git_dir_version }}}
|
||||
Summary: Bluetooth utilities
|
||||
License: GPLv2+
|
||||
URL: https://www.bluez.org/
|
||||
URL: http://www.bluez.org/
|
||||
|
||||
Source0: https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
|
||||
Source1: bluez.gitignore
|
||||
|
||||
Patch0: device-fix-device_is_connected-checking-for-services.patch
|
||||
# https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=036583f9bbec8540fbd85b980674aad4916d3093
|
||||
# https://github.com/bluez/bluez/issues/785
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2269516
|
||||
# Fix busy loop when disabling interface while device is connected
|
||||
Patch1: 0001-device-Add-btd_device_bearer_is_connected.patch
|
||||
|
||||
# Valve
|
||||
Patch4: 0001-valve-bluetooth-config.patch
|
||||
Patch5: 0002-valve-bluetooth-phy.patch
|
||||
Patch0: 0001-valve-bluetooth-config.patch
|
||||
Patch1: 0002-valve-bluetooth-phy.patch
|
||||
|
||||
BuildRequires: dbus-devel >= 1.6
|
||||
BuildRequires: glib2-devel
|
||||
@ -340,14 +332,21 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
|
||||
%{_userunitdir}/obex.service
|
||||
|
||||
%changelog
|
||||
* Mon Apr 15 2024 Adam Williamson <awilliam@redhat.com> - 5.75-1
|
||||
- Update to 5.75
|
||||
|
||||
* Sun Apr 14 2024 Adam Williamson <awilliam@redhat.com> - 5.74-1
|
||||
- Update to 5.74
|
||||
- Drop patches (merged upstream)
|
||||
|
||||
* Thu Apr 04 2024 Adam Williamson <awilliam@redhat.com> - 5.73-3
|
||||
- Backport further upstream fix for connected device checks (#2269516)
|
||||
- Backport further upstream fix for connected device checks (#2269516)
|
||||
|
||||
* Mon Mar 18 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 5.73-2
|
||||
- Upstream fix for connected device checks
|
||||
- Upstream fix for connected device checks
|
||||
|
||||
* Fri Mar 08 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 5.73-1
|
||||
- Update to 5.73
|
||||
- Update to 5.73
|
||||
|
||||
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.72-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
From 1c8d6300c3a64d124534182f92d6f714573e8821 Mon Sep 17 00:00:00 2001
|
||||
From: Wim Taymans <wtaymans@redhat.com>
|
||||
Date: Wed, 31 Jan 2024 12:21:02 +0100
|
||||
Subject: [PATCH 1/2] Revert "spa: libcamera: bump minimum supported version to
|
||||
0.2.0"
|
||||
|
||||
This reverts commit 01cb3fa862d36adfded8f02540660b43b9c1584c.
|
||||
---
|
||||
spa/meson.build | 3 ++-
|
||||
spa/plugins/libcamera/libcamera-device.cpp | 2 ++
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/spa/meson.build b/spa/meson.build
|
||||
index db0a84425..0ee750d6e 100644
|
||||
--- a/spa/meson.build
|
||||
+++ b/spa/meson.build
|
||||
@@ -96,8 +96,9 @@ if get_option('spa-plugins').allowed()
|
||||
endif
|
||||
summary({'Vulkan': have_vulkan}, bool_yn: true, section: 'Misc dependencies')
|
||||
|
||||
- libcamera_dep = dependency('libcamera', version: '>= 0.2.0', required: get_option('libcamera'))
|
||||
+ libcamera_dep = dependency('libcamera', required: get_option('libcamera'))
|
||||
summary({'libcamera': libcamera_dep.found()}, bool_yn: true, section: 'Backend')
|
||||
+ cdata.set('HAVE_LIBCAMERA_SYSTEM_DEVICES', libcamera_dep.version().version_compare('>= 0.1.0'))
|
||||
|
||||
compress_offload_option = get_option('compress-offload')
|
||||
summary({'Compress-Offload': compress_offload_option.allowed()}, bool_yn: true, section: 'Backend')
|
||||
diff --git a/spa/plugins/libcamera/libcamera-device.cpp b/spa/plugins/libcamera/libcamera-device.cpp
|
||||
index b25a4eb72..0abf2f619 100644
|
||||
--- a/spa/plugins/libcamera/libcamera-device.cpp
|
||||
+++ b/spa/plugins/libcamera/libcamera-device.cpp
|
||||
@@ -61,10 +61,12 @@ struct impl {
|
||||
static const libcamera::Span<const int64_t> cameraDevice(
|
||||
const Camera *camera)
|
||||
{
|
||||
+#ifdef HAVE_LIBCAMERA_SYSTEM_DEVICES
|
||||
const ControlList &props = camera->properties();
|
||||
|
||||
if (auto devices = props.get(properties::SystemDevices))
|
||||
return devices.value();
|
||||
+#endif
|
||||
|
||||
return {};
|
||||
}
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
From 20dd33d5b68f6007c41a7ffccf37aeb25aa9a920 Mon Sep 17 00:00:00 2001
|
||||
From: Wim Taymans <wtaymans@redhat.com>
|
||||
Date: Wed, 31 Jan 2024 12:21:08 +0100
|
||||
Subject: [PATCH 2/2] Revert "spa: libcamera: use
|
||||
`CameraConfiguration::orientation`"
|
||||
|
||||
This reverts commit fd33d2d3bb6333c7d6e74cbaa806bff2d908f589.
|
||||
---
|
||||
spa/plugins/libcamera/libcamera-utils.cpp | 36 ++++++++++++-----------
|
||||
1 file changed, 19 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/spa/plugins/libcamera/libcamera-utils.cpp b/spa/plugins/libcamera/libcamera-utils.cpp
|
||||
index c197248d3..2b1aea5a7 100644
|
||||
--- a/spa/plugins/libcamera/libcamera-utils.cpp
|
||||
+++ b/spa/plugins/libcamera/libcamera-utils.cpp
|
||||
@@ -716,23 +716,25 @@ static int spa_libcamera_use_buffers(struct impl *impl, struct port *port,
|
||||
}
|
||||
|
||||
static const struct {
|
||||
- Orientation libcamera_orientation; /* clockwise rotation then horizontal mirroring */
|
||||
- uint32_t spa_transform_value; /* horizontal mirroring then counter-clockwise rotation */
|
||||
-} orientation_map[] = {
|
||||
- { Orientation::Rotate0, SPA_META_TRANSFORMATION_None },
|
||||
- { Orientation::Rotate0Mirror, SPA_META_TRANSFORMATION_Flipped },
|
||||
- { Orientation::Rotate90, SPA_META_TRANSFORMATION_270 },
|
||||
- { Orientation::Rotate90Mirror, SPA_META_TRANSFORMATION_Flipped90 },
|
||||
- { Orientation::Rotate180, SPA_META_TRANSFORMATION_180 },
|
||||
- { Orientation::Rotate180Mirror, SPA_META_TRANSFORMATION_Flipped180 },
|
||||
- { Orientation::Rotate270, SPA_META_TRANSFORMATION_90 },
|
||||
- { Orientation::Rotate270Mirror, SPA_META_TRANSFORMATION_Flipped270 },
|
||||
+ Transform libcamera_transform;
|
||||
+ uint32_t spa_transform_value;
|
||||
+} transform_map[] = {
|
||||
+ { Transform::Identity, SPA_META_TRANSFORMATION_None },
|
||||
+ { Transform::Rot0, SPA_META_TRANSFORMATION_None },
|
||||
+ { Transform::HFlip, SPA_META_TRANSFORMATION_Flipped },
|
||||
+ { Transform::VFlip, SPA_META_TRANSFORMATION_Flipped180 },
|
||||
+ { Transform::HVFlip, SPA_META_TRANSFORMATION_180 },
|
||||
+ { Transform::Rot180, SPA_META_TRANSFORMATION_180 },
|
||||
+ { Transform::Transpose, SPA_META_TRANSFORMATION_Flipped90 },
|
||||
+ { Transform::Rot90, SPA_META_TRANSFORMATION_90 },
|
||||
+ { Transform::Rot270, SPA_META_TRANSFORMATION_270 },
|
||||
+ { Transform::Rot180Transpose, SPA_META_TRANSFORMATION_Flipped270 },
|
||||
};
|
||||
|
||||
-static uint32_t libcamera_orientation_to_spa_transform_value(Orientation orientation)
|
||||
+static uint32_t libcamera_transform_to_spa_transform_value(Transform transform)
|
||||
{
|
||||
- for (const auto& t : orientation_map) {
|
||||
- if (t.libcamera_orientation == orientation)
|
||||
+ for (const auto& t : transform_map) {
|
||||
+ if (t.libcamera_transform == transform)
|
||||
return t.spa_transform_value;
|
||||
}
|
||||
return SPA_META_TRANSFORMATION_None;
|
||||
@@ -786,9 +788,9 @@ mmap_init(struct impl *impl, struct port *port,
|
||||
buffers[i], SPA_META_VideoTransform, sizeof(*b->videotransform));
|
||||
if (b->videotransform) {
|
||||
b->videotransform->transform =
|
||||
- libcamera_orientation_to_spa_transform_value(impl->config->orientation);
|
||||
- spa_log_debug(impl->log, "Setting videotransform for buffer %u to %u",
|
||||
- i, b->videotransform->transform);
|
||||
+ libcamera_transform_to_spa_transform_value(impl->config->transform);
|
||||
+ spa_log_debug(impl->log, "Setting videotransform for buffer %d to %u (from %s)",
|
||||
+ i, b->videotransform->transform, transformToString(impl->config->transform));
|
||||
|
||||
}
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user