diff --git a/.gitignore b/.gitignore index c2582ff..4e79f64 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /media-session-0.4.1.tar.gz /pipewire-0.3.41.tar.gz /pipewire-0.3.42.tar.gz +/pipewire-0.3.43.tar.gz diff --git a/0001-Revert-spa-libcamera-call-get-instead-of-fd.patch b/0001-Revert-spa-libcamera-call-get-instead-of-fd.patch new file mode 100644 index 0000000..837568f --- /dev/null +++ b/0001-Revert-spa-libcamera-call-get-instead-of-fd.patch @@ -0,0 +1,35 @@ +From ff10515039219e76079a47e72e39269e3b99b056 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Wed, 5 Jan 2022 12:36:00 +0100 +Subject: [PATCH] Revert "spa: libcamera: call `get()` instead of `fd()`" + +This reverts commit 57dae3e2b3f7d61fd15f763bbd9b862472022379. +--- + spa/plugins/libcamera/libcamera-utils.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/spa/plugins/libcamera/libcamera-utils.cpp b/spa/plugins/libcamera/libcamera-utils.cpp +index b47e59ec5..60bd66223 100644 +--- a/spa/plugins/libcamera/libcamera-utils.cpp ++++ b/spa/plugins/libcamera/libcamera-utils.cpp +@@ -558,7 +558,7 @@ mmap_init(struct impl *impl, struct port *port, + + if (port->memtype == SPA_DATA_DmaBuf || + port->memtype == SPA_DATA_MemFd) { +- d[j].fd = bufs[i]->planes()[j].fd.get(); ++ d[j].fd = bufs[i]->planes()[j].fd.fd(); + spa_log_debug(impl->log, "Got fd = %ld for buffer: #%d", d[j].fd, i); + d[j].data = NULL; + SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED); +@@ -568,7 +568,7 @@ mmap_init(struct impl *impl, struct port *port, + d[j].data = mmap(NULL, + d[j].maxsize + d[j].mapoffset, + PROT_READ, MAP_SHARED, +- bufs[i]->planes()[j].fd.get(), ++ bufs[i]->planes()[j].fd.fd(), + 0); + if (d[j].data == MAP_FAILED) { + spa_log_error(impl->log, "mmap: %m"); +-- +2.31.1 + diff --git a/pipewire.spec b/pipewire.spec index f170ec9..922a037 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -1,6 +1,6 @@ %global majorversion 0 %global minorversion 3 -%global microversion 42 +%global microversion 43 %global apiversion 0.3 %global spaversion 0.2 @@ -80,6 +80,7 @@ Source1: https://gitlab.freedesktop.org/pipewire/media-session/-/archive/ %if %{with media-session} Patch1001: 0001-Build-media-session-from-local-tarbal.patch %endif +Patch1002: 0001-Revert-spa-libcamera-call-get-instead-of-fd.patch BuildRequires: gettext BuildRequires: meson >= 0.49.0 @@ -601,6 +602,9 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %changelog +* Wed Jan 5 2022 Wim Taymans - 0.3.43-1 +- Update version to 0.3.43 + * Thu Dec 16 2021 Wim Taymans - 0.3.42-1 - Update version to 0.3.42 diff --git a/sources b/sources index b884844..0ce746f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pipewire-0.3.42.tar.gz) = bbf00ad5cee8ac872d8c2ef6b9499233100dba04c127b435894cf16c349188ae11edf918479a58039becc1b493c6f53a318d8fb483043dde074dc21ec32984c1 +SHA512 (pipewire-0.3.43.tar.gz) = d3804cdb1d94977bb4e2757e46829e1e51fca52b018007afa3bbfabff4dc33538cedad015c91154e28b879fc2edeb4e1fadf633b0af9a0d3bfd930c53b1bc2c0 SHA512 (media-session-0.4.1.tar.gz) = bfce472b7260b280c0d3cd74d917f48655b5be9976c89a109e94b81af2c3664e83446e97db573cedba6e5d54dedf77195b80eb0a76f6bfc0e96e342557469f99