diff options
| -rw-r--r-- | meta-oe/recipes-graphics/spir/spirv-shader-generator/0001-allow-build-with-cmake-4.patch | 43 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/spir/spirv-shader-generator_1.4.328.1.bb (renamed from meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb) | 5 |
2 files changed, 2 insertions, 46 deletions
diff --git a/meta-oe/recipes-graphics/spir/spirv-shader-generator/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-graphics/spir/spirv-shader-generator/0001-allow-build-with-cmake-4.patch deleted file mode 100644 index 31b3ef81fa..0000000000 --- a/meta-oe/recipes-graphics/spir/spirv-shader-generator/0001-allow-build-with-cmake-4.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From ba72528b21e024fe4f5464466976a8234d7c330c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
| 3 | Date: Tue, 8 Jul 2025 20:27:11 +0300 | ||
| 4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
| 5 | compatibility | ||
| 6 | |||
| 7 | Fix: | ||
| 8 | |||
| 9 | | CMake Error at CMakeLists.txt:22 (cmake_minimum_required): | ||
| 10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
| 11 | | | ||
| 12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
| 13 | | to tell CMake that the project requires at least <min> but has been updated | ||
| 14 | | to work with policies introduced by <max> or earlier. | ||
| 15 | | | ||
| 16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
| 17 | | | ||
| 18 | | | ||
| 19 | | -- Configuring incomplete, errors occurred! | ||
| 20 | |||
| 21 | Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Cross/commit/82331a2ca9f2ea90d05901e931aa8c21e70dc40c] | ||
| 22 | |||
| 23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
| 24 | --- | ||
| 25 | CMakeLists.txt | 2 +- | ||
| 26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 27 | |||
| 28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 29 | index cf14c8d5..ef9695a9 100644 | ||
| 30 | --- a/CMakeLists.txt | ||
| 31 | +++ b/CMakeLists.txt | ||
| 32 | @@ -19,7 +19,7 @@ | ||
| 33 | # 2. The MIT License, found at <http://opensource.org/licenses/MIT>. | ||
| 34 | # | ||
| 35 | |||
| 36 | -cmake_minimum_required(VERSION 3.0) | ||
| 37 | +cmake_minimum_required(VERSION 3.5) | ||
| 38 | set(CMAKE_CXX_STANDARD 11) | ||
| 39 | set(CMAKE_CXX_EXTENSIONS OFF) | ||
| 40 | |||
| 41 | -- | ||
| 42 | 2.43.0 | ||
| 43 | |||
diff --git a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb b/meta-oe/recipes-graphics/spir/spirv-shader-generator_1.4.328.1.bb index 1ecd315a2e..b5f22f08fc 100644 --- a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb +++ b/meta-oe/recipes-graphics/spir/spirv-shader-generator_1.4.328.1.bb | |||
| @@ -4,9 +4,8 @@ LICENSE = "Apache-2.0" | |||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 5 | SECTION = "graphics" | 5 | SECTION = "graphics" |
| 6 | 6 | ||
| 7 | SRCREV = "f09ba2777714871bddb70d049878af34b94fa54d" | 7 | SRCREV = "7affe74d77f93a622bb5002789d5332d32e512ee" |
| 8 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=master;protocol=https \ | 8 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=main;protocol=https;tag=vulkan-sdk-${PV}" |
| 9 | file://0001-allow-build-with-cmake-4.patch" | ||
| 10 | 9 | ||
| 11 | inherit cmake pkgconfig | 10 | inherit cmake pkgconfig |
| 12 | 11 | ||
