package/python3-mako: new package
PATCH v6 1/10 package/python3-mako: new package
From: Romain Naour <[email protected]>
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/
---
v6: no changes
v5: no changes
v4: no changes
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 v6 2/10 package/mesa3d: rename OSMesa option
From: Romain Naour <[email protected]>
This option is renamed in order to match the naming used by the meson buildsystem.
---
v6: rebased (Bernd)
v5: no changes
v4: rebased (Bernd)
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.08" +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_GCC_VERSION_6_X bool "gcc 6.x support removed" select BR2_LEGACY
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 v6 3/10 package/mesa3d: add OSMesa classic needs dri swrast
In reply to Bernd KuhlsFrom: Romain Naour <[email protected]>
The 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
---
v6: no changes
v5: no changes
v4: rebased (Bernd)
package/mesa3d/Config.in | 4 ++++ 1 file changed, 4 insertions(+)
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 v6 4/10 package/mesa3d: Only one swrast provider can be built
In reply to Bernd KuhlsFrom: Romain Naour <[email protected]>
https://cgit.freedesktop.org/mesa/mesa/commit/?id=de24d61765011ed4bfc169b8ad8cf67e86b1f3bd
---
v6: no changes
v5: no changes
v4: rebased (Bernd)
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 v6 5/10 package/mesa3d: add xvmc option
In reply to Bernd KuhlsFrom: Romain Naour <[email protected]>
"XVMC state tracker requires at least one of the following gallium drivers: r600, nouveau."
https://cgit.freedesktop.org/mesa/mesa/commit/?id=22a817af8a89eb3c762fc3e07b443a3ce37d7416
---
v6: no changes
v5: no changes
v4: rebased (Bernd)
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 v6 6/10 package/mesa3d: Gallium xa state tracker is only available for nouveau and svga Gallium drivers
In reply to Bernd KuhlsFrom: Romain Naour <[email protected]>
i915 and freedreno Gallium drivers are not currently supported by mesa3d package.
https://cgit.freedesktop.org/mesa/mesa/commit/?id=0ba909f0f111824223bc38563d1a6bc73e69c2cc
---
v6: no changes
v5: no changes
v4: rebased (Bernd)
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 v6 7/10 package/mesa3d: add a new option to enable GLX support
In reply to Bernd KuhlsFrom: Romain Naour <[email protected]>
When 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
[Bernd: moved x11 dependencies from glx condition to xorg7 condition to
fix build error with enabled egl without glx BR2_PACKAGE_HAS_LIBGL needs to depend on BR2_PACKAGE_MESA3D_OPENGL_GLX]
---
v6: no changes
v5: fixed libgl dependency (Bernd)
v4: fixed EGL build error (Bernd)
package/mesa3d/Config.in | 16 ++++++++++++++-- package/mesa3d/mesa3d.mk | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 12 deletions(-)
package/mesa3d/Config.in +14 -2
@@ -6,7 +6,7 @@ menuconfig BR2_PACKAGE_MESA3D depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_MESA3D_OPENGL_GLX select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
@@ -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
@@ -301,7 +313,7 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES endif # BR2_PACKAGE_MESA3D_DRIVER config BR2_PACKAGE_PROVIDES_LIBGL - default "mesa3d" if BR2_PACKAGE_XORG7 + default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX config BR2_PACKAGE_PROVIDES_LIBEGL default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL
package/mesa3d/mesa3d.mk +10 -10
@@ -72,16 +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) -MESA3D_DEPENDENCIES += \ - xlib_libX11 \ - xlib_libXext \ - xlib_libXdamage \ - xlib_libXfixes \ - xlib_libXrandr \ - xlib_libXxf86vm \ - xorgproto \ - libxcb +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) MESA3D_CONF_OPTS += --enable-glx --disable-mangling ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) MESA3D_CONF_OPTS += --enable-xa
@@ -196,6 +187,15 @@ MESA3D_DEPENDENCIES += wayland wayland-protocols MESA3D_PLATFORMS += wayland endif ifeq ($(BR2_PACKAGE_XORG7),y) +MESA3D_DEPENDENCIES += \ + xlib_libX11 \ + xlib_libXext \ + xlib_libXdamage \ + xlib_libXfixes \ + xlib_libXrandr \ + xlib_libXxf86vm \ + xorgproto \ + libxcb MESA3D_PLATFORMS += x11 endif
Signature · 1 line
2.20.1
PATCH v6 7/10 package/mesa3d: add a new option to enable GLX support
Hi,
Quoted 16 lines · Bernd Kuhls
From: Romain Naour <[email protected]>
When switching to meson build system, enabling GLX support require at least one DRI or Gallium dirver.
So add a dependency on
BR2_PACKAGE_MESA3D_DRIVERforBR2_PACKAGE_MESA3D_OPENGL_GLXoption.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
Quoted 6 lines
Signed-off-by Romain Naour <[email protected]>[Bernd: moved x11 dependencies from glx condition to xorg7 condition to
fix build error with enabled egl without glxBR2_PACKAGE_HAS_LIBGLneeds to depend onBR2_PACKAGE_MESA3D_OPENGL_GLX]Signed-off-by Bernd Kuhls <[email protected]>
I think there is an issue with this patch on v6. If I enable mesa and xorg, I hit:
package/mesa3d/mesa3d.mk:250: *** Configuration error: both "mesa3d" and are selected as providers for virtual package "libgl". Only one provider can be selected at a time. Please fix your configuration. Stop.
I can reproduce this with a simple config like:
BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_NEON=y
BR2_ARM_ENABLE_VFP=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_XORG7=y
Erico
PATCH v6 7/10 package/mesa3d: add a new option to enable GLX support
Am Sun, 11 Aug 2019 01:00:33 +0200 schrieb Erico Nunes:
Quoted 7 lines
package/mesa3d/mesa3d.mk:250: *** Configuration error: both "mesa3d" and are selected as providers for virtual package "libgl". Only one provider can be selected at a time. Please fix your configuration. Stop.I can reproduce this with a simple config like:
Quoted 10 lines
BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_NEON=y
BR2_ARM_ENABLE_VFP=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_XORG7=y
Hi Enrico,
$ grep LIBGL .config BR2_PACKAGE_PROVIDES_LIBGLES="mesa3d" BR2_PACKAGE_HAS_LIBGLES=y # BR2_PACKAGE_LIBGLIB2 is not set # BR2_PACKAGE_LIBGLOB is not set
$ grep mesa3d .config BR2_PACKAGE_PROVIDES_LIBEGL="mesa3d" BR2_PACKAGE_PROVIDES_LIBGLES="mesa3d"
$ grep PROVIDES .config | grep -v _HOST_ BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL="toolchain-external-arm-arm" BR2_PACKAGE_PROVIDES_SKELETON="skeleton-init-sysv" BR2_PACKAGE_PROVIDES_LIBEGL="mesa3d" BR2_PACKAGE_PROVIDES_LIBGLES="mesa3d" BR2_PACKAGE_PROVIDES_ZLIB="libzlib"
I do not understand why the error occurs, libgl was not selected by any package. It seems some core component of buildroot is broken w.r.t. detection of virtual packages...
Regards, Bernd
PATCH v6 7/10 package/mesa3d: add a new option to enable GLX support
Hi Erico, Bernd, All,
Le 11/08/2019 ? 09:12, Bernd Kuhls a ?crit?:
Quoted 39 lines
Am Sun, 11 Aug 2019 01:00:33 +0200 schrieb Erico Nunes:
Quoted 7 lines
package/mesa3d/mesa3d.mk:250: *** Configuration error: both "mesa3d" and are selected as providers for virtual package "libgl". Only one provider can be selected at a time. Please fix your configuration. Stop.I can reproduce this with a simple config like:
Quoted 10 lines
BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_NEON=y
BR2_ARM_ENABLE_VFP=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_XORG7=yHi Enrico,
$ grep LIBGL .config BR2_PACKAGE_PROVIDES_LIBGLES="mesa3d" BR2_PACKAGE_HAS_LIBGLES=y # BR2_PACKAGE_LIBGLIB2 is not set # BR2_PACKAGE_LIBGLOB is not set$ grep mesa3d .config BR2_PACKAGE_PROVIDES_LIBEGL="mesa3d" BR2_PACKAGE_PROVIDES_LIBGLES="mesa3d"$ grep PROVIDES .config | grep -v _HOST_ BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL="toolchain-external-arm-arm" BR2_PACKAGE_PROVIDES_SKELETON="skeleton-init-sysv" BR2_PACKAGE_PROVIDES_LIBEGL="mesa3d" BR2_PACKAGE_PROVIDES_LIBGLES="mesa3d" BR2_PACKAGE_PROVIDES_ZLIB="libzlib"
Quoted 3 lines
I do not understand why the error occurs, libgl was not selected by any package. It seems some core component of buildroot is broken w.r.t. detection of virtual packages...
Thanks for reporting the issue,
Indeed this patch trigger the issue, I think we need to replace BR2_PACKAGE_XORG7 by BR2_PACKAGE_MESA3D_OPENGL_GLX before making mesa3d a libgl provider:
https://git.buildroot.net/buildroot/tree/package/mesa3d/mesa3d.mk#n174
Before this series, enabling xorg package meant enabling the glx support in mesa3d. So we probably want to replace all BR2_PACKAGE_XORG7 by BR2_PACKAGE_MESA3D_OPENGL_GLX in mesa3d.mk.
I'm not sure if enabling x11 plateform (MESA3D_PLATFORMS += x11) without GLX support can work.
Best regards,
Romain
Quoted 8 lines
Regards, Bernd
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v6 7/10 package/mesa3d: add a new option to enable GLX support
Am Sun, 11 Aug 2019 12:02:37 +0200 schrieb Romain Naour:
Quoted 5 lines
Indeed this patch trigger the issue, I think we need to replace
BR2_PACKAGE_XORG7byBR2_PACKAGE_MESA3D_OPENGL_GLXbefore making mesa3d a libgl provider:https://git.buildroot.net/buildroot/tree/package/mesa3d/mesa3d.mk#n174
Hi Romain,
done, sent v7 including bump to 19.1.4 and lima driver:
http://patchwork.ozlabs.org/project/buildroot/list/?series=124414
Regards, Bernd
PATCH v6 7/10 package/mesa3d: add a new option to enable GLX support
Hi Bernd,
Le 11/08/2019 ? 12:42, Bernd Kuhls a ?crit?:
Quoted 6 lines
Am Sun, 11 Aug 2019 12:02:37 +0200 schrieb Romain Naour:
Quoted 4 lines
Indeed this patch trigger the issue, I think we need to replace
BR2_PACKAGE_XORG7byBR2_PACKAGE_MESA3D_OPENGL_GLXbefore making mesa3d a libgl provider:
Quoted 6 lines
Hi Romain,
done, sent v7 including bump to 19.1.4 and lima driver:
http://patchwork.ozlabs.org/project/buildroot/list/?series=124414
Actually the Lima driver is not the only new driver in newer mesa3d release. There is also panfrost driver.
Actually I already theses patches locally but since the mesa package version is stuck due to autotools -> meson switch I didn't sent theses patches in this series.
Lima and panfrost are Gallium drivers that can be used as kmsro.
Best regards,
Romain
Quoted 8 lines
Regards, Bernd
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v6 7/10 package/mesa3d: add a new option to enable GLX support
Quoted 16 lines · Romain Naour
Hi Bernd,
Le 11/08/2019 ? 12:42, Bernd Kuhls a ?crit :
Quoted 12 lines
Am Sun, 11 Aug 2019 12:02:37 +0200 schrieb Romain Naour:
Quoted 5 lines
Indeed this patch trigger the issue, I think we need to replace
BR2_PACKAGE_XORG7byBR2_PACKAGE_MESA3D_OPENGL_GLXbefore making mesa3d a libgl provider:https://git.buildroot.net/buildroot/tree/package/mesa3d/mesa3d.mk#n174
Hi Romain,
done, sent v7 including bump to 19.1.4 and lima driver:
http://patchwork.ozlabs.org/project/buildroot/list/?series=124414
Thanks for debugging and fixing it.
Quoted 5 lines
Actually the Lima driver is not the only new driver in newer mesa3d release. There is also panfrost driver.
Actually I already theses patches locally but since the mesa package version is stuck due to autotools -> meson switch I didn't sent theses patches in this series.
Yes, I had an early version of this patchset applied locally for lima development, as it requires meson. I have been waiting for this to be merged so we can finally have lima (and panfrost) in Buildroot.
Cheers
Erico
PATCH v6 7/10 package/mesa3d: add a new option to enable GLX support
In reply to Romain NaourAm Sun, 11 Aug 2019 13:24:34 +0200 schrieb Romain Naour:
Quoted 1 line
Lima and panfrost are Gallium drivers that can be used as kmsro.
Hi Romain,
sent v8 for the -next branch:
http://patchwork.ozlabs.org/project/buildroot/list/?series=124438
including the panfrost driver and selecting ksmro for lima.
I will prepare a rebased Kodi 18-bump series (not as RFC ;)) soon, maybe it can be included in the -next branch to iron out problems until 2019.11?
Regards, Bernd
PATCH v6 7/10 package/mesa3d: add a new option to enable GLX support
Am Sun, 11 Aug 2019 14:59:43 +0200 schrieb Bernd Kuhls:
Quoted 6 lines
Am Sun, 11 Aug 2019 13:24:34 +0200 schrieb Romain Naour:
Quoted 1 line
Lima and panfrost are Gallium drivers that can be used as kmsro.
Hi Romain,
Quoted 8 lines
sent v8 for the -next branch:
http://patchwork.ozlabs.org/project/buildroot/list/?series=124438including the panfrost driver and selecting ksmro for lima.
I will prepare a rebased Kodi 18-bump series (not as RFC ;)) soon, maybe it can be included in the -next branch to iron out problems until 2019.11?
Hi,
sent v9, mesa glx was broken, reworked x11 dependencies again:
http://patchwork.ozlabs.org/project/buildroot/list/?series=124441
For those of you who would like to test kodi18 you can use this branch based on buildroot master including mesa3d 19.1 bump v9 and kodi18 including gbm support: https://github.com/bkuhls/buildroot/tree/kodi18
Regards, Bernd
PATCH v6 8/10 package/mesa3d: switch build system to meson
In reply to Bernd KuhlsUpdate 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
---
v6: no changes
v5: no changes
v4: no changes
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 v6 9/10 package/mesa3d: select kmsro for etnaviv
In reply to Bernd KuhlsFrom: Romain Naour <[email protected]>
Quote from mesa3d meson.build:
"kmsro driver requires one or more renderonly drivers (vc4, etnaviv, freedreno)".
---
v6: no changes
v5: no changes
v4: no changes
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
PATCH v6 10/10 package/{mesa3d, mesa3d-headers}: bump version to 19.1.3
In reply to Bernd Kuhls---
v6: no changes
v5: initial version
package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 10 +++++----- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
package/mesa3d-headers/mesa3d-headers.mk +1 -1
@@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 19.0.8 +MESA3D_HEADERS_VERSION = 19.1.3 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d
package/mesa3d/mesa3d.hash +5 -5
@@ -1,7 +1,7 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2019-June/000525.html -md5 9634964d87f1ce8d0230493e43f34c50 mesa-19.0.8.tar.xz -sha1 5fd340a6304f7501014e1bd7291e4cfa7a6efcdb mesa-19.0.8.tar.xz -sha256 d017eb53a810c32dabeedf6ca2238ae1e897ce9090e470e9ce1d6c9e3f1b0862 mesa-19.0.8.tar.xz -sha512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d mesa-19.0.8.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2019-July/000529.html +md5 9772ebf9ac40289a62a02c046904c8af mesa-19.1.3.tar.xz +sha1 ee3b1b4f9dac391d17b5f5325e41c1d3fcd1e730 mesa-19.1.3.tar.xz +sha256 845460b2225d15c15d4a9743dec798ff0b7396b533011d43e774e67f7825b7e0 mesa-19.1.3.tar.xz +sha512 787310c43089142209ff7db298489b0815b630577680d5ce1bc3f796eed3772ba41f03e5e773b77ae084c191ed4e365eac1753166ce60f12b8f5974d55762eeb mesa-19.1.3.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html
package/mesa3d/mesa3d.mk +1 -1
@@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 19.0.8 +MESA3D_VERSION = 19.1.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos
Signature · 1 line
2.20.1
PATCH v6 1/10 package/python3-mako: new package
In reply to Bernd KuhlsApplied to:
68bf8420c1e5ebd0eedabf0098ad2b5c4d4fa840
Platform:
IMX6 Quad Sabre SD derivative (Poslab SavageBoard)
CPU:
ARMv7 Processor [412fc09a] revision 10 (ARMv7), cr=10c5387d
GPU:
etnaviv-gpu 130000.gpu: model: GC2000, revision: 5108 etnaviv-gpu 134000.gpu: model: GC320, revision: 5007 etnaviv-gpu 2204000.gpu: model: GC355, revision: 1215
Buildroot base configuration:
imx6-sabresd_qt5_defconfig
Changed/Added Buildroot configuration parameters:
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y
Kernel version:
v4.19.16
Kernel base configuration:
imx_v6_v7_defconfig
Some of the dmesg lines:
etnaviv-gpu 2204000.gpu: Ignoring GPU with VG and FE2.0 [drm] Initialized etnaviv 1.2.0 20151214 for etnaviv on minor 0 ..
[drm] Initialized imx-drm 1.0.0 20120507 for display-subsystem on
minor 1
glmark2-es2-drm score:
51
Huge thanks to all involved!
Cengiz Can
@cengiz_io
PATCH v6 1/10 package/python3-mako: new package
In reply to Bernd Kuhls--
Applied to:
68bf8420c1e5ebd0eedabf0098ad2b5c4d4fa840
Platform:
IMX6 Quad Sabre SD derivative (Poslab SavageBoard)
CPU:
ARMv7 Processor [412fc09a] revision 10 (ARMv7), cr=10c5387d
GPU:
etnaviv-gpu 130000.gpu: model: GC2000, revision: 5108 etnaviv-gpu 134000.gpu: model: GC320, revision: 5007 etnaviv-gpu 2204000.gpu: model: GC355, revision: 1215
Buildroot base configuration:
imx6-sabresd_qt5_defconfig
Changed/Added Buildroot configuration parameters:
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y
Kernel version:
v4.19.16
Kernel base configuration:
imx_v6_v7_defconfig
Some of the dmesg lines:
etnaviv-gpu 2204000.gpu: Ignoring GPU with VG and FE2.0 [drm] Initialized etnaviv 1.2.0 20151214 for etnaviv on minor 0 ..
[drm] Initialized imx-drm 1.0.0 20120507 for display-subsystem on
minor 1
glmark2-es2-drm score:
51
Huge thanks to all involved!
Cengiz Can
@cengiz_io