summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-07-09 10:03:38 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-10 09:56:22 +0100
commitb8da24b85db997b06741180a5aedc5fa2e464ff1 (patch)
treec58fe1be3a769e740e324bdaad7bbfb0778f41e5
parent7a9702bdf1f0c2d47976802f352303b35c5d60fc (diff)
downloadpoky-b8da24b85db997b06741180a5aedc5fa2e464ff1.tar.gz
vulkan: remove
This has been split in multiple components which are now being packaged separately following the repository split upstream. https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/wiki/Repository-Split (From OE-Core rev: 928d09f88c0f11cc6686d85fbe47e6e68a999289) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch128
-rw-r--r--meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb40
3 files changed, 0 insertions, 169 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 703478a0cf..d403ed7938 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -717,7 +717,6 @@ RECIPE_MAINTAINER_pn-vim-tiny = "Tom Rini <trini@konsulko.com>"
717RECIPE_MAINTAINER_pn-virglrenderer = "Alexander Kanavin <alex.kanavin@gmail.com>" 717RECIPE_MAINTAINER_pn-virglrenderer = "Alexander Kanavin <alex.kanavin@gmail.com>"
718RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi <Qi.Chen@windriver.com>" 718RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi <Qi.Chen@windriver.com>"
719RECIPE_MAINTAINER_pn-vte = "Anuj Mittal <anuj.mittal@intel.com>" 719RECIPE_MAINTAINER_pn-vte = "Anuj Mittal <anuj.mittal@intel.com>"
720RECIPE_MAINTAINER_pn-vulkan = "Ross Burton <ross.burton@intel.com>"
721RECIPE_MAINTAINER_pn-vulkan-demos = "Ross Burton <ross.burton@intel.com>" 720RECIPE_MAINTAINER_pn-vulkan-demos = "Ross Burton <ross.burton@intel.com>"
722RECIPE_MAINTAINER_pn-vulkan-headers = "Anuj Mittal <anuj.mittal@intel.com>" 721RECIPE_MAINTAINER_pn-vulkan-headers = "Anuj Mittal <anuj.mittal@intel.com>"
723RECIPE_MAINTAINER_pn-vulkan-loader = "Anuj Mittal <anuj.mittal@intel.com>" 722RECIPE_MAINTAINER_pn-vulkan-loader = "Anuj Mittal <anuj.mittal@intel.com>"
diff --git a/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch b/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch
deleted file mode 100644
index b0b9fc4e43..0000000000
--- a/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch
+++ /dev/null
@@ -1,128 +0,0 @@
1From 9b13be109bc66f4d4a1ad53ce5c92c7c495e41d7 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Tue, 24 Jul 2018 17:40:52 +0300
4Subject: [PATCH] commit f63cbe944107b5cd8f150ceaaec43b26099d5688
5
6Author: Adam Jackson <ajax@redhat.com>
7Date: Tue Feb 16 10:05:25 2016 -0500
8
9demos: Don't build tri or cube
10
11There are more interesting demos, all we really want here is vulkaninfo.
12This helps because we don't need to pre-build glslang/llvm/lunarglass
13just to get the loader and layers.
14
15Upstream-Status: Inappropriate [configuration]
16
17Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
18Signed-off-by: Maxin B. John <maxin.john@intel.com>
19---
20 demos/CMakeLists.txt | 88 ----------------------------------------------------
21 1 file changed, 88 deletions(-)
22
23diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
24index 4f32679..26e4cdf 100644
25--- a/demos/CMakeLists.txt
26+++ b/demos/CMakeLists.txt
27@@ -93,42 +93,6 @@ elseif(UNIX)
28 else()
29 endif()
30
31-if(WIN32)
32- # For Windows, since 32-bit and 64-bit items can co-exist, we build each in its own build directory.
33- # 32-bit target data goes in build32, and 64-bit target data goes into build. So, include/link the
34- # appropriate data at build time.
35- if (CMAKE_CL_64)
36- set (BUILDTGT_DIR build)
37- else ()
38- set (BUILDTGT_DIR build32)
39- endif()
40-
41- # Use static MSVCRT libraries
42- foreach(configuration in CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO
43- CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO)
44- if(${configuration} MATCHES "/MD")
45- string(REGEX REPLACE "/MD" "/MT" ${configuration} "${${configuration}}")
46- endif()
47- endforeach()
48-
49- file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
50- file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
51-endif()
52-
53-add_custom_command(
54- COMMENT "Compiling cube demo vertex shader"
55- OUTPUT cube.vert.inc
56- COMMAND ${GLSLANG_VALIDATOR} -V -x -o ${CMAKE_CURRENT_BINARY_DIR}/cube.vert.inc ${PROJECT_SOURCE_DIR}/demos/cube.vert
57- MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/demos/cube.vert
58- DEPENDS ${PROJECT_SOURCE_DIR}/demos/cube.vert ${GLSLANG_VALIDATOR}
59-)
60-add_custom_command(
61- COMMENT "Compiling cube demo fragment shader"
62- OUTPUT cube.frag.inc
63- COMMAND ${GLSLANG_VALIDATOR} -V -x -o ${CMAKE_CURRENT_BINARY_DIR}/cube.frag.inc ${PROJECT_SOURCE_DIR}/demos/cube.frag
64- MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/demos/cube.frag
65- DEPENDS ${PROJECT_SOURCE_DIR}/demos/cube.frag ${GLSLANG_VALIDATOR}
66-)
67
68 include_directories(${CMAKE_CURRENT_BINARY_DIR})
69
70@@ -172,55 +136,3 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
71 install(TARGETS ${API_LOWERCASE}info DESTINATION ${CMAKE_INSTALL_BINDIR})
72 endif()
73 endif()
74-
75-######################################################################################
76-# cube
77-
78-if(APPLE)
79- include(macOS/cube/cube.cmake)
80-elseif(NOT WIN32)
81- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
82- add_executable(cube cube.c ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc)
83- target_link_libraries(cube ${LIBRARIES})
84- endif()
85-else()
86- if (CMAKE_CL_64)
87- set (LIB_DIR "Win64")
88- else()
89- set (LIB_DIR "Win32")
90- endif()
91-
92- add_executable(cube WIN32 cube.c ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc)
93- target_link_libraries(cube ${LIBRARIES})
94-endif()
95-
96-######################################################################################
97-# cubepp
98-
99-if(APPLE)
100- include(macOS/cubepp/cubepp.cmake)
101-elseif(NOT WIN32)
102- if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
103- add_executable(cubepp cube.cpp ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc)
104- target_link_libraries(cubepp ${LIBRARIES})
105- endif()
106-else()
107- if (CMAKE_CL_64)
108- set (LIB_DIR "Win64")
109- else()
110- set (LIB_DIR "Win32")
111- endif()
112-
113- add_executable(cubepp WIN32 cube.cpp ${PROJECT_SOURCE_DIR}/demos/cube.vert ${PROJECT_SOURCE_DIR}/demos/cube.frag cube.vert.inc cube.frag.inc)
114- target_link_libraries(cubepp ${LIBRARIES})
115-endif()
116-
117-######################################################################################
118-# smoke
119-
120-if ((${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}))
121- if ((DEMOS_WSI_SELECTION STREQUAL "XCB") OR (DEMOS_WSI_SELECTION STREQUAL "WAYLAND") OR WIN32 OR
122- (CMAKE_SYSTEM_NAME STREQUAL "Android") OR (CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
123- add_subdirectory(smoke)
124- endif()
125-endif()
126--
1272.4.0
128
diff --git a/meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb b/meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb
deleted file mode 100644
index 02e4330cf2..0000000000
--- a/meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb
+++ /dev/null
@@ -1,40 +0,0 @@
1SUMMARY = "3D graphics and compute API common loader"
2DESCRIPTION = "Vulkan is a new generation graphics and compute API \
3that provides efficient access to modern GPUs. These packages \
4provide only the common vendor-agnostic library loader, headers and \
5the vulkaninfo utility."
6HOMEPAGE = "https://www.khronos.org/vulkan/"
7BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader"
8SECTION = "libs"
9
10LICENSE = "Apache-2.0"
11LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156 \
12 file://loader/loader.c;endline=25;md5=151b392f46568aaedb4ad22b246237ec"
13SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;nobranch=1 \
14 file://demos-Don-t-build-tri-or-cube.patch \
15 "
16SRCREV = "5998d6f444a85e6381b7a089ebf3f9e86482a31d"
17UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
18
19S = "${WORKDIR}/git"
20
21REQUIRED_DISTRO_FEATURES = "vulkan"
22
23inherit cmake python3native lib_package distro_features_check
24ANY_OF_DISTRO_FEATURES = "x11 wayland"
25
26EXTRA_OECMAKE = "-DBUILD_WSI_MIR_SUPPORT=OFF \
27 -DBUILD_LAYERS=OFF \
28 -DBUILD_TESTS=OFF"
29
30# must choose x11 or wayland or both
31PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '' ,d)} \
32 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '' ,d)}"
33PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON -DDEMOS_WSI_SELECTION=XCB, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF -DDEMOS_WSI_SELECTION=WAYLAND, libxcb libx11 libxrandr"
34PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
35
36RRECOMMENDS_${PN} = "mesa-vulkan-drivers"
37INSANE_SKIP_${PN}-dev += "dev-elf"
38
39# Can't be built with ccache
40CCACHE_DISABLE = "1"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 18:19:57 +0000