diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-devtools')
5 files changed, 205 insertions, 0 deletions
diff --git a/meta-amdfalconx86/recipes-devtools/glslang/glslang/0001-CMakeLists.txt-obey-CMAKE_INSTALL_LIBDIR.patch b/meta-amdfalconx86/recipes-devtools/glslang/glslang/0001-CMakeLists.txt-obey-CMAKE_INSTALL_LIBDIR.patch new file mode 100644 index 00000000..cef3e8e6 --- /dev/null +++ b/meta-amdfalconx86/recipes-devtools/glslang/glslang/0001-CMakeLists.txt-obey-CMAKE_INSTALL_LIBDIR.patch @@ -0,0 +1,82 @@ +From 372422ed8ce32e1085cd524156c687df65095237 Mon Sep 17 00:00:00 2001 +From: Awais Belal <awais_belal@mentor.com> +Date: Tue, 25 Oct 2016 14:44:20 +0500 +Subject: [PATCH] CMakeLists.txt: obey CMAKE_INSTALL_LIBDIR + +Not using the exact path that is set through cmake +will end up in a mixed configuration setup where +files are installed on hard-coded locations. + +Signed-off-by: Awais Belal <awais_belal@mentor.com> +--- + OGLCompilersDLL/CMakeLists.txt | 2 +- + SPIRV/CMakeLists.txt | 2 +- + glslang/CMakeLists.txt | 2 +- + glslang/OSDependent/Unix/CMakeLists.txt | 2 +- + glslang/OSDependent/Windows/CMakeLists.txt | 2 +- + hlsl/CMakeLists.txt | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt +index 4954db9..6b518d9 100644 +--- a/OGLCompilersDLL/CMakeLists.txt ++++ b/OGLCompilersDLL/CMakeLists.txt +@@ -8,4 +8,4 @@ if(WIN32) + endif(WIN32) + + install(TARGETS OGLCompiler +- ARCHIVE DESTINATION lib) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt +index 48a6c46..c657d56 100755 +--- a/SPIRV/CMakeLists.txt ++++ b/SPIRV/CMakeLists.txt +@@ -41,4 +41,4 @@ if(WIN32) + endif(WIN32) + + install(TARGETS SPIRV SPVRemapper +- ARCHIVE DESTINATION lib) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt +index ff91135..efb7f15 100644 +--- a/glslang/CMakeLists.txt ++++ b/glslang/CMakeLists.txt +@@ -89,4 +89,4 @@ if(WIN32) + endif(WIN32) + + install(TARGETS glslang +- ARCHIVE DESTINATION lib) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt +index 174cc91..d98057b 100644 +--- a/glslang/OSDependent/Unix/CMakeLists.txt ++++ b/glslang/OSDependent/Unix/CMakeLists.txt +@@ -2,4 +2,4 @@ add_library(OSDependent STATIC ossource.cpp ../osinclude.h) + set_property(TARGET OSDependent PROPERTY FOLDER glslang) + + install(TARGETS OSDependent +- ARCHIVE DESTINATION lib) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt +index 399760c..744bcbb 100644 +--- a/glslang/OSDependent/Windows/CMakeLists.txt ++++ b/glslang/OSDependent/Windows/CMakeLists.txt +@@ -14,4 +14,4 @@ if(WIN32) + endif(WIN32) + + install(TARGETS OSDependent +- ARCHIVE DESTINATION lib) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt +index c7537e2..5111661 100755 +--- a/hlsl/CMakeLists.txt ++++ b/hlsl/CMakeLists.txt +@@ -23,4 +23,4 @@ if(WIN32) + endif(WIN32) + + install(TARGETS HLSL +- ARCHIVE DESTINATION lib) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-- +1.9.1 + diff --git a/meta-amdfalconx86/recipes-devtools/glslang/glslang_git.bb b/meta-amdfalconx86/recipes-devtools/glslang/glslang_git.bb new file mode 100644 index 00000000..15852cac --- /dev/null +++ b/meta-amdfalconx86/recipes-devtools/glslang/glslang_git.bb @@ -0,0 +1,39 @@ +SUMMARY = "An OpenGL and OpenGL ES shader front end and validator." +DESCRIPTION = "Glslang is the official reference compiler front end \ + for the OpenGL ES and OpenGL shading languages. It \ + implements a strict interpretation of the specifications \ + for these languages. It is open and free for anyone to use, \ + either from a command line or programmatically." +SECTION = "graphics" +HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" + +inherit cmake + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://glslang/Include/Types.h;beginline=1;endline=36;md5=6639a5f9543e833d71e2f4e4ff52f34b" + +S = "${WORKDIR}/git" + +SRCREV = "81cd764b5ffc475bc73f1fb35f75fd1171bb2343" +SRC_URI = "git://github.com/KhronosGroup/glslang \ + file://0001-CMakeLists.txt-obey-CMAKE_INSTALL_LIBDIR.patch" + +FILES_${PN} += "${libdir}/*" + +BBCLASSEXTEND = "native nativesdk" + +do_install_append() { + # Some of the vulkan samples/test require these headers + install -d ${D}${includedir}/SPIRV + cp -f ${S}/SPIRV/GlslangToSpv.h ${D}${includedir}/SPIRV + cp -f ${S}/SPIRV/Logger.h ${D}${includedir}/SPIRV + cp -f ${S}/SPIRV/SPVRemapper.h ${D}${includedir}/SPIRV + cp -f ${S}/SPIRV/spvIR.h ${D}${includedir}/SPIRV + + install -d ${D}${includedir}/glslang/Include + cp -f ${S}/glslang/Include/*.h ${D}${includedir}/glslang/Include + install -d ${D}${includedir}/glslang/Public + cp -f ${S}/glslang/Public/*.h ${D}${includedir}/glslang/Public + install -d ${D}${includedir}/glslang/MachineIndependent + cp -f ${S}/glslang/MachineIndependent/Versions.h ${D}${includedir}/glslang/MachineIndependent +} diff --git a/meta-amdfalconx86/recipes-devtools/spirv/spirv-tools/0001-obey-CMAKE_INSTALL_LIBDIR.patch b/meta-amdfalconx86/recipes-devtools/spirv/spirv-tools/0001-obey-CMAKE_INSTALL_LIBDIR.patch new file mode 100644 index 00000000..d1f0f3b1 --- /dev/null +++ b/meta-amdfalconx86/recipes-devtools/spirv/spirv-tools/0001-obey-CMAKE_INSTALL_LIBDIR.patch @@ -0,0 +1,28 @@ +From a6b250054e5bc27b87414c860c9b808a4beef552 Mon Sep 17 00:00:00 2001 +From: Awais Belal <awais_belal@mentor.com> +Date: Tue, 16 Aug 2016 16:07:45 +0500 +Subject: [PATCH] obey CMAKE_INSTALL_LIBDIR + +If the path to CMAKE_INSTALL_LIBDIR is not followed appropriately +the installation will not work correctly on a multilib platofrm. + +Signed-off-by: Awais Belal <awais_belal@mentor.com> +--- + source/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index de227d6..73672a1 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -198,5 +198,5 @@ target_include_directories(${SPIRV_TOOLS} + + install(TARGETS ${SPIRV_TOOLS} + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-- +1.9.1 + diff --git a/meta-amdfalconx86/recipes-devtools/spirv/spirv-tools/0002-spirv-lesspipe.sh-allow-using-generic-shells.patch b/meta-amdfalconx86/recipes-devtools/spirv/spirv-tools/0002-spirv-lesspipe.sh-allow-using-generic-shells.patch new file mode 100644 index 00000000..2d51f2fd --- /dev/null +++ b/meta-amdfalconx86/recipes-devtools/spirv/spirv-tools/0002-spirv-lesspipe.sh-allow-using-generic-shells.patch @@ -0,0 +1,27 @@ +From 93a770330aa21c91a9b7fce798b73d31cad8f16a Mon Sep 17 00:00:00 2001 +From: Awais Belal <awais_belal@mentor.com> +Date: Tue, 25 Oct 2016 16:12:08 +0500 +Subject: [PATCH] spirv-lesspipe.sh: allow using generic shells + +The script is harmless for any type of shell and +shouldn't be tied with bash to allow catering +more possibilities. + +Signed-off-by: Awais Belal <awais_belal@mentor.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 05831d1..4e98fee 100644 +--- a/tools/lesspipe/spirv-lesspipe.sh ++++ b/tools/lesspipe/spirv-lesspipe.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # Copyright (c) 2016 The Khronos Group Inc. + # +-- +1.9.1 + diff --git a/meta-amdfalconx86/recipes-devtools/spirv/spirv-tools_git.bb b/meta-amdfalconx86/recipes-devtools/spirv/spirv-tools_git.bb new file mode 100644 index 00000000..f9563366 --- /dev/null +++ b/meta-amdfalconx86/recipes-devtools/spirv/spirv-tools_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "SPIR-V Tools" +DESCRIPTION = "SPIR-V is a binary intermediate language for representing \ + graphical-shader stages and compute kernels for multiple \ + Khronos APIs, such as OpenCL, OpenGL, and Vulkan." +SECTION = "graphics" +HOMEPAGE = "https://www.khronos.org/registry/spir-v" + +inherit cmake python3native + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ce523927d7bcd789d6c3af579d03ad73" + +S = "${WORKDIR}/git" +SPIRV_HEADERS_LOCATION = "${S}/external/spirv-headers" +HEADERS_VERSION = "1.1" + +SRCREV_spirv-tools = "923a4596b44831a07060df45caacb522613730c9" +SRCREV_spirv-headers = "33d41376d378761ed3a4c791fc4b647761897f26" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools;protocol=http;name=spirv-tools \ + git://github.com/KhronosGroup/SPIRV-Headers;name=spirv-headers;destsuffix=${SPIRV_HEADERS_LOCATION} \ + file://0001-obey-CMAKE_INSTALL_LIBDIR.patch \ + file://0002-spirv-lesspipe.sh-allow-using-generic-shells.patch" + +do_install_append() { + if test -d ${SPIRV_HEADERS_LOCATION}/include/spirv/${HEADERS_VERSION}; then + install -d ${D}/${includedir}/SPIRV + install -m 0644 ${SPIRV_HEADERS_LOCATION}/include/spirv/${HEADERS_VERSION}/* ${D}/${includedir}/SPIRV + fi +} |