[oe-core][PATCH 2/2] spirv-cross: upgrade; fix build


Markus Volk
 

This updates spirv-cross to the latest release
- use cmake and build shared.
- get pc files created for use with pkgconfig

Signed-off-by: Markus Volk <f_l_k@...>
---
.../spir/spirv-shader-generator_git.bb | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb =
b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb
index bf0a5947b..bf3070701 100644
--- a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb
+++ b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb
@@ -5,18 +5,10 @@ LIC_FILES_CHKSUM =3D "file://LICENSE;md5=3D3b83ef96387f=
14655fc854ddc3c6bd57"
SECTION =3D "graphics"
=20
S =3D "${WORKDIR}/git"
-SRCREV =3D "ed16b3e69985feaf565efbecea70a1cc2fca2a58"
-SRC_URI =3D "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=3Dmast=
er;protocol=3Dhttps \
- file://0001-Add-install-PHONY-target-in-Makefile.patch \
-"
+SRCREV =3D "f09ba2777714871bddb70d049878af34b94fa54d"
+SRC_URI =3D "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=3Dmast=
er;protocol=3Dhttps"
+inherit cmake pkgconfig
=20
-EXTRA_OEMAKE +=3D 'TARGET_DIR_LIB=3D"${D}${libdir}"'=20
-EXTRA_OEMAKE +=3D 'TARGET_DIR_BIN=3D"${D}${bindir}"'
+EXTRA_OECMAKE =3D "-DSPIRV_CROSS_SHARED=3DON"
=20
-do_compile () {
- cd ${S} && oe_runmake
-}
-
-do_install () {
- cd ${S} && oe_runmake install
-}
+FILES:${PN} +=3D "${datadir}"
--=20
2.34.1