diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-11-07 15:55:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-08 22:47:17 +0000 |
commit | 445d2b967e621dd2d395c56a628cc68286213a06 (patch) | |
tree | 398124e9dcc3741349f9b84540fcadbfd43a71c5 | |
parent | ae6305aa989a4b81b27545b72a6339da3fc9a2da (diff) | |
download | poky-445d2b967e621dd2d395c56a628cc68286213a06.tar.gz |
vulkan: upgrade 1.3.224.1 -> 1.3.231.1
Update 0001-generate-glslang-pkg-config.patch to
omit libraries that are no longer present
(their functionality has been folded into glslang library
itself).
(From OE-Core rev: 354f1c4013f3b7ee78d6f4ed6209d6b549184057)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch | 14 | ||||
-rw-r--r-- | meta/recipes-graphics/glslang/glslang_1.3.231.1.bb (renamed from meta/recipes-graphics/glslang/glslang_1.3.224.1.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb (renamed from meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb (renamed from meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.bb (renamed from meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb (renamed from meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb (renamed from meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb) | 4 |
7 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch index b1548c7343..a2dcb13b36 100644 --- a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch +++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7161916f69ae257ce06d9c9bf25abf9709bc55cc Mon Sep 17 00:00:00 2001 | 1 | From e8c1b7e1dc6d108a3b49d0adfdc4f836cfafcf1a Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sun, 7 Feb 2021 01:30:39 +0000 | 3 | Date: Sun, 7 Feb 2021 01:30:39 +0000 |
4 | Subject: [PATCH] generate glslang pkg-config | 4 | Subject: [PATCH] generate glslang pkg-config |
@@ -16,13 +16,13 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
16 | create mode 100644 glslang/glslang.pc.cmake.in | 16 | create mode 100644 glslang/glslang.pc.cmake.in |
17 | 17 | ||
18 | diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt | 18 | diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt |
19 | index 45c9813a..cea13975 100644 | 19 | index 72e82b48..c6188e12 100644 |
20 | --- a/glslang/CMakeLists.txt | 20 | --- a/glslang/CMakeLists.txt |
21 | +++ b/glslang/CMakeLists.txt | 21 | +++ b/glslang/CMakeLists.txt |
22 | @@ -221,6 +221,8 @@ if(ENABLE_GLSLANG_INSTALL) | 22 | @@ -223,6 +223,8 @@ if(ENABLE_GLSLANG_INSTALL) |
23 | endif() | 23 | ") |
24 | ") | 24 | install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) |
25 | install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) | 25 | endif() |
26 | + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) | 26 | + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) |
27 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | 27 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) |
28 | 28 | ||
@@ -43,5 +43,5 @@ index 00000000..948a0952 | |||
43 | +Description: OpenGL and OpenGL ES shader front end and validator | 43 | +Description: OpenGL and OpenGL ES shader front end and validator |
44 | +Requires: | 44 | +Requires: |
45 | +Version: @GLSLANG_VERSION@ | 45 | +Version: @GLSLANG_VERSION@ |
46 | +Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper | 46 | +Libs: -L${libdir} -lglslang -lHLSL -lSPVRemapper |
47 | +Cflags: -I${includedir} | 47 | +Cflags: -I${includedir} |
diff --git a/meta/recipes-graphics/glslang/glslang_1.3.224.1.bb b/meta/recipes-graphics/glslang/glslang_1.3.231.1.bb index dd8df15fc7..fede2516b1 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.224.1.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.231.1.bb | |||
@@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" | |||
8 | LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" | 8 | LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" |
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" |
10 | 10 | ||
11 | SRCREV = "10423ec659d301a0ff2daac8bbf38980abf27590" | 11 | SRCREV = "5755de46b07e4374c05fb1081f65f7ae1f8cca81" |
12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ | 12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ |
13 | file://0001-generate-glslang-pkg-config.patch" | 13 | file://0001-generate-glslang-pkg-config.patch" |
14 | PE = "1" | 14 | PE = "1" |
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb index 94500a96ba..fdcc8d523f 100644 --- a/meta/recipes-graphics/spir/spirv-headers_1.3.224.1.bb +++ b/meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb | |||
@@ -7,7 +7,7 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v" | |||
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" |
9 | 9 | ||
10 | SRCREV = "b2a156e1c0434bc8c99aaebba1c7be98be7ac580" | 10 | SRCREV = "85a1ed200d50660786c1a88d9166e871123cce39" |
11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master" | 11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master" |
12 | PE = "1" | 12 | PE = "1" |
13 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 13 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb index cfea28a6ef..ea47796543 100644 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.224.1.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb | |||
@@ -7,7 +7,7 @@ SECTION = "graphics" | |||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
9 | 9 | ||
10 | SRCREV = "5e61ea2098220059e89523f1f47b0bcd8c33b89a" | 10 | SRCREV = "eb0a36633d2acf4de82588504f951ad0f2cecacb" |
11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" | 11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" |
12 | PE = "1" | 12 | PE = "1" |
13 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 13 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.bb index 8d34738ad7..b41b82af9d 100644 --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.224.1.bb +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.bb | |||
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" | |||
11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" |
12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" | 12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" |
13 | 13 | ||
14 | SRCREV = "c896e2f920273bfee852da9cca2a356bc1c2031e" | 14 | SRCREV = "98f440ce6868c94f5ec6e198cc1adda4760e8849" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb index f24db87962..59c52c1db7 100644 --- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.224.1.bb +++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb | |||
@@ -9,8 +9,8 @@ SECTION = "libs" | |||
9 | 9 | ||
10 | LICENSE = "Apache-2.0" | 10 | LICENSE = "Apache-2.0" |
11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" |
12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.224;protocol=https" | 12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.231;protocol=https" |
13 | SRCREV = "09afdf64210b11ec653a1001e013b5af4fce8559" | 13 | SRCREV = "eedbf08292a6be19c3527e77ae2df3f209cab285" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb index bed10afef1..9066821de0 100644 --- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.224.1.bb +++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb | |||
@@ -6,8 +6,8 @@ SECTION = "libs" | |||
6 | 6 | ||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | 8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" |
9 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=master;protocol=https" | 9 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.231;protocol=https" |
10 | SRCREV = "497f232680b046db34ba9e9da065e6303a125851" | 10 | SRCREV = "8d2d3e22d684540fdc5a76c15e456fc2fd11e4b7" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||