diff --git a/meta-multimedia/recipes-multimedia/libuvc/libuvc/0001-allow-build-with-cmake-4.patch b/meta-multimedia/recipes-multimedia/libuvc/libuvc/0001-allow-build-with-cmake-4.patch deleted file mode 100644 index bc91f3bf92..0000000000 --- a/meta-multimedia/recipes-multimedia/libuvc/libuvc/0001-allow-build-with-cmake-4.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 347567b4a01079faa1e5d3796f185241efee6e4c Mon Sep 17 00:00:00 2001 -From: Alper Ak -Date: Wed, 9 Jul 2025 12:49:18 +0300 -Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ - compatibility - -Fix: - -| CMake Error at CMakeLists.txt:1 (cmake_minimum_required): -| Compatibility with CMake < 3.5 has been removed from CMake. -| -| Update the VERSION argument value. Or, use the ... syntax -| to tell CMake that the project requires at least but has been updated -| to work with policies introduced by or earlier. -| -| Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. -| -| -| -- Configuring incomplete, errors occurred! - -Upstream-Status: Submitted [https://github.com/libuvc/libuvc/pull/294] - -Signed-off-by: Alper Ak ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fbaffc9..54e7431 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.5) - project(libuvc - VERSION 0.0.7 - LANGUAGES C --- -2.43.0 - diff --git a/meta-multimedia/recipes-multimedia/libuvc/libuvc_0.0.7.bb b/meta-multimedia/recipes-multimedia/libuvc/libuvc_0.0.8.bb similarity index 63% rename from meta-multimedia/recipes-multimedia/libuvc/libuvc_0.0.7.bb rename to meta-multimedia/recipes-multimedia/libuvc/libuvc_0.0.8.bb index 9a3f718e16..0c4d765d7d 100644 --- a/meta-multimedia/recipes-multimedia/libuvc/libuvc_0.0.7.bb +++ b/meta-multimedia/recipes-multimedia/libuvc/libuvc_0.0.8.bb @@ -4,11 +4,13 @@ SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2f1963e0bb88c93463af750daf9ba0c2" -DEPENDS = "libusb jpeg" +DEPENDS = "libusb" -SRC_URI = "git://github.com/libuvc/libuvc.git;branch=master;protocol=https \ - file://0001-allow-build-with-cmake-4.patch" +SRC_URI = "git://github.com/libuvc/libuvc.git;branch=master;protocol=https;tag=v${PV}" -SRCREV = "68d07a00e11d1944e27b7295ee69673239c00b4b" +SRCREV = "4e9fc773914377ec0bcf2f31621f56da5a0fa09f" inherit cmake pkgconfig + +PACKAGECONFIG ?= "jpeg" +PACKAGECONFIG[jpeg] = "-DDISABLE_JPEG=OFF,-DDISABLE_JPEG=ON,jpeg"