Update buildroot 2020.02.01 (#622)
* Update buildroot 2020.02.01 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix LN * Fix wpa Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix lint Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * fix-network Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix script Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
@@ -0,0 +1,49 @@
|
||||
From 8417ca1725d523493d8f6782699273dc056888ac Mon Sep 17 00:00:00 2001
|
||||
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
|
||||
Date: Thu, 1 Aug 2019 20:51:55 +0300
|
||||
Subject: [PATCH] tests: fix test build requiring gles3
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This should be built only on gles3.
|
||||
|
||||
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
|
||||
Reported-by: Krzysztof Raszkowski <krzysztof.raszkowski@intel.com>
|
||||
Fixes: ef761094be ("tests: Reproducer for 110796")
|
||||
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
|
||||
[Retrieved from:
|
||||
https://gitlab.freedesktop.org/mesa/piglit/commit/8417ca1725d523493d8f6782699273dc056888ac]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
tests/shaders/CMakeLists.gl.txt | 1 -
|
||||
tests/shaders/CMakeLists.gles3.txt | 1 +
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
|
||||
index f1512f9cf..a299001cb 100644
|
||||
--- a/tests/shaders/CMakeLists.gl.txt
|
||||
+++ b/tests/shaders/CMakeLists.gl.txt
|
||||
@@ -43,7 +43,6 @@ IF (UNIX)
|
||||
ENDIF (UNIX)
|
||||
piglit_add_executable (glsl-arb-fragment-coord-conventions glsl-arb-fragment-coord-conventions.c)
|
||||
piglit_add_executable (glsl-bindattriblocation glsl-bindattriblocation.c)
|
||||
-piglit_add_executable (glsl-bug-110796 glsl-bug-110796.c)
|
||||
piglit_add_executable (glsl-bug-22603 glsl-bug-22603.c)
|
||||
piglit_add_executable (glsl-dlist-getattriblocation glsl-dlist-getattriblocation.c)
|
||||
piglit_add_executable (glsl-explicit-location-01 glsl-explicit-location-01.c)
|
||||
diff --git a/tests/shaders/CMakeLists.gles3.txt b/tests/shaders/CMakeLists.gles3.txt
|
||||
index 18b8c3534..c8ccfad42 100644
|
||||
--- a/tests/shaders/CMakeLists.gles3.txt
|
||||
+++ b/tests/shaders/CMakeLists.gles3.txt
|
||||
@@ -3,6 +3,7 @@ link_libraries(
|
||||
)
|
||||
|
||||
piglit_add_executable (built-in-constants_${piglit_target_api} built-in-constants.c parser_utils.c)
|
||||
+piglit_add_executable (glsl-bug-110796 glsl-bug-110796.c)
|
||||
piglit_add_executable(shader_runner_${piglit_target_api} shader_runner.c parser_utils.c)
|
||||
|
||||
# vim: ft=cmake:
|
||||
--
|
||||
2.24.1
|
||||
|
||||
35
buildroot/package/piglit/Config.in
Normal file
35
buildroot/package/piglit/Config.in
Normal file
@@ -0,0 +1,35 @@
|
||||
config BR2_PACKAGE_PIGLIT
|
||||
bool "piglit"
|
||||
depends on BR2_PACKAGE_PYTHON3 # python3 only script
|
||||
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_WAFFLE_SUPPORTS_GLX || \
|
||||
BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \
|
||||
BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \
|
||||
BR2_PACKAGE_WAFFLE_SUPPORTS_GBM
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
|
||||
select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND
|
||||
select BR2_PACKAGE_MESA3D_DEMOS # glxinfo
|
||||
select BR2_PACKAGE_PYTHON_MAKO
|
||||
select BR2_PACKAGE_PYTHON_NUMPY
|
||||
select BR2_PACKAGE_PYTHON_SIX
|
||||
select BR2_PACKAGE_PYTHON3_BZIP2
|
||||
select BR2_PACKAGE_PYTHON3_PYEXPAT
|
||||
select BR2_PACKAGE_PYTHON3_XZ
|
||||
select BR2_PACKAGE_PYTHON3_ZLIB
|
||||
select BR2_PACKAGE_UTIL_LINUX # runtime
|
||||
select BR2_PACKAGE_UTIL_LINUX_BINARIES # requires real dmesg tool
|
||||
select BR2_PACKAGE_WAFFLE # wflinfo, libwaffle-1
|
||||
select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Piglit is an open-source test suite for OpenGL
|
||||
implementations.
|
||||
|
||||
https://piglit.freedesktop.org
|
||||
|
||||
comment "piglit needs glibc or musl"
|
||||
depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
|
||||
6
buildroot/package/piglit/piglit.hash
Normal file
6
buildroot/package/piglit/piglit.hash
Normal file
@@ -0,0 +1,6 @@
|
||||
# Locally calculated
|
||||
sha256 4eba46520df1c47b0aea5446c302ff51d52f905a63d1ba29230866fc6c952a2e piglit-ef761094be04d14e258ad7706e7295f80d4411f2.tar.gz
|
||||
sha256 dcc398730859aee7cc1d6aa57f526f8d181b47bb3a49830e85b5723d5bc2c3bc COPYING
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licences/GPL-2
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 licences/GPL-3
|
||||
sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c licences/LGPL-2
|
||||
72
buildroot/package/piglit/piglit.mk
Normal file
72
buildroot/package/piglit/piglit.mk
Normal file
@@ -0,0 +1,72 @@
|
||||
################################################################################
|
||||
#
|
||||
# piglit
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PIGLIT_VERSION = ef761094be04d14e258ad7706e7295f80d4411f2
|
||||
PIGLIT_SITE = https://gitlab.freedesktop.org/mesa/piglit.git
|
||||
PIGLIT_SITE_METHOD = git
|
||||
PIGLIT_LICENSE = MIT (code), \
|
||||
LGPL-2.0+ (tests/glslparsertest/glsl2/gst-gl-*), \
|
||||
LGPL-2.1+ (some tests), \
|
||||
GPL-3.0 (tests/glslparsertest/glsl2/norsetto-*), \
|
||||
GPL-2.0+ (tests/glslparsertest/glsl2/xreal-*, some other shaders), \
|
||||
BSD-3-Clause (tests/glslparsertest/shaders/*)
|
||||
PIGLIT_LICENSE_FILES = COPYING licences/GPL-2 licences/GPL-3 licences/LGPL-2
|
||||
|
||||
PIGLIT_DEPENDENCIES = host-pkgconf \
|
||||
host-python-mako \
|
||||
host-python-numpy \
|
||||
host-python-six \
|
||||
libpng \
|
||||
python-mako \
|
||||
python-numpy \
|
||||
python-six \
|
||||
waffle \
|
||||
zlib
|
||||
|
||||
PIGLIT_CONF_OPTS += \
|
||||
-DPIGLIT_USE_WAFFLE=ON \
|
||||
-DPIGLIT_BUILD_CL_TESTS=OFF \
|
||||
-DPIGLIT_BUILD_WGL_TESTS=OFF \
|
||||
-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XORG7),y)
|
||||
# libxcb for xcb-dri2
|
||||
PIGLIT_DEPENDENCIES += \
|
||||
xlib_libX11 \
|
||||
xlib_libXext \
|
||||
xorgproto \
|
||||
$(if $(BR2_PACKAGE_LIBXCB),libxcb)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
|
||||
PIGLIT_DEPENDENCIES += libgl libdrm
|
||||
PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GL_TESTS=ON
|
||||
else
|
||||
PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GL_TESTS=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)
|
||||
PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLX_TESTS=ON
|
||||
else
|
||||
PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLX_TESTS=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yy)
|
||||
PIGLIT_DEPENDENCIES += libegl
|
||||
PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLES1_TESTS=ON \
|
||||
-DPIGLIT_BUILD_GLES2_TESTS=ON \
|
||||
-DPIGLIT_BUILD_GLES3_TESTS=ON
|
||||
else
|
||||
PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLES1_TESTS=OFF \
|
||||
-DPIGLIT_BUILD_GLES2_TESTS=OFF \
|
||||
-DPIGLIT_BUILD_GLES3_TESTS=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WAYLAND),y)
|
||||
PIGLIT_DEPENDENCIES += wayland libxkbcommon
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user