diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/files/0001-ignore-lockf-return-value.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/files/0001-ignore-lockf-return-value.patch deleted file mode 100644 index b358bca..0000000 --- a/dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/files/0001-ignore-lockf-return-value.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 230d9c127d45af11739214e78488a93255b832bb Mon Sep 17 00:00:00 2001 -From: Gyorgy Sarvari -Date: Tue, 16 Sep 2025 16:28:34 +0200 -Subject: [PATCH] ignore lockf() return value - -gcc15 returns an error otherwise: - -| ../sources/libpisp-1.2.1/src/helpers/media_device.cpp: In member function 'std::map, libpisp::helpers::DeviceFd>::iterator libpisp::helpers::MediaDevice::unlock(const std::string&)': -| ../sources/libpisp-1.2.1/src/helpers/media_device.cpp:251:14: error: ignoring return value of 'int lockf(int, int, __off64_t)' declared with attribute 'warn_unused_result' [-Werror=unused-result] -| 251 | lockf(it->second.Get(), F_ULOCK, 0); -| | ~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Submitted [https://github.com/raspberrypi/libpisp/pull/53] - -Signed-off-by: Gyorgy Sarvari ---- - src/helpers/media_device.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/helpers/media_device.cpp b/src/helpers/media_device.cpp -index 0dd64d6..121ce79 100644 ---- a/src/helpers/media_device.cpp -+++ b/src/helpers/media_device.cpp -@@ -248,6 +248,6 @@ std::map::iterator MediaDevice::unlock(const std::string - if (it == lock_map_.end()) - return lock_map_.end(); - -- lockf(it->second.Get(), F_ULOCK, 0); -+ std::ignore = lockf(it->second.Get(), F_ULOCK, 0); - return lock_map_.erase(it); - } --- -2.51.0 - diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.2.1.bb b/dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.3.0.bb similarity index 83% rename from dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.2.1.bb rename to dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.3.0.bb index fb8839c..b6275b2 100644 --- a/dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.2.1.bb +++ b/dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.3.0.bb @@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3417a46e992fdf62e5759fba9baef7a7 \ file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c" -SRC_URI = "git://github.com/raspberrypi/libpisp.git;protocol=https;branch=main \ - file://0001-ignore-lockf-return-value.patch" - -SRCREV = "981977ff21f32c8a97d2a0ecbdff3e39d42ccce3" +SRC_URI = "git://github.com/raspberrypi/libpisp.git;protocol=https;branch=main;tag=v${PV}" +SRCREV = "9ba67e6680f03f31f2b1741a53e8fd549be82cbe" DEPENDS = "nlohmann-json"