package/python3-mako: new package
PATCH v3 1/9 package/python3-mako: new package
host-python3-mako will be used by python 3 only script used in the build system of mesa3d package.
There is no way to force building host-oython-mako for python2 and python3 [1].
[1] http://patchwork.ozlabs.org/patch/1084248/
--- package/python-mako/python-mako.mk | 2 ++ package/python3-mako/python3-mako.hash | 1 + package/python3-mako/python3-mako.mk | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 120000 package/python3-mako/python3-mako.hash create mode 100644 package/python3-mako/python3-mako.mk
package/python-mako/python-mako.mk +2 -0
@@ -4,6 +4,8 @@ # ################################################################################ +# Please keep in sync with +# package/python3-mako/python3-mako.mk PYTHON_MAKO_VERSION = 1.0.6 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz PYTHON_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e
package/python3-mako/python3-mako.hash new file +1 -0
@@ -0,0 +1 @@ +../python-mako/python-mako.hash
package/python3-mako/python3-mako.mk new file +21 -0
@@ -0,0 +1,21 @@ +################################################################################ +# +# python3-mako +# +################################################################################ + +# Please keep in sync with +# package/python-mako/python-mako.mk +PYTHON3_MAKO_VERSION = 1.0.6 +PYTHON3_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz +PYTHON3_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e +PYTHON3_MAKO_SETUP_TYPE = setuptools +PYTHON3_MAKO_LICENSE = MIT +PYTHON3_MAKO_LICENSE_FILES = LICENSE +HOST_PYTHON3_MAKO_DL_SUBDIR = python-mako +HOST_PYTHON3_MAKO_NEEDS_HOST_PYTHON = python3 + +# In host build, setup.py tries to download markupsafe if it is not installed +HOST_PYTHON3_MAKO_DEPENDENCIES = host-python-markupsafe + +$(eval $(host-python-package))
Signature · 1 line
2.20.1
PATCH v3 2/9 package/mesa3d: rename OSMesa option
This option is renamed in order to match the naming used by the meson buildsystem.
--- Config.in.legacy | 7 +++++++ package/mesa3d-demos/mesa3d-demos.mk | 2 +- package/mesa3d/Config.in | 8 ++++---- package/mesa3d/mesa3d.mk | 2 +- package/wine/wine.mk | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-)
Config.in.legacy +7 -0
@@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2019.05" +config BR2_PACKAGE_MESA3D_OSMESA + bool "mesa OSMesa option renamed" + select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC + help + The option was renamed in order to match the naming used + by the meson buildsystem. + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR bool "compositor moved to gst1-plugins-base" select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR
package/mesa3d-demos/mesa3d-demos.mk +1 -1
@@ -61,7 +61,7 @@ ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr # osmesa support depends on glut -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) MESA3D_DEMOS_CONF_OPTS += --enable-osmesa else MESA3D_DEMOS_CONF_OPTS += --disable-osmesa
package/mesa3d/Config.in +4 -4
@@ -265,11 +265,11 @@ comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= comment "Off-screen Rendering" -config BR2_PACKAGE_MESA3D_OSMESA - bool "OSMesa library" +config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC + bool "OSMesa (classic) library" help - The OSMesa API provides functions for making off-screen - renderings. + The OSMesa classic API provides functions for + making off-screen renderings. if BR2_PACKAGE_MESA3D_DRIVER
package/mesa3d/mesa3d.mk +1 -1
@@ -156,7 +156,7 @@ endif # APIs -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) MESA3D_CONF_OPTS += --enable-osmesa else MESA3D_CONF_OPTS += --disable-osmesa
package/wine/wine.mk +1 -1
@@ -195,7 +195,7 @@ else WINE_CONF_OPTS += --without-ldap endif -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d else
Signature · 1 line
2.20.1
PATCH v3 3/9 package/mesa3d: add OSMesa classic needs dri swrast
In reply to Romain NaourThe meson build system now check if dri swrast is enabled when OSMesa classic is enabled.
See:
https://cgit.freedesktop.org/mesa/mesa/commit/?id=cbbd5bb889a2c271a504c379f36a7cb717a85af4
--- Config.in.legacy | 1 + package/mesa3d/Config.in | 4 ++++ 2 files changed, 5 insertions(+)
Config.in.legacy +1 -0
@@ -148,6 +148,7 @@ comment "Legacy options removed in 2019.05" config BR2_PACKAGE_MESA3D_OSMESA bool "mesa OSMesa option renamed" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC help The option was renamed in order to match the naming used
package/mesa3d/Config.in +4 -0
@@ -267,10 +267,14 @@ comment "Off-screen Rendering" config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC bool "OSMesa (classic) library" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST help The OSMesa classic API provides functions for making off-screen renderings. +comment "OSMesa classic requires dri (classic) swrast" + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST + if BR2_PACKAGE_MESA3D_DRIVER comment "Additional API Support"
Signature · 1 line
2.20.1
PATCH v3 4/9 package/mesa3d: Only one swrast provider can be built
In reply to Romain Naourhttps://cgit.freedesktop.org/mesa/mesa/commit/?id=de24d61765011ed4bfc169b8ad8cf67e86b1f3bd
--- package/mesa3d/Config.in | 4 ++++ 1 file changed, 4 insertions(+)
package/mesa3d/Config.in +4 -0
@@ -173,11 +173,15 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST bool "Gallium swrast driver" + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help This is a software opengl implementation using the Gallium3D infrastructure. +comment "Gallium swrast: Only one swrast provider can be built" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" depends on BR2_ARM_CPU_HAS_NEON || BR2_aarch64
Signature · 1 line
2.20.1
PATCH v3 5/9 package/mesa3d: add xvmc option
In reply to Romain Naour"XVMC state tracker requires at least one of the following gallium drivers: r600, nouveau."
https://cgit.freedesktop.org/mesa/mesa/commit/?id=22a817af8a89eb3c762fc3e07b443a3ce37d7416
--- package/mesa3d/Config.in | 14 ++++++++++++++ package/mesa3d/mesa3d.mk | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-)
package/mesa3d/Config.in +14 -0
@@ -312,6 +312,20 @@ config BR2_PACKAGE_PROVIDES_LIBGLES config BR2_PACKAGE_PROVIDES_LIBOPENCL default "mesa3d" if BR2_PACKAGE_MESA3D_OPENCL +config BR2_PACKAGE_MESA3D_XVMC + bool "XvMC state tracker" + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + select BR2_PACKAGE_XLIB_LIBXVMC + help + XVMC state tracker (needs r600 or nouveau gallium drivers). + +comment "XvMC depends on X.org and needs gallium drivers: r600, nouveau" + depends on !BR2_PACKAGE_XORG7 + depends on !BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || !BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + endif # BR2_PACKAGE_MESA3D comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library"
package/mesa3d/mesa3d.mk +1 -1
@@ -220,7 +220,7 @@ else MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2 endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) +ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) MESA3D_DEPENDENCIES += xlib_libXvMC MESA3D_CONF_OPTS += --enable-xvmc else
Signature · 1 line
2.20.1
PATCH v3 6/9 package/mesa3d: Gallium xa state tracker is only available for nouveau and svga Gallium drivers
In reply to Romain Naouri915 and freedreno Gallium drivers are not currently supported by mesa3d package.
https://cgit.freedesktop.org/mesa/mesa/commit/?id=0ba909f0f111824223bc38563d1a6bc73e69c2cc
--- package/mesa3d/Config.in | 6 +++--- package/mesa3d/mesa3d.mk | 1 - 2 files changed, 3 insertions(+), 4 deletions(-)
package/mesa3d/Config.in +3 -3
@@ -80,6 +80,9 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER config BR2_PACKAGE_MESA3D_DRIVER bool +# Gallium xa state tracker. +# Quote from mesa3d meson.build: "XA state tracker requires at least +# one of the following gallium drivers: nouveau, freedreno, i915, svga. config BR2_PACKAGE_MESA3D_NEEDS_XA bool
@@ -129,7 +132,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 select BR2_PACKAGE_LLVM_AMDGPU if BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_ELFUTILS if BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS if BR2_PACKAGE_MESA3D_LLVM - select BR2_PACKAGE_MESA3D_NEEDS_XA help Driver for ATI/AMD Radeon R600/R700/HD5000/HD6000 GPUs.
@@ -151,7 +153,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI select BR2_PACKAGE_LLVM_AMDGPU select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS - select BR2_PACKAGE_MESA3D_NEEDS_XA help Driver for ATI/AMD Radeon HD7000/HD8000/Rx200 GPUs.
@@ -188,7 +189,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO select BR2_PACKAGE_LIBDRM_VC4 - select BR2_PACKAGE_MESA3D_NEEDS_XA select BR2_PACKAGE_MESA3D_OPENGL_EGL help Driver for Broadcom VC4 (rpi2/3) GPUs.
package/mesa3d/mesa3d.mk +0 -1
@@ -83,7 +83,6 @@ MESA3D_DEPENDENCIES += \ xorgproto \ libxcb MESA3D_CONF_OPTS += --enable-glx --disable-mangling -# quote from mesa3d configure "Building xa requires at least one non swrast gallium driver." ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) MESA3D_CONF_OPTS += --enable-xa else
Signature · 1 line
2.20.1
PATCH v3 7/9 package/mesa3d: add a new option to enable GLX support
In reply to Romain NaourWhen switching to meson build system, enabling GLX support require at least one DRI or Gallium dirver.
So add a dependency on BR2_PACKAGE_MESA3D_DRIVER for BR2_PACKAGE_MESA3D_OPENGL_GLX option.
quoting the meson build system:
"dri based GLX requires at least one DRI driver." [1]
"Even when building just gallium drivers the user probably wants dri." [2]
[1] https://cgit.freedesktop.org/mesa/mesa/tree/meson.build?h=19.0#n340
[2] https://cgit.freedesktop.org/mesa/mesa/tree/meson.build?h=19.0#n266
--- package/mesa3d/Config.in | 12 ++++++++++++ package/mesa3d/mesa3d.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-)
package/mesa3d/Config.in +12 -0
@@ -281,6 +281,18 @@ comment "OSMesa classic requires dri (classic) swrast" if BR2_PACKAGE_MESA3D_DRIVER +comment "OpenGL API Support" + +config BR2_PACKAGE_MESA3D_OPENGL_GLX + bool "OpenGL GLX" + depends on BR2_PACKAGE_XORG7 + help + Enable GLX graphic acceleration (OpenGL + X11). + GLX support needs X11 and at least one DRI or Gallium driver. + +comment "OpenGL GLX support needs X11" + depends on !BR2_PACKAGE_XORG7 + comment "Additional API Support" config BR2_PACKAGE_MESA3D_OPENGL_EGL
package/mesa3d/mesa3d.mk +1 -1
@@ -72,7 +72,7 @@ MESA3D_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh" MESA3D_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mno-compact-eh" endif -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) MESA3D_DEPENDENCIES += \ xlib_libX11 \ xlib_libXext \
Signature · 1 line
2.20.1
PATCH v3 8/9 package/mesa3d: switch build system to meson
In reply to Romain NaourFrom: Bernd Kuhls <[email protected]>
Update patches for meson:
0002-configure.ac-invert-order-for-wayland-scanner-check.patch 0003-set-LIBCLC_INCLUDEDIR.patch
Disable unused options that are set to "auto" mode. (valgrind, gallium-omx, power8).
Remove --disable-static option since there is no meson equivalent. Remove --disable-mangling since it's not yet supported by meson.
Use r100 instead of radeon as DRI name for BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON.
Add a new depedency on host-python3-mako since we can't use generated headers from the release archive [2].
[1] http://patchwork.ozlabs.org/patch/1084248/
[2] http://lists.busybox.net/pipermail/buildroot/2019-April/249057.html
---
v2: rebase on mesa 19.0.3
Fix typo -Degl=true=false
Fixes: build without x11 by removing -Dglx=dri (Peter Seiderer) Doesn't use -Dglx=auto, instead use the new BR2_PACKAGE_MESA3D_OPENGL_GLX Remove workaround patch for python-mako, add host-python3-mako dependency
--- ...vert-order-for-wayland-scanner-check.patch | 51 -------- ...d-scanner-provided-by-wayland-scanne.patch | 52 ++++++++ ...t-proper-value-for-LIBCLC_INCLUDEDIR.patch | 39 ++++++ .../mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch | 37 ------ package/mesa3d/Config.in | 3 +- package/mesa3d/mesa3d.mk | 118 +++++++++--------- 6 files changed, 149 insertions(+), 151 deletions(-) delete mode 100644 package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch create mode 100644 package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch create mode 100644 package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch delete mode 100644 package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch
package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch deleted +0 -51
@@ -1,51 +0,0 @@ -From ef96bac7cbbb11b98606864ead0f731dd5b71d5a Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <[email protected]> -Date: Thu, 17 Nov 2016 15:36:54 -0300 -Subject: [PATCH] configure.ac: invert order for wayland-scanner check - -When cross-compiling the .pc file might point to the wrong -wayland-scanner binary (target rather than host) resulting in a -non-executable and wrong scanner. -Try searching the PATH first, and if that fails fall back into -pkg-config. - -[Vincent: tweak patch for 17.1.1 version] - -Signed-off-by: Gustavo Zacarias <[email protected]> -Signed-off-by: Vicente Olivert Riera <[email protected]> -[Romain: rebase on 18.1] -Signed-off-by: Romain Naour <[email protected]> -[Bernd rebase on 18.3] -Signed-off-by: Bernd Kuhls <[email protected]> ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1fbdcc6c7..dcf87e7dd6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1841,17 +1841,16 @@ - fi - WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` - -- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -+ if test "x$WAYLAND_SCANNER" = x; then -+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, - WAYLAND_SCANNER='') -+ fi - PKG_CHECK_EXISTS([wayland-scanner >= 1.15], - AC_SUBST(SCANNER_ARG, 'private-code'), - AC_SUBST(SCANNER_ARG, 'code')) - -- if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -- fi -- - if test "x$WAYLAND_SCANNER" = "x:"; then - AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) - fi --- -2.14.3
package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch new file +52 -0
52 lines not on this page · raw message
package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Wed, 17 Apr 2019 23:07:42 +0200 +Subject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR + +LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation +will look for OpenCL "headers" on the target, when building the OpenCL +kernels. + +The value returned by pkg-config for includedir is relevant when +cross-compiling, on the build machine. But in this specific case, we +really need a value that is valid on the target. + +Those headers are installed by the libclc package in /usr/share so +that they are not removed by Buildroot target-finalize logic. + +Based on the patch for autotools provided by Valentin Korenblit. + +Signed-off-by: Romain Naour <[email protected]> +--- + src/gallium/state_trackers/clover/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build +index 62ac5f5278d..ecdeb39669c 100644 +--- a/src/gallium/state_trackers/clover/meson.build ++++ b/src/gallium/state_trackers/clover/meson.build +@@ -49,7 +49,7 @@ libclllvm = static_library( + include_directories : clover_incs, + cpp_args : [ + cpp_vis_args, +- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')), ++ '-DLIBCLC_INCLUDEDIR="/usr/share"', + '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), + '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths( + dep_llvm.get_configtool_variable('libdir'), 'clang', +-- +2.20.1 +
package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 94bceeb621e36f3188c6246a763def8695526578 Mon Sep 17 00:00:00 2001 -From: Valentin Korenblit <[email protected]> -Date: Sat, 20 Oct 2018 10:56:23 +0200 -Subject: [PATCH] Set proper value for LIBCLC_INCLUDEDIR - -LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation -will look for OpenCL "headers" on the target, when building the OpenCL -kernels. - -The value returned by pkg-config for includedir is relevant when -cross-compiling, on the build machine. But in this specific case, we -really need a value that is valid on the target. - -Those headers are installed by the libclc package in /usr/share so -that they are not removed by Buildroot target-finalize logic. - -Signed-off-by: Valentin Korenblit <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 864dcae..cc2390b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2429,7 +2429,7 @@ if test "x$enable_opencl" = xyes; then - PKG_CONFIG_PATH environment variable. - By default libclc.pc is installed to /usr/local/share/pkgconfig/]) - else -- LIBCLC_INCLUDEDIR=`$PKG_CONFIG --variable=includedir libclc` -+ LIBCLC_INCLUDEDIR="/usr/share" - LIBCLC_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir libclc` - AC_SUBST([LIBCLC_INCLUDEDIR]) - AC_SUBST([LIBCLC_LIBEXECDIR]) --- -2.7.4 -
package/mesa3d/Config.in +1 -2
@@ -87,8 +87,7 @@ config BR2_PACKAGE_MESA3D_NEEDS_XA bool # Quote from mesa3d meson.build: "kmsro driver requires one or more -# renderonly drivers (vc4, etnaviv, freedreno)". But only vc4 support -# is available by using the (deprecated) autotools build system. +# renderonly drivers (vc4, etnaviv, freedreno)". config BR2_PACKAGE_MESA3D_GALLIUM_KMSRO bool
package/mesa3d/mesa3d.mk +57 -61
235 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v3 8/9 package/mesa3d: switch build system to meson
Hi,
Le 06/05/2019 ? 11:54, Romain Naour a ?crit?:
Quoted 12 lines
From: Bernd Kuhls <[email protected]>
Update patches for meson:
0002-configure.ac-invert-order-for-wayland-scanner-check.patch 0003-set-LIBCLC_INCLUDEDIR.patchDisable unused options that are set to "auto" mode. (valgrind, gallium-omx, power8).
Remove --disable-static option since there is no meson equivalent. Remove --disable-mangling since it's not yet supported by meson.
Quoted 7 lines
Use r100 instead of radeon as DRI name for
BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON.Add a new depedency on host-python3-mako since we can't use generated headers from the release archive [2].
[1] http://patchwork.ozlabs.org/patch/1084248/
[2] http://lists.busybox.net/pipermail/buildroot/2019-April/249057.html
It would be great to have reviewers on this series, otherwise we are stuck in mesa 19.0.x. Also we need meson to have the latest feature added after autotools freeze, see [1].
[1] https://bugs.busybox.net/show_bug.cgi?id=11906
Best regards,
Romain
Quoted 485 lines
Signed-off-by Bernd Kuhls <[email protected]>Signed-off-by Romain Naour <[email protected]>Cc Peter Seiderer <[email protected]>---
v2: rebase on mesa 19.0.3
Fix typo -Degl=true=false
Fixes: build without x11 by removing -Dglx=dri (Peter Seiderer) Doesn't use -Dglx=auto, instead use the newBR2_PACKAGE_MESA3D_OPENGL_GLXRemove workaround patch for python-mako, add host-python3-mako dependency--- ...vert-order-for-wayland-scanner-check.patch | 51 -------- ...d-scanner-provided-by-wayland-scanne.patch | 52 ++++++++ ...t-proper-value-for-LIBCLC_INCLUDEDIR.patch | 39 ++++++ .../mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch | 37 ------ package/mesa3d/Config.in | 3 +- package/mesa3d/mesa3d.mk | 118 +++++++++--------- 6 files changed, 149 insertions(+), 151 deletions(-) delete mode 100644 package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch create mode 100644 package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch create mode 100644 package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch delete mode 100644 package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patchpackage/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch deleted +0
-51@@ -1,51 +0,0 @@ -From ef96bac7cbbb11b98606864ead0f731dd5b71d5a Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <[email protected]> -Date: Thu, 17 Nov 2016 15:36:54 -0300 -Subject: [PATCH] configure.ac: invert order for wayland-scanner check - -When cross-compiling the .pc file might point to the wrong -wayland-scanner binary (target rather than host) resulting in a -non-executable and wrong scanner. -Try searching the PATH first, and if that fails fall back into -pkg-config. - -[Vincent: tweak patch for 17.1.1 version] - -Signed-off-by: Gustavo Zacarias <[email protected]> -Signed-off-by: Vicente Olivert Riera <[email protected]> -[Romain: rebase on 18.1] -Signed-off-by: Romain Naour <[email protected]> -[Bernd rebase on 18.3] -Signed-off-by: Bernd Kuhls <[email protected]> ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1fbdcc6c7..dcf87e7dd6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1841,17 +1841,16 @@ - fi - WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` - -- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -+ if test "x$WAYLAND_SCANNER" = x; then -+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, - WAYLAND_SCANNER='') -+ fi - PKG_CHECK_EXISTS([wayland-scanner >= 1.15], - AC_SUBST(SCANNER_ARG, 'private-code'), - AC_SUBST(SCANNER_ARG, 'code')) - -- if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -- fi -- - if test "x$WAYLAND_SCANNER" = "x:"; then - AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) - fi --- -2.14.3package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch new file +52
-0@@ -0,0 +1,52 @@ +From 0e107f7bac8d84d8fb2bb5b83bfb4474348a82c1 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Wed, 17 Apr 2019 22:47:05 +0200 +Subject: [PATCH] meson: use wayland-scanner provided by wayland-scanner-path + +When cross-compiling the .pc file might point to the wrong +wayland-scanner binary (target rather than host) resulting in a +non-executable and wrong scanner. +First try by using the path provided by wayland-scanner-path, +and if that fails fall back into pkg-config. + +Based on the patch for autotools provided by Gustavo Zacarias. + +Signed-off-by: Romain Naour <[email protected]> +--- + meson.build | 5 ++++- + meson_options.txt | 6 ++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6c4f1508855..ef0532b2cfb 100644 +--- a/meson.build ++++ b/meson.build +@@ -1319,7 +1319,10 @@ endif + + if with_platform_wayland + dep_wl_scanner = dependency('wayland-scanner', native: true) +- prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) ++ prog_wl_scanner = get_option('wayland-scanner-path') ++ if prog_wl_scanner == '' ++ prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) ++ endif + if dep_wl_scanner.version().version_compare('>= 1.15') + wl_scanner_arg = 'private-code' + else +diff --git a/meson_options.txt b/meson_options.txt +index ccf70659ff7..59ff8df8337 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -324,3 +324,9 @@ option( + value : true, + description : 'Enable direct rendering in GLX and EGL for DRI', + ) ++option( ++ 'wayland-scanner-path', ++ type : 'string', ++ value : '', ++ description : 'Locations to wayland-scanner binary. Default: use path from pkg-config' ++) +-- +2.20.1 +package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch new file +39
-0@@ -0,0 +1,39 @@ +From 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Wed, 17 Apr 2019 23:07:42 +0200 +Subject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR + +LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation +will look for OpenCL "headers" on the target, when building the OpenCL +kernels. + +The value returned by pkg-config for includedir is relevant when +cross-compiling, on the build machine. But in this specific case, we +really need a value that is valid on the target. + +Those headers are installed by the libclc package in /usr/share so +that they are not removed by Buildroot target-finalize logic. + +Based on the patch for autotools provided by Valentin Korenblit. + +Signed-off-by: Romain Naour <[email protected]> +--- + src/gallium/state_trackers/clover/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build +index 62ac5f5278d..ecdeb39669c 100644 +--- a/src/gallium/state_trackers/clover/meson.build ++++ b/src/gallium/state_trackers/clover/meson.build +@@ -49,7 +49,7 @@ libclllvm = static_library( + include_directories : clover_incs, + cpp_args : [ + cpp_vis_args, +- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')), ++ '-DLIBCLC_INCLUDEDIR="/usr/share"', + '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), + '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths( + dep_llvm.get_configtool_variable('libdir'), 'clang', +-- +2.20.1 +package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch deleted +0
-37@@ -1,37 +0,0 @@ -From 94bceeb621e36f3188c6246a763def8695526578 Mon Sep 17 00:00:00 2001 -From: Valentin Korenblit <[email protected]> -Date: Sat, 20 Oct 2018 10:56:23 +0200 -Subject: [PATCH] Set proper value for LIBCLC_INCLUDEDIR - -LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation -will look for OpenCL "headers" on the target, when building the OpenCL -kernels. - -The value returned by pkg-config for includedir is relevant when -cross-compiling, on the build machine. But in this specific case, we -really need a value that is valid on the target. - -Those headers are installed by the libclc package in /usr/share so -that they are not removed by Buildroot target-finalize logic. - -Signed-off-by: Valentin Korenblit <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 864dcae..cc2390b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2429,7 +2429,7 @@ if test "x$enable_opencl" = xyes; then - PKG_CONFIG_PATH environment variable. - By default libclc.pc is installed to /usr/local/share/pkgconfig/]) - else -- LIBCLC_INCLUDEDIR=`$PKG_CONFIG --variable=includedir libclc` -+ LIBCLC_INCLUDEDIR="/usr/share" - LIBCLC_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir libclc` - AC_SUBST([LIBCLC_INCLUDEDIR]) - AC_SUBST([LIBCLC_LIBEXECDIR]) --- -2.7.4 -package/mesa3d/Config.in +1
-2@@ -87,8 +87,7 @@ config BR2_PACKAGE_MESA3D_NEEDS_XA bool # Quote from mesa3d meson.build: "kmsro driver requires one or more -# renderonly drivers (vc4, etnaviv, freedreno)". But only vc4 support -# is available by using the (deprecated) autotools build system. +# renderonly drivers (vc4, etnaviv, freedreno)". config BR2_PACKAGE_MESA3D_GALLIUM_KMSRO boolpackage/mesa3d/mesa3d.mk +57
-61@@ -21,31 +21,24 @@ MESA3D_PROVIDES = MESA3D_DEPENDENCIES = \ host-bison \ host-flex \ + host-python3-mako \ expat \ libdrm \ zlib -# Disable assembly usage. -MESA3D_CONF_OPTS = --disable-asm - -# autotools are deprecated in favour of meson, for now force autotools -MESA3D_CONF_OPTS += --enable-autotools - -# Disable static, otherwise configure will fail with: "Cannot enable both static -# and shared." -ifeq ($(BR2_SHARED_STATIC_LIBS),y) -MESA3D_CONF_OPTS += --disable-static -endif +MESA3D_CONF_OPTS = \ + -Dasm=false \ + -Dgallium-omx=disabled \ + -Dpower8=false \ + -Dvalgrind=false ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm -MESA3D_CONF_OPTS += \ - --with-llvm-prefix=$(STAGING_DIR)/usr \ - --enable-llvm-shared-libs \ - --enable-llvm +MESA3D_CONF_ENV += LLVM_CONFIG=$(STAGING_DIR)/usr/bin/llvm-config +MESA3D_CONF_OPTS += -Dllvm=true else # Avoid automatic search of llvm-config -MESA3D_CONF_OPTS += --disable-llvm +MESA3D_CONF_OPTS += -Dllvm=false endif # Disable opencl-icd: OpenCL lib will be named libOpenCL instead of@@ -53,11 +46,9 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) MESA3D_PROVIDES += libopencl MESA3D_DEPENDENCIES += clang libclc -MESA3D_CONF_OPTS += --enable-opencl \ - --disable-opencl-icd \ - --with-clang-libdir=$(STAGING_DIR)/usr/lib +MESA3D_CONF_OPTS += -Dgallium-opencl=standalone else -MESA3D_CONF_OPTS += --disable-opencl +MESA3D_CONF_OPTS += -Dgallium-opencl=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y)@@ -82,16 +73,21 @@ MESA3D_DEPENDENCIES += \ xlib_libXxf86vm \ xorgproto \ libxcb -MESA3D_CONF_OPTS += --enable-glx --disable-mangling +# Disable-mangling not yet supported by meson build system. +# glx: +# dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi +# xlib : xlib conflicts with any dri driver +# gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. +MESA3D_CONF_OPTS += -Dglx=dri ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) -MESA3D_CONF_OPTS += --enable-xa +MESA3D_CONF_OPTS += -Dgallium-xa=true else -MESA3D_CONF_OPTS += --disable-xa +MESA3D_CONF_OPTS += -Dgallium-xa=false endif else MESA3D_CONF_OPTS += \ - --disable-glx \ - --disable-xa + -Dglx=disabled \ + -Dgallium-xa=false endif # Drivers@@ -111,63 +107,62 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100 # Vulkan Drivers MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) MESA3D_CONF_OPTS += \ - --without-gallium-drivers \ - --disable-gallium-extra-hud + -Dgallium-drivers= \ + -Dgallium-extra-hud=false else MESA3D_CONF_OPTS += \ - --enable-shared-glapi \ - --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ - --enable-gallium-extra-hud + -Dshared-glapi=true \ + -Dgallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ + -Dgallium-extra-hud=true endif ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) MESA3D_CONF_OPTS += \ - --without-dri-drivers --disable-dri3 + -Ddri-drivers= -Ddri3=false else ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) MESA3D_DEPENDENCIES += xlib_libxshmfence -MESA3D_CONF_OPTS += --enable-dri3 +MESA3D_CONF_OPTS += -Ddri3=true else -MESA3D_CONF_OPTS += --disable-dri3 +MESA3D_CONF_OPTS += -Ddri3=false endif MESA3D_CONF_OPTS += \ - --enable-shared-glapi \ - --enable-driglx-direct \ - --with-dri-driverdir=/usr/lib/dri \ - --with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) + -Dshared-glapi=true \ + -Dglx-direct=true \ + -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) endif ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ - --without-vulkan-drivers + -Dvulkan-drivers= else MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ - --enable-dri3 \ - --with-vulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) + -Ddri3=true \ + -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif # APIs ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) -MESA3D_CONF_OPTS += --enable-osmesa +MESA3D_CONF_OPTS += -Dosmesa=classic else -MESA3D_CONF_OPTS += --disable-osmesa +MESA3D_CONF_OPTS += -Dosmesa=none endif # Always enable OpenGL: -# - it is needed for GLES (mesa3d's ./configure is a bit weird) -MESA3D_CONF_OPTS += --enable-opengl --enable-dri +# - Building OpenGL ES without OpenGL is not supported, so always keep opengl enabled. +MESA3D_CONF_OPTS += -Dopengl=true # libva and mesa3d have a circular dependency # we do not need libva support in mesa3d, therefore disable this option -MESA3D_CONF_OPTS += --disable-va +MESA3D_CONF_OPTS += -Dgallium-va=false # libGL is only provided for a full xorg stack ifeq ($(BR2_PACKAGE_XORG7),y)@@ -194,57 +189,58 @@ endif ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEPENDENCIES += wayland wayland-protocols MESA3D_PLATFORMS += wayland +MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner endif ifeq ($(BR2_PACKAGE_XORG7),y) MESA3D_PLATFORMS += x11 endif MESA3D_CONF_OPTS += \ - --with-platforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) + -Dplatforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) MESA3D_PROVIDES += libegl MESA3D_CONF_OPTS += \ - --enable-gbm \ - --enable-egl + -Dgbm=true \ + -Degl=true else MESA3D_CONF_OPTS += \ - --disable-egl + -Degl=false endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) MESA3D_PROVIDES += libgles -MESA3D_CONF_OPTS += --enable-gles1 --enable-gles2 +MESA3D_CONF_OPTS += -Dgles1=true -Dgles2=true else -MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2 +MESA3D_CONF_OPTS += -Dgles1=false -Dgles2=false endif ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) MESA3D_DEPENDENCIES += xlib_libXvMC -MESA3D_CONF_OPTS += --enable-xvmc +MESA3D_CONF_OPTS += -Dgallium-xvmc=true else -MESA3D_CONF_OPTS += --disable-xvmc +MESA3D_CONF_OPTS += -Dgallium-xvmc=false endif ifeq ($(BR2_PACKAGE_LIBUNWIND),y) -MESA3D_CONF_OPTS += --enable-libunwind +MESA3D_CONF_OPTS += -Dlibunwind=true MESA3D_DEPENDENCIES += libunwind else -MESA3D_CONF_OPTS += --disable-libunwind +MESA3D_CONF_OPTS += -Dlibunwind=false endif ifeq ($(BR2_PACKAGE_LIBVDPAU),y) MESA3D_DEPENDENCIES += libvdpau -MESA3D_CONF_OPTS += --enable-vdpau +MESA3D_CONF_OPTS += -Dgallium-vdpau=true else -MESA3D_CONF_OPTS += --disable-vdpau +MESA3D_CONF_OPTS += -Dgallium-vdpau=false endif ifeq ($(BR2_PACKAGE_LM_SENSORS),y) -MESA3D_CONF_OPTS += --enable-lmsensors +MESA3D_CONF_OPTS += -Dlmsensors=true MESA3D_DEPENDENCIES += lm-sensors else -MESA3D_CONF_OPTS += --disable-lmsensors +MESA3D_CONF_OPTS += -Dlmsensors=false endif -$(eval $(autotools-package)) +$(eval $(meson-package))
PATCH v3 8/9 package/mesa3d: switch build system to meson
Am Tue, 25 Jun 2019 09:50:14 +0200 schrieb Romain Naour:
Quoted 3 lines
It would be great to have reviewers on this series, otherwise we are stuck in mesa 19.0.x. Also we need meson to have the latest feature added after autotools freeze, see [1].
Hi Romain,
these mesa3d options
$ grep MESA3D .config | grep -v \# BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_DRI_DRIVER=y BR2_PACKAGE_MESA3D_DRIVER=y BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y
result in a configure error:
Run-time dependency xcb found: NO (tried pkgconfig)
meson.build:1375:4: ERROR: Dependency "xcb" not found, tried pkgconfig
Regards, Bernd
PATCH v3 8/9 package/mesa3d: switch build system to meson
Am Tue, 25 Jun 2019 22:14:05 +0200 schrieb Bernd Kuhls:
Quoted 5 lines
Run-time dependency xcb found: NO (tried pkgconfig)
meson.build:1375:4: ERROR: Dependency "xcb" not found, tried pkgconfig
Regards, Bernd
Hi,
fixed by v4.
Regards, Bernd
PATCH v3 8/9 package/mesa3d: switch build system to meson
In reply to Romain NaourQuoted 106 lines · Romain Naour
From: Bernd Kuhls <[email protected]>
Update patches for meson:
0002-configure.ac-invert-order-for-wayland-scanner-check.patch 0003-set-LIBCLC_INCLUDEDIR.patchDisable unused options that are set to "auto" mode. (valgrind, gallium-omx, power8).
Remove --disable-static option since there is no meson equivalent. Remove --disable-mangling since it's not yet supported by meson.
Use r100 instead of radeon as DRI name for
BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON.Add a new depedency on host-python3-mako since we can't use generated headers from the release archive [2].
[1] http://patchwork.ozlabs.org/patch/1084248/
[2] http://lists.busybox.net/pipermail/buildroot/2019-April/249057.htmlSigned-off-by Bernd Kuhls <[email protected]>Signed-off-by Romain Naour <[email protected]>Cc Peter Seiderer <[email protected]>---
v2: rebase on mesa 19.0.3
Fix typo -Degl=true=false
Fixes: build without x11 by removing -Dglx=dri (Peter Seiderer) Doesn't use -Dglx=auto, instead use the newBR2_PACKAGE_MESA3D_OPENGL_GLXRemove workaround patch for python-mako, add host-python3-mako dependency--- ...vert-order-for-wayland-scanner-check.patch | 51 -------- ...d-scanner-provided-by-wayland-scanne.patch | 52 ++++++++ ...t-proper-value-for-LIBCLC_INCLUDEDIR.patch | 39 ++++++ .../mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch | 37 ------ package/mesa3d/Config.in | 3 +- package/mesa3d/mesa3d.mk | 118 +++++++++--------- 6 files changed, 149 insertions(+), 151 deletions(-) delete mode 100644 package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch create mode 100644 package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch create mode 100644 package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch delete mode 100644 package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patchpackage/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch deleted +0
-51@@ -1,51 +0,0 @@ -From ef96bac7cbbb11b98606864ead0f731dd5b71d5a Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <[email protected]> -Date: Thu, 17 Nov 2016 15:36:54 -0300 -Subject: [PATCH] configure.ac: invert order for wayland-scanner check - -When cross-compiling the .pc file might point to the wrong -wayland-scanner binary (target rather than host) resulting in a -non-executable and wrong scanner. -Try searching the PATH first, and if that fails fall back into -pkg-config. - -[Vincent: tweak patch for 17.1.1 version] - -Signed-off-by: Gustavo Zacarias <[email protected]> -Signed-off-by: Vicente Olivert Riera <[email protected]> -[Romain: rebase on 18.1] -Signed-off-by: Romain Naour <[email protected]> -[Bernd rebase on 18.3] -Signed-off-by: Bernd Kuhls <[email protected]> ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1fbdcc6c7..dcf87e7dd6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1841,17 +1841,16 @@ - fi - WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` - -- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -+ if test "x$WAYLAND_SCANNER" = x; then -+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, - WAYLAND_SCANNER='') -+ fi - PKG_CHECK_EXISTS([wayland-scanner >= 1.15], - AC_SUBST(SCANNER_ARG, 'private-code'), - AC_SUBST(SCANNER_ARG, 'code')) - -- if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -- fi -- - if test "x$WAYLAND_SCANNER" = "x:"; then - AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) - fi --- -2.14.3package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch new file +0
-0
package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch line 10
Quoted 10 lines
package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch new file +10
-0@@ -0,0 +1,52 @@ +From 0e107f7bac8d84d8fb2bb5b83bfb4474348a82c1 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Wed, 17 Apr 2019 22:47:05 +0200 +Subject: [PATCH] meson: use wayland-scanner provided by wayland-scanner-path + +When cross-compiling the .pc file might point to the wrong +wayland-scanner binary (target rather than host) resulting in a +non-executable and wrong scanner. +First try by using the path provided by wayland-scanner-path, +and if that fails fall back into pkg-config.
Try setting this meson config option instead:
-Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig
Quoted 395 lines
package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch new file +42
-0+ +Based on the patch for autotools provided by Gustavo Zacarias. + +Signed-off-by: Romain Naour <[email protected]> +--- + meson.build | 5 ++++- + meson_options.txt | 6 ++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6c4f1508855..ef0532b2cfb 100644 +--- a/meson.build ++++ b/meson.build +@@ -1319,7 +1319,10 @@ endif + + if with_platform_wayland + dep_wl_scanner = dependency('wayland-scanner', native: true) +- prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) ++ prog_wl_scanner = get_option('wayland-scanner-path') ++ if prog_wl_scanner == '' ++ prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) ++ endif + if dep_wl_scanner.version().version_compare('>= 1.15') + wl_scanner_arg = 'private-code' + else +diff --git a/meson_options.txt b/meson_options.txt +index ccf70659ff7..59ff8df8337 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -324,3 +324,9 @@ option( + value : true, + description : 'Enable direct rendering in GLX and EGL for DRI', + ) ++option( ++ 'wayland-scanner-path', ++ type : 'string', ++ value : '', ++ description : 'Locations to wayland-scanner binary. Default: use path from pkg-config' ++) +-- +2.20.1 +package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch new file +39
-0@@ -0,0 +1,39 @@ +From 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Wed, 17 Apr 2019 23:07:42 +0200 +Subject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR + +LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation +will look for OpenCL "headers" on the target, when building the OpenCL +kernels. + +The value returned by pkg-config for includedir is relevant when +cross-compiling, on the build machine. But in this specific case, we +really need a value that is valid on the target. + +Those headers are installed by the libclc package in /usr/share so +that they are not removed by Buildroot target-finalize logic. + +Based on the patch for autotools provided by Valentin Korenblit. + +Signed-off-by: Romain Naour <[email protected]> +--- + src/gallium/state_trackers/clover/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build +index 62ac5f5278d..ecdeb39669c 100644 +--- a/src/gallium/state_trackers/clover/meson.build ++++ b/src/gallium/state_trackers/clover/meson.build +@@ -49,7 +49,7 @@ libclllvm = static_library( + include_directories : clover_incs, + cpp_args : [ + cpp_vis_args, +- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')), ++ '-DLIBCLC_INCLUDEDIR="/usr/share"', + '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), + '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths( + dep_llvm.get_configtool_variable('libdir'), 'clang', +-- +2.20.1 +package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch deleted +0
-37@@ -1,37 +0,0 @@ -From 94bceeb621e36f3188c6246a763def8695526578 Mon Sep 17 00:00:00 2001 -From: Valentin Korenblit <[email protected]> -Date: Sat, 20 Oct 2018 10:56:23 +0200 -Subject: [PATCH] Set proper value for LIBCLC_INCLUDEDIR - -LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation -will look for OpenCL "headers" on the target, when building the OpenCL -kernels. - -The value returned by pkg-config for includedir is relevant when -cross-compiling, on the build machine. But in this specific case, we -really need a value that is valid on the target. - -Those headers are installed by the libclc package in /usr/share so -that they are not removed by Buildroot target-finalize logic. - -Signed-off-by: Valentin Korenblit <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 864dcae..cc2390b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2429,7 +2429,7 @@ if test "x$enable_opencl" = xyes; then - PKG_CONFIG_PATH environment variable. - By default libclc.pc is installed to /usr/local/share/pkgconfig/]) - else -- LIBCLC_INCLUDEDIR=`$PKG_CONFIG --variable=includedir libclc` -+ LIBCLC_INCLUDEDIR="/usr/share" - LIBCLC_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir libclc` - AC_SUBST([LIBCLC_INCLUDEDIR]) - AC_SUBST([LIBCLC_LIBEXECDIR]) --- -2.7.4 -package/mesa3d/Config.in +1
-2@@ -87,8 +87,7 @@ config BR2_PACKAGE_MESA3D_NEEDS_XA bool # Quote from mesa3d meson.build: "kmsro driver requires one or more -# renderonly drivers (vc4, etnaviv, freedreno)". But only vc4 support -# is available by using the (deprecated) autotools build system. +# renderonly drivers (vc4, etnaviv, freedreno)". config BR2_PACKAGE_MESA3D_GALLIUM_KMSRO boolpackage/mesa3d/mesa3d.mk +57
-62@@ -21,31 +21,24 @@ MESA3D_PROVIDES = MESA3D_DEPENDENCIES = \ host-bison \ host-flex \ + host-python3-mako \ expat \ libdrm \ zlib -# Disable assembly usage. -MESA3D_CONF_OPTS = --disable-asm - -# autotools are deprecated in favour of meson, for now force autotools -MESA3D_CONF_OPTS += --enable-autotools - -# Disable static, otherwise configure will fail with: "Cannot enable both static -# and shared." -ifeq ($(BR2_SHARED_STATIC_LIBS),y) -MESA3D_CONF_OPTS += --disable-static -endif +MESA3D_CONF_OPTS = \ + -Dasm=false \ + -Dgallium-omx=disabled \ + -Dpower8=false \ + -Dvalgrind=false ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm -MESA3D_CONF_OPTS += \ - --with-llvm-prefix=$(STAGING_DIR)/usr \ - --enable-llvm-shared-libs \ - --enable-llvm +MESA3D_CONF_ENV += LLVM_CONFIG=$(STAGING_DIR)/usr/bin/llvm-config +MESA3D_CONF_OPTS += -Dllvm=true else # Avoid automatic search of llvm-config -MESA3D_CONF_OPTS += --disable-llvm +MESA3D_CONF_OPTS += -Dllvm=false endif # Disable opencl-icd: OpenCL lib will be named libOpenCL instead of@@ -53,11 +46,9 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) MESA3D_PROVIDES += libopencl MESA3D_DEPENDENCIES += clang libclc -MESA3D_CONF_OPTS += --enable-opencl \ - --disable-opencl-icd \ - --with-clang-libdir=$(STAGING_DIR)/usr/lib +MESA3D_CONF_OPTS += -Dgallium-opencl=standalone else -MESA3D_CONF_OPTS += --disable-opencl +MESA3D_CONF_OPTS += -Dgallium-opencl=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y)@@ -82,16 +73,21 @@ MESA3D_DEPENDENCIES += \ xlib_libXxf86vm \ xorgproto \ libxcb -MESA3D_CONF_OPTS += --enable-glx --disable-mangling +# Disable-mangling not yet supported by meson build system. +# glx: +# dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi +# xlib : xlib conflicts with any dri driver +# gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. +MESA3D_CONF_OPTS += -Dglx=dri ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) -MESA3D_CONF_OPTS += --enable-xa +MESA3D_CONF_OPTS += -Dgallium-xa=true else -MESA3D_CONF_OPTS += --disable-xa +MESA3D_CONF_OPTS += -Dgallium-xa=false endif else MESA3D_CONF_OPTS += \ - --disable-glx \ - --disable-xa + -Dglx=disabled \ + -Dgallium-xa=false endif # Drivers@@ -111,63 +107,62 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100 # Vulkan Drivers MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) MESA3D_CONF_OPTS += \ - --without-gallium-drivers \ - --disable-gallium-extra-hud + -Dgallium-drivers= \ + -Dgallium-extra-hud=false else MESA3D_CONF_OPTS += \ - --enable-shared-glapi \ - --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ - --enable-gallium-extra-hud + -Dshared-glapi=true \ + -Dgallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ + -Dgallium-extra-hud=true endif ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) MESA3D_CONF_OPTS += \ - --without-dri-drivers --disable-dri3 + -Ddri-drivers= -Ddri3=false else ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) MESA3D_DEPENDENCIES += xlib_libxshmfence -MESA3D_CONF_OPTS += --enable-dri3 +MESA3D_CONF_OPTS += -Ddri3=true else -MESA3D_CONF_OPTS += --disable-dri3 +MESA3D_CONF_OPTS += -Ddri3=false endif MESA3D_CONF_OPTS += \ - --enable-shared-glapi \ - --enable-driglx-direct \ - --with-dri-driverdir=/usr/lib/dri \ - --with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) + -Dshared-glapi=true \ + -Dglx-direct=true \ + -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) endif ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ - --without-vulkan-drivers + -Dvulkan-drivers= else MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ - --enable-dri3 \ - --with-vulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) + -Ddri3=true \ + -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif # APIs ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) -MESA3D_CONF_OPTS += --enable-osmesa +MESA3D_CONF_OPTS += -Dosmesa=classic else -MESA3D_CONF_OPTS += --disable-osmesa +MESA3D_CONF_OPTS += -Dosmesa=none endif # Always enable OpenGL: -# - it is needed for GLES (mesa3d's ./configure is a bit weird) -MESA3D_CONF_OPTS += --enable-opengl --enable-dri +# - Building OpenGL ES without OpenGL is not supported, so always keep opengl enabled. +MESA3D_CONF_OPTS += -Dopengl=true # libva and mesa3d have a circular dependency # we do not need libva support in mesa3d, therefore disable this option -MESA3D_CONF_OPTS += --disable-va +MESA3D_CONF_OPTS += -Dgallium-va=false # libGL is only provided for a full xorg stack ifeq ($(BR2_PACKAGE_XORG7),y)@@ -194,57 +189,58 @@ endif ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEPENDENCIES += wayland wayland-protocols MESA3D_PLATFORMS += wayland +MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner endif ifeq ($(BR2_PACKAGE_XORG7),y) MESA3D_PLATFORMS += x11 endif MESA3D_CONF_OPTS += \ - --with-platforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) + -Dplatforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) MESA3D_PROVIDES += libegl MESA3D_CONF_OPTS += \ - --enable-gbm \ - --enable-egl + -Dgbm=true \ + -Degl=true else MESA3D_CONF_OPTS += \ - --disable-egl + -Degl=false endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) MESA3D_PROVIDES += libgles -MESA3D_CONF_OPTS += --enable-gles1 --enable-gles2 +MESA3D_CONF_OPTS += -Dgles1=true -Dgles2=true else -MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2 +MESA3D_CONF_OPTS += -Dgles1=false -Dgles2=false endif ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) MESA3D_DEPENDENCIES += xlib_libXvMC -MESA3D_CONF_OPTS += --enable-xvmc +MESA3D_CONF_OPTS += -Dgallium-xvmc=true else -MESA3D_CONF_OPTS += --disable-xvmc +MESA3D_CONF_OPTS += -Dgallium-xvmc=false endif ifeq ($(BR2_PACKAGE_LIBUNWIND),y) -MESA3D_CONF_OPTS += --enable-libunwind +MESA3D_CONF_OPTS += -Dlibunwind=true MESA3D_DEPENDENCIES += libunwind else -MESA3D_CONF_OPTS += --disable-libunwind +MESA3D_CONF_OPTS += -Dlibunwind=false endif ifeq ($(BR2_PACKAGE_LIBVDPAU),y) MESA3D_DEPENDENCIES += libvdpau -MESA3D_CONF_OPTS += --enable-vdpau +MESA3D_CONF_OPTS += -Dgallium-vdpau=true else -MESA3D_CONF_OPTS += --disable-vdpau +MESA3D_CONF_OPTS += -Dgallium-vdpau=false endif ifeq ($(BR2_PACKAGE_LM_SENSORS),y) -MESA3D_CONF_OPTS += --enable-lmsensors +MESA3D_CONF_OPTS += -Dlmsensors=true MESA3D_DEPENDENCIES += lm-sensors else -MESA3D_CONF_OPTS += --disable-lmsensors +MESA3D_CONF_OPTS += -Dlmsensors=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) --2.20.1
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v3 9/9 package/mesa3d: select kmsro for etnaviv
In reply to Romain NaourQuote from mesa3d meson.build:
"kmsro driver requires one or more renderonly drivers (vc4, etnaviv, freedreno)".
--- package/mesa3d/Config.in | 1 + 1 file changed, 1 insertion(+)
package/mesa3d/Config.in +1 -0
@@ -97,6 +97,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV bool "Gallium Etnaviv driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_ETNAVIV + select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO select BR2_PACKAGE_MESA3D_OPENGL_EGL help Mesa driver for Vivante GPUs.
Signature · 1 line
2.20.1