summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2021-02-13 00:59:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-13 17:01:13 +0000
commit1fdc54910dc575688003d635af9ae4d27e12ee76 (patch)
treed1a8232f52315ddaaaff5554d8129b0d9a2fe3ba /meta/recipes-graphics
parentf36e16564ece8c23bbf77f167353ef5d5098a01e (diff)
downloadpoky-1fdc54910dc575688003d635af9ae4d27e12ee76.tar.gz
glslang: generate glslang pkg-config
- it will be useful for shaderc (From OE-Core rev: 49972f91d434303e4744a608b2e8c00fcbcc5397) 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/glslang/glslang/0001-generate-glslang-pkg-config.patch47
-rw-r--r--meta/recipes-graphics/glslang/glslang_11.1.0.bb3
2 files changed, 49 insertions, 1 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
new file mode 100644
index 0000000000..ef092f17a1
--- /dev/null
+++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
@@ -0,0 +1,47 @@
1From 6692611126b40d499c94bbcc8e29604560262072 Mon Sep 17 00:00:00 2001
2From: Jose Quaresma <quaresma.jose@gmail.com>
3Date: Sun, 7 Feb 2021 01:30:39 +0000
4Subject: [PATCH] generate glslang pkg-config
5
6Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch
7
8Upstream-Status: Pending
9
10Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
11
12---
13 glslang/CMakeLists.txt | 2 ++
14 glslang/glslang.pc.cmake.in | 11 +++++++++++
15 2 files changed, 13 insertions(+)
16 create mode 100644 glslang/glslang.pc.cmake.in
17
18diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
19index 1c7d22a2..10c1e841 100644
20--- a/glslang/CMakeLists.txt
21+++ b/glslang/CMakeLists.txt
22@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL)
23 EXPORT glslangTargets
24 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
25 endif()
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)
28
29 install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
30
31diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in
32new file mode 100644
33index 00000000..64b6882d
34--- /dev/null
35+++ b/glslang/glslang.pc.cmake.in
36@@ -0,0 +1,11 @@
37+ prefix=@CMAKE_INSTALL_PREFIX@
38+ exec_prefix=@CMAKE_INSTALL_PREFIX@
39+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
40+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
41+
42+ Name: @PROJECT_NAME@
43+ Description: OpenGL and OpenGL ES shader front end and validator
44+ Requires:
45+ Version: @GLSLANG_VERSION@
46+ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
47+ Cflags: -I${includedir}
diff --git a/meta/recipes-graphics/glslang/glslang_11.1.0.bb b/meta/recipes-graphics/glslang/glslang_11.1.0.bb
index fe21dbcf50..9b7c098743 100644
--- a/meta/recipes-graphics/glslang/glslang_11.1.0.bb
+++ b/meta/recipes-graphics/glslang/glslang_11.1.0.bb
@@ -9,7 +9,8 @@ LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exc
9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229" 9LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229"
10 10
11SRCREV = "c594de23cdd790d64ad5f9c8b059baae0ee2941d" 11SRCREV = "c594de23cdd790d64ad5f9c8b059baae0ee2941d"
12SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https" 12SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https \
13 file://0001-generate-glslang-pkg-config.patch"
13UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$" 14UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
14S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
15 16