diff options
Diffstat (limited to 'meta/recipes-graphics/glslang')
| -rw-r--r-- | meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-graphics/glslang/glslang_1.3.280.0.bb (renamed from meta/recipes-graphics/glslang/glslang_11.5.0.bb) | 24 |
2 files changed, 24 insertions, 19 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 cddd330971..e6bb6ec8e3 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 @@ -From 6692611126b40d499c94bbcc8e29604560262072 Mon Sep 17 00:00:00 2001 +From fc33f1cf032a15c07044ef932bc991c346d62d62 Mon Sep 17 00:00:00 2001 From: Jose Quaresma <quaresma.jose@gmail.com> Date: Sun, 7 Feb 2021 01:30:39 +0000 Subject: [PATCH] generate glslang pkg-config @@ -8,7 +8,6 @@ Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config- Upstream-Status: Pending Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> - --- glslang/CMakeLists.txt | 2 ++ glslang/glslang.pc.cmake.in | 11 +++++++++++ @@ -16,21 +15,21 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> create mode 100644 glslang/glslang.pc.cmake.in diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 1c7d22a2..10c1e841 100644 +index e4690f09..8e660bc5 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL) - EXPORT glslangTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -233,6 +233,8 @@ if(GLSLANG_ENABLE_INSTALL) + install(TARGETS MachineIndependent EXPORT glslang-targets) + install(TARGETS GenericCodeGen EXPORT glslang-targets) endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - + set(PUBLIC_HEADERS + Public/ResourceLimits.h diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in new file mode 100644 -index 00000000..64b6882d +index 00000000..43104e68 --- /dev/null +++ b/glslang/glslang.pc.cmake.in @@ -0,0 +1,11 @@ @@ -43,5 +42,5 @@ index 00000000..64b6882d +Description: OpenGL and OpenGL ES shader front end and validator +Requires: +Version: @GLSLANG_VERSION@ -+Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper ++Libs: -L${libdir} -lglslang -lHLSL -lSPVRemapper +Cflags: -I${includedir} diff --git a/meta/recipes-graphics/glslang/glslang_11.5.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.280.0.bb index 2f076e5684..637082c719 100644 --- a/meta/recipes-graphics/glslang/glslang_11.5.0.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.280.0.bb @@ -6,26 +6,32 @@ either from a command line or programmatically." SECTION = "graphics" HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" -SRCREV = "ae2a562936cc8504c9ef2757cceaff163147834f" -SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https \ - file://0001-generate-glslang-pkg-config.patch" -UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$" +SRCREV = "ee2f5d09eaf8f4e8d0d598bd2172fce290d4ca60" +SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ + file://0001-generate-glslang-pkg-config.patch \ + " +PE = "1" +# These recipes need to be updated in lockstep with each other: +# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools +# vulkan-validation-layers, vulkan-utility-libraries. +# The tags versions should always be sdk-x.y.z, as this is what +# upstream considers a release. +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" inherit cmake python3native +DEPENDS = "spirv-tools" + EXTRA_OECMAKE = " \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=ON \ -DENABLE_PCH=OFF \ -DENABLE_CTEST=OFF \ -DBUILD_EXTERNAL=OFF \ + -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \ " -SOLIBSDEV = "glslang.so" -# all the other libraries are unversioned, so pack it on PN -FILES:${PN} += "${libdir}/*.so" - BBCLASSEXTEND = "native nativesdk" |