commit a8a0e593d99a4eedb7f26693f8af5dcd24ef584f Author: Tim Biermann <tbier@posteo.de> Date: Fri Feb 2 17:33:20 2024 +0100 pipewire: 1.0.1 -> 1.0.3 diff --git a/pipewire/.footprint b/pipewire/.footprint index cef484848..17a1ebcff 100644 --- a/pipewire/.footprint +++ b/pipewire/.footprint @@ -265,8 +265,8 @@ drwxr-xr-x root/root usr/lib/alsa-lib/ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstpipewire.so lrwxrwxrwx root/root usr/lib/libpipewire-0.3.so -> libpipewire-0.3.so.0 -lrwxrwxrwx root/root usr/lib/libpipewire-0.3.so.0 -> libpipewire-0.3.so.0.1001.0 --rwxr-xr-x root/root usr/lib/libpipewire-0.3.so.0.1001.0 +lrwxrwxrwx root/root usr/lib/libpipewire-0.3.so.0 -> libpipewire-0.3.so.0.1003.0 +-rwxr-xr-x root/root usr/lib/libpipewire-0.3.so.0.1003.0 drwxr-xr-x root/root usr/lib/pipewire-0.3/ -rwxr-xr-x root/root usr/lib/pipewire-0.3/libpipewire-module-access.so -rwxr-xr-x root/root usr/lib/pipewire-0.3/libpipewire-module-adapter.so diff --git a/pipewire/.signature b/pipewire/.signature index 3cbaa22dc..3d36f5c11 100644 --- a/pipewire/.signature +++ b/pipewire/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32U8LDONWzUK4Tcgha1ilBVzJqEIvtKpNiR6jw6dbjkjPQh6OoEtXtj+z3KO36OogzIf0QH643TGRt1QfjEK4QI= -SHA256 (Pkgfile) = ce14e3b00c25029c055e3ae05d20b3972000651f6ce1c9491c993e41b26383a9 -SHA256 (.footprint) = 592141c75bd95e67c9f254eada2fc57e08458e893d7517a016bbf5b7817d2344 -SHA256 (pipewire-1.0.1.tar.gz) = 23f7a3c1227e0dbc6c859d2ae56e0f3866749e4bc2e6193e3b6cadf5a037bd8e -SHA256 (268f4856f852d72a749932630223f928acd1a704.patch) = c09896683d666543e129506bdf84d85672e4ae8051e0a622694404982993af95 -SHA256 (4b145ad444b8fc70b6cb375b6447e9c9793e2238.patch) = d5f6c88235c5fae4ec6c03b755b1136d19654d77ae82f4329793c327224b263a +RWSagIOpLGJF3y/nXXXb+ioQ1EiF0ROjS9zWcCA7R7hiWQPJLzbTRi4/w4k2AlCmqZGVTrbIlKn6M7UzFI5F3kPeZFdmBv2lUw4= +SHA256 (Pkgfile) = 77c585989e45bf8b939a2a234c4443cb81bf42d8a0ac351043aef65f6e299b18 +SHA256 (.footprint) = a34937cf8dd484d4c7c32c32c66feaf470ba508ac6901c737684fe4422a4d864 +SHA256 (pipewire-1.0.3.tar.gz) = bddb29b9310c344ca069df410f6f02b7f3d8c518811c0505c7fe62d8428fd767 diff --git a/pipewire/268f4856f852d72a749932630223f928acd1a704.patch b/pipewire/268f4856f852d72a749932630223f928acd1a704.patch deleted file mode 100644 index 2c82dcb7b..000000000 --- a/pipewire/268f4856f852d72a749932630223f928acd1a704.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 268f4856f852d72a749932630223f928acd1a704 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com> -Date: Sat, 28 Oct 2023 02:09:06 +0200 -Subject: [PATCH] spa: libcamera: use `CameraConfiguration::orientation` - -libcamera commit cc65629b68d49d ("libcamera: camera: Introduce Orientation") [0] -introduced to the `CameraConfiguration::orientation` member to describe the -orientation of the image in the received memory buffers. - -Then c65e40b8480ffb ("libcamera: Use CameraConfiguration::orientation") [1] -removed `CameraConfiguration::transform`, which broke the libcamera plugin. - -Fix that by using the new `orientation` member. - -[0]: https://git.linuxtv.org/libcamera.git/commit/?id=cc65629b68d49d5f2a4d6153758... -[1]: https://git.linuxtv.org/libcamera.git/commit/?id=c65e40b8480ffb5f50e01a4e671... ---- - spa/plugins/libcamera/libcamera-utils.cpp | 36 +++++++++++------------ - 1 file changed, 17 insertions(+), 19 deletions(-) - -diff --git a/spa/plugins/libcamera/libcamera-utils.cpp b/spa/plugins/libcamera/libcamera-utils.cpp -index 2b1aea5a76..c197248d30 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); - - } - --- -GitLab - diff --git a/pipewire/4b145ad444b8fc70b6cb375b6447e9c9793e2238.patch b/pipewire/4b145ad444b8fc70b6cb375b6447e9c9793e2238.patch deleted file mode 100644 index 01774a1c7..000000000 --- a/pipewire/4b145ad444b8fc70b6cb375b6447e9c9793e2238.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4b145ad444b8fc70b6cb375b6447e9c9793e2238 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com> -Date: Tue, 9 Jan 2024 19:22:07 +0100 -Subject: [PATCH] spa: libcamera: bump minimum supported version to 0.2.0 - ---- - spa/meson.build | 3 +-- - spa/plugins/libcamera/libcamera-device.cpp | 2 -- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/spa/meson.build b/spa/meson.build -index 841d27b409..ac20844ce3 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 0abf2f6195..b25a4eb728 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 {}; - } --- -GitLab - diff --git a/pipewire/Pkgfile b/pipewire/Pkgfile index 1807b2ed4..e3e84cca9 100644 --- a/pipewire/Pkgfile +++ b/pipewire/Pkgfile @@ -5,11 +5,9 @@ # Optional: alsa-ucm-conf avahi bluez fdk-aac flatpak graphviz jack libcanberra libsndfile libuv lilv pulseaudio rtkit speexdsp v4l-utils vulkan-loader wireplumber name=pipewire -version=1.0.1 +version=1.0.3 release=1 -source=(https://github.com/PipeWire/pipewire/archive/$version/$name-$version.tar.gz - 268f4856f852d72a749932630223f928acd1a704.patch - 4b145ad444b8fc70b6cb375b6447e9c9793e2238.patch) +source=(https://github.com/PipeWire/pipewire/archive/$version/$name-$version.tar.gz) build() { prt-get isinst avahi || PKGMK_PW+=' -Davahi=disabled' @@ -21,9 +19,6 @@ build() { prt-get isinst v4l-utils || PKGMK_PW+=' -Dv4l2=disabled' prt-get isinst vulkan-loader || PKGMK_PW+=' -Dvulkan=disabled -Dvulkan=disabled' - patch -Np1 -d $name-$version -i $SRC/268f4856f852d72a749932630223f928acd1a704.patch - patch -Np1 -d $name-$version -i $SRC/4b145ad444b8fc70b6cb375b6447e9c9793e2238.patch - meson setup $name-$version build $PKGMK_PW \ -D prefix=/usr \ --buildtype=plain \