diff options
| author |   Jose Quaresma <quaresma.jose@gmail.com> | 2020-12-19 18:32:25 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-21 22:29:08 +0000 |
| commit | 905a5f9ccb314def651aa22c6c87bc313946fc99 (patch) | |
| tree | 267fd52ab9d298976cfb7f40424ddab3bb12846f /meta/recipes-graphics | |
| parent | a4de915af9e2c4d365527ad09286483b2ee904fc (diff) | |
| download | openembedded-core-contrib-905a5f9ccb314def651aa22c6c87bc313946fc99.tar.gz | |
shaderc: upgrade 2020.3 -> 2020.4
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-graphics/shaderc/shaderc_2020.4.bb (renamed from meta/recipes-graphics/shaderc/shaderc_2020.3.bb) | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch b/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch index 0d58925adc..e4e3f0be1e 100644 --- a/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch +++ b/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch @@ -1,11 +1,12 @@ -From e092619a9ef7910ad56acfb8728c66f0125d176a Mon Sep 17 00:00:00 2001 +From 180250f098e0ab899eff0db3708d9693f3486ff4 Mon Sep 17 00:00:00 2001 From: Jose Quaresma <quaresma.jose@gmail.com> Date: Sat, 17 Oct 2020 12:51:50 +0100 -Subject: [PATCH 3/3] cmake: de-vendor libs and disable git versioning +Subject: [PATCH] cmake: de-vendor libs and disable git versioning Upstream-Status: Inappropriate [configuration] Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> + --- CMakeLists.txt | 2 -- glslc/CMakeLists.txt | 1 - @@ -14,18 +15,15 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> create mode 100644 glslc/src/build-version.inc diff --git a/CMakeLists.txt b/CMakeLists.txt -index a4e779b..cfa7bd8 100644 +index 5c74cd8..9451fbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -70,7 +70,6 @@ endif(MSVC) +@@ -102,12 +102,10 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. -add_subdirectory(third_party) - if(SHADERC_ENABLE_SPVC) - add_subdirectory(libshaderc_spvc) -@@ -79,7 +78,6 @@ endif() add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) add_subdirectory(glslc) @@ -34,10 +32,10 @@ index a4e779b..cfa7bd8 100644 add_custom_target(build-version ${PYTHON_EXECUTABLE} diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index 0f5d888..08686e0 100644 +index 35b3f19..52006b8 100644 --- a/glslc/CMakeLists.txt +++ b/glslc/CMakeLists.txt -@@ -26,7 +26,6 @@ shaderc_default_compile_options(glslc_exe) +@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe) target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include) set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc) target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc) @@ -48,6 +46,3 @@ index 0f5d888..08686e0 100644 diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc new file mode 100644 index 0000000..e69de29 --- -2.28.0 - diff --git a/meta/recipes-graphics/shaderc/shaderc_2020.3.bb b/meta/recipes-graphics/shaderc/shaderc_2020.4.bb index f5edf53caf..ee9b118371 100644 --- a/meta/recipes-graphics/shaderc/shaderc_2020.3.bb +++ b/meta/recipes-graphics/shaderc/shaderc_2020.4.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "1fce59794079f90ceb091190adbbb5499acd4e95" +SRCREV = "0dbd899941a43ffd55df527d65128b3b66e75c9c" SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ file://0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch \ file://0003-cmake-de-vendor-libs-and-disable-git-versioning.patch \ |