diff options
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 0a3dc1dd62..8a8a057c6b 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -107,6 +107,23 @@ VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',fre | |||
107 | VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'broadcom', ',broadcom', '', d)}" | 107 | VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'broadcom', ',broadcom', '', d)}" |
108 | PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, -Dvulkan-drivers='',glslang-native vulkan-loader vulkan-headers" | 108 | PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, -Dvulkan-drivers='',glslang-native vulkan-loader vulkan-headers" |
109 | 109 | ||
110 | # mesa development and testing tools support, per driver | ||
111 | TOOLS = "" | ||
112 | TOOLS_DEPS = "" | ||
113 | TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" | ||
114 | TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" | ||
115 | TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" | ||
116 | TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}" | ||
117 | |||
118 | # dependencies for tools. | ||
119 | TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurses libxml2 ', '', d)}" | ||
120 | |||
121 | # the fdperf tool requires libconfig (a part of meta-oe) so it needs special | ||
122 | # treatment in addition to the usual 'freedreno tools'. | ||
123 | PACKAGECONFIG[freedreno-fdperf] = ",,libconfig" | ||
124 | |||
125 | PACKAGECONFIG[tools] = "-Dtools=${@strip_comma('${TOOLS}')}, -Dtools='', ${TOOLS_DEPS}" | ||
126 | |||
110 | PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false" | 127 | PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false" |
111 | PACKAGECONFIG[glvnd] = "-Dglvnd=true, -Dglvnd=false, libglvnd" | 128 | PACKAGECONFIG[glvnd] = "-Dglvnd=true, -Dglvnd=false, libglvnd" |
112 | 129 | ||
@@ -211,7 +228,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ | |||
211 | libopencl-mesa libopencl-mesa-dev \ | 228 | libopencl-mesa libopencl-mesa-dev \ |
212 | libxatracker libxatracker-dev \ | 229 | libxatracker libxatracker-dev \ |
213 | mesa-megadriver mesa-vulkan-drivers \ | 230 | mesa-megadriver mesa-vulkan-drivers \ |
214 | mesa-vdpau-drivers \ | 231 | mesa-vdpau-drivers mesa-tools \ |
215 | " | 232 | " |
216 | 233 | ||
217 | do_install:append () { | 234 | do_install:append () { |
@@ -323,6 +340,9 @@ FILES:libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir} | |||
323 | FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ | 340 | FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ |
324 | ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ | 341 | ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ |
325 | ${libdir}/pkgconfig/xatracker.pc" | 342 | ${libdir}/pkgconfig/xatracker.pc" |
343 | # catch all to get all the tools and data | ||
344 | FILES:${PN}-tools = "${bindir} ${datadir}" | ||
345 | ALLOW_EMPTY:${PN}-tools = "1" | ||
326 | 346 | ||
327 | # Fix upgrade path from mesa to mesa-megadriver | 347 | # Fix upgrade path from mesa to mesa-megadriver |
328 | RREPLACES:mesa-megadriver = "mesa" | 348 | RREPLACES:mesa-megadriver = "mesa" |