diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 15:28:33 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 19:31:28 +0000 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-graphics/spir | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.gz talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.zip |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/spir')
4 files changed, 109 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Add-install-PHONY-target-in-Makefile.patch b/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Add-install-PHONY-target-in-Makefile.patch new file mode 100644 index 000000000..78598ea1e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-Add-install-PHONY-target-in-Makefile.patch @@ -0,0 +1,31 @@ +From 8d9870b66c3cfcf12ce7e8e013946e2a215bb722 Mon Sep 17 00:00:00 2001 +From: Ankit Navik <ankit.tarot@gmail.com> +Date: Sat, 22 Dec 2018 19:16:02 +0530 +Subject: [PATCH] Add install PHONY target in Makefile + +--- + Makefile | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 0564b65..0993372 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,7 +35,13 @@ $(STATIC_LIB): $(OBJECTS) + %.o: %.cpp + $(CXX) -c -o $@ $< $(CXXFLAGS) -MMD + ++install: ++ mkdir -p $(TARGET_DIR_BIN) ++ mkdir -p $(TARGET_DIR_LIB) ++ cp $(TARGET) $(TARGET_DIR_BIN)/ ++ cp $(STATIC_LIB) $(TARGET_DIR_LIB)/ ++ + clean: + rm -f $(TARGET) $(OBJECTS) $(CLI_OBJECTS) $(STATIC_LIB) $(DEPS) + +-.PHONY: clean ++.PHONY: all install clean +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-tools-lesspipe-Allow-generic-shell.patch b/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-tools-lesspipe-Allow-generic-shell.patch new file mode 100644 index 000000000..e9a45c24f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/spir/files/0001-tools-lesspipe-Allow-generic-shell.patch @@ -0,0 +1,24 @@ +From 03127fd5a6eff5ae2ebea2e9c6c01fbf1a0a421a Mon Sep 17 00:00:00 2001 +From: Ankit Navik <ankit.tarot@gmail.com> +Date: Tue, 25 Dec 2018 14:34:09 +0530 +Subject: [PATCH] tools/lesspipe: Allow generic shell + +Upstream-Status: Submitted [https://github.com/KhronosGroup/SPIRV-Tools/pull/2255] +Signed-off-by: Ankit Navik <ankit.tarot@gmail.com> +--- + tools/lesspipe/spirv-lesspipe.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/lesspipe/spirv-lesspipe.sh b/tools/lesspipe/spirv-lesspipe.sh +index 81e3355..f955259 100644 +--- a/tools/lesspipe/spirv-lesspipe.sh ++++ b/tools/lesspipe/spirv-lesspipe.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env sh + # Copyright (c) 2016 The Khronos Group Inc. + + # Licensed under the Apache License, Version 2.0 (the "License"); +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb b/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb new file mode 100644 index 000000000..b787972da --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb @@ -0,0 +1,22 @@ +SUMMARY = "SPIRV-Cross is a tool designed for parsing and converting SPIR-V \ +to other shader languages" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +SECTION = "graphics" + +S = "${WORKDIR}/git" +SRCREV = "ed16b3e69985feaf565efbecea70a1cc2fca2a58" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git \ + file://0001-Add-install-PHONY-target-in-Makefile.patch \ +" + +EXTRA_OEMAKE += 'TARGET_DIR_LIB="${D}${libdir}"' +EXTRA_OEMAKE += 'TARGET_DIR_BIN="${D}${bindir}"' + +do_compile () { + cd ${S} && oe_runmake +} + +do_install () { + cd ${S} && oe_runmake install +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb b/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb new file mode 100644 index 000000000..aae11dffc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/spir/spirv-tools_git.bb @@ -0,0 +1,32 @@ +SUMMARY = "The SPIR-V Tools project provides an API and commands for \ +processing SPIR-V modules" +DESCRIPTION = "The project includes an assembler, binary module parser, \ +disassembler, validator, and optimizer for SPIR-V." +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +SECTION = "graphics" + +S = "${WORKDIR}/git" +DEST_DIR = "${S}/external" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ + file://0001-tools-lesspipe-Allow-generic-shell.patch \ + git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ + git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ + git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ + git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ +" +SRCREV_spirv-tools = "167f1270a9ee641b17c016a545741e4aadfabe86" +SRCREV_spirv-headers = "4618b86e9e4b027a22040732dfee35e399cd2c47" +SRCREV_effcee = "8f0a61dc95e0df18c18e0ac56d83b3fa9d2fe90b" +SRCREV_re2 = "2cf86e5ab6dcfe045a1f510c2b9a8b012a4158cd" +SRCREV_googletest = "150613166524c474a8a97df4c01d46b72050c495" + +inherit cmake python3native + +do_install_append() { + install -d ${D}/${includedir}/spirv + install -m 0644 ${DEST_DIR}/spirv-headers/include/spirv/1.2/* ${D}/${includedir}/spirv +} + +FILES_SOLIBSDEV = "" +FILES_${PN} += "${libdir}/*.so" |