aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2024-02-07 01:05:45 +0100
committerBart Ribbers <bribbers@disroot.org>2024-02-07 00:23:28 +0000
commit0b9e2f3a587e54b3472f2f703cf80a859e0768db (patch)
tree4b7049ca685be9d2dc7256ac826298b48f021c4d
parent8304962e6428d3e24a689d715a32071299e0acfc (diff)
community/pipewire: upgrade to 1.0.3
-rw-r--r--community/pipewire/APKBUILD9
-rw-r--r--community/pipewire/libcamera-0.2.0.patch89
2 files changed, 3 insertions, 95 deletions
diff --git a/community/pipewire/APKBUILD b/community/pipewire/APKBUILD
index fa01babf02f..5ceb71dd2d4 100644
--- a/community/pipewire/APKBUILD
+++ b/community/pipewire/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: team/alpine-desktop <bribbers@disroot.org>
pkgname=pipewire
-pkgver=1.0.1
-pkgrel=1
+pkgver=1.0.3
+pkgrel=0
_so_ver=0.3
pkgdesc="Multimedia processing graphs"
url="https://pipewire.org/"
@@ -60,8 +60,6 @@ install="$pkgname.post-upgrade $pkgname.post-install"
source="https://gitlab.freedesktop.org/PipeWire/pipewire/-/archive/$pkgver/pipewire-$pkgver.tar.gz
pipewire.desktop
pipewire-launcher.sh
-
- libcamera-0.2.0.patch
"
case "$CARCH" in
@@ -244,8 +242,7 @@ libs() {
}
sha512sums="
-b768fb5a6d82ad66c07e61dc98d08d8f1fc4e95533125a66499a4a854168ba8c89c6b6cc06b4f0d30a1aac7dcc3672a5ce116f9b8ad6c41bdfa6f51c940a57e4 pipewire-1.0.1.tar.gz
-e92ac37f1e17ea1c27c0de88478a6512161eb0f520162ae02cdd7f87e065e6e6b0c8eec26d6e24de8ab5939aac26aae1bdd93f77b64f18aa5541dd8826acac7d libcamera-0.2.0.patch
+3884a64ce4d467665d34ee39e84ab394e4fe7c24bc006efe1f6ba78649e9fe3693c65f2173a4b0bf0979786309a5b12bc8b90aab3f6cbc223db596c44d00f4cc pipewire-1.0.3.tar.gz
d5d8bc64e42715aa94296e3e26e740142bff7f638c7eb4fecc0301e46d55636d889bdc0c0399c1eb523271b20f7c48cc03f6ce3c072e0e8576c821ed1ea0e3dd pipewire.desktop
e46939b8f903fe6b7421cd42d0746e669402d76afe3326401c186fefeb725e3c126a00ba9f315067d2535991134a24afd855752d757e9e52c20191b5d388f99b pipewire-launcher.sh
"
diff --git a/community/pipewire/libcamera-0.2.0.patch b/community/pipewire/libcamera-0.2.0.patch
deleted file mode 100644
index 3c6e48c7e62..00000000000
--- a/community/pipewire/libcamera-0.2.0.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/spa/plugins/libcamera/libcamera-utils.cpp b/spa/plugins/libcamera/libcamera-utils.cpp
-index 2b1aea5a76bf47a7893236e6bbba170f92da6954..c197248d30ef25c322f6279be1d48e0339471560 100644
---- a/spa/plugins/libcamera/libcamera-utils.cpp
-+++ b/spa/plugins/libcamera/libcamera-utils.cpp
-@@ -716,25 +716,23 @@ static int spa_libcamera_use_buffers(struct impl *impl, struct port *port,
- }
-
- static const struct {
-- 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 },
-+ 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 },
- };
-
--static uint32_t libcamera_transform_to_spa_transform_value(Transform transform)
-+static uint32_t libcamera_orientation_to_spa_transform_value(Orientation orientation)
- {
-- for (const auto& t : transform_map) {
-- if (t.libcamera_transform == transform)
-+ for (const auto& t : orientation_map) {
-+ if (t.libcamera_orientation == orientation)
- return t.spa_transform_value;
- }
- return SPA_META_TRANSFORMATION_None;
-@@ -788,9 +786,9 @@ mmap_init(struct impl *impl, struct port *port,
- buffers[i], SPA_META_VideoTransform, sizeof(*b->videotransform));
- if (b->videotransform) {
- 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));
-+ 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);
-
- }
-
-diff --git a/spa/meson.build b/spa/meson.build
-index 841d27b409585d10ddda50bbc7865b2183acca52..ac20844ce369d98b631197aa383b737de36c638c 100644
---- a/spa/meson.build
-+++ b/spa/meson.build
-@@ -96,9 +96,8 @@ if get_option('spa-plugins').allowed()
- endif
- summary({'Vulkan': have_vulkan}, bool_yn: true, section: 'Misc dependencies')
-
-- libcamera_dep = dependency('libcamera', required: get_option('libcamera'))
-+ libcamera_dep = dependency('libcamera', version: '>= 0.2.0', 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 0abf2f619520f4eeb44f0aece14ee8e2895d8940..b25a4eb728d8312b789a5d2d72ee462b94f231bc 100644
---- a/spa/plugins/libcamera/libcamera-device.cpp
-+++ b/spa/plugins/libcamera/libcamera-device.cpp
-@@ -61,12 +61,10 @@ 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 {};
- }