initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,50 @@
|
||||
From 303d5c4fef1760ede5786bc62c7012dd7ae93722 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 8 Nov 2020 23:46:49 +0100
|
||||
Subject: [PATCH] wscript: use find_program to find wayland-scanner
|
||||
|
||||
Use find_program instead of check_cfg to find wayland-scanner. This will
|
||||
fix the following build failure when cross-compiling:
|
||||
|
||||
[ 3/73] Compiling doc/glmark2.1.in
|
||||
/bin/sh: 1: /usr/bin/wayland-scanner: not found
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results//361dc40e558e2646cb93f405c7b1f621d400fea3
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/wscript_build | 2 +-
|
||||
wscript | 3 +--
|
||||
2 files changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/wscript_build b/src/wscript_build
|
||||
index bbe7a77..ed3e8d6 100644
|
||||
--- a/src/wscript_build
|
||||
+++ b/src/wscript_build
|
||||
@@ -51,7 +51,7 @@ else:
|
||||
|
||||
if 'WAYLAND_SCANNER_wayland_scanner' in bld.env.keys():
|
||||
def wayland_scanner_cmd(arg, src):
|
||||
- return '%s %s < %s > ${TGT}' % (bld.env['WAYLAND_SCANNER_wayland_scanner'], arg, src)
|
||||
+ return '%s %s < %s > ${TGT}' % (bld.env['WAYLAND_SCANNER_wayland_scanner'][0], arg, src)
|
||||
|
||||
def wayland_proto_src_path(proto, ver):
|
||||
wp_dir = bld.env['WAYLAND_PROTOCOLS_pkgdatadir']
|
||||
diff --git a/wscript b/wscript
|
||||
index e09fa78..fe2494f 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -227,8 +227,7 @@ def configure_linux(ctx):
|
||||
# wayland-protocols >= 1.12 required for xdg-shell stable
|
||||
ctx.check_cfg(package = 'wayland-protocols', atleast_version = '1.12',
|
||||
variables = ['pkgdatadir'], uselib_store = 'WAYLAND_PROTOCOLS')
|
||||
- ctx.check_cfg(package = 'wayland-scanner', variables = ['wayland_scanner'],
|
||||
- uselib_store = 'WAYLAND_SCANNER')
|
||||
+ ctx.find_program('wayland-scanner', var = 'WAYLAND_SCANNER_wayland_scanner')
|
||||
|
||||
# Prepend CXX flags so that they can be overriden by the
|
||||
# CXXFLAGS environment variable
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
config BR2_PACKAGE_GLMARK2_FLAVOR_ANY
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2
|
||||
bool
|
||||
default y
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL
|
||||
depends on BR2_PACKAGE_HAS_LIBGBM
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
depends on BR2_PACKAGE_HAS_UDEV
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libpthread-stubs -> libdrm
|
||||
select BR2_PACKAGE_GLMARK2_FLAVOR_ANY
|
||||
|
||||
config BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GL
|
||||
bool
|
||||
default y
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL
|
||||
depends on BR2_PACKAGE_HAS_LIBGL
|
||||
depends on BR2_PACKAGE_HAS_UDEV
|
||||
select BR2_PACKAGE_GLMARK2_FLAVOR_ANY
|
||||
|
||||
config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2
|
||||
bool
|
||||
default y
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
depends on BR2_PACKAGE_WAYLAND
|
||||
select BR2_PACKAGE_GLMARK2_FLAVOR_ANY
|
||||
|
||||
config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL
|
||||
bool
|
||||
default y
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL
|
||||
depends on BR2_PACKAGE_HAS_LIBGL
|
||||
depends on BR2_PACKAGE_WAYLAND
|
||||
select BR2_PACKAGE_GLMARK2_FLAVOR_ANY
|
||||
|
||||
config BR2_PACKAGE_GLMARK2_FLAVOR_X11_GLESV2
|
||||
bool
|
||||
default y
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES
|
||||
depends on BR2_PACKAGE_XLIB_LIBX11
|
||||
select BR2_PACKAGE_GLMARK2_FLAVOR_ANY
|
||||
|
||||
config BR2_PACKAGE_GLMARK2_FLAVOR_X11_GL
|
||||
bool
|
||||
default y
|
||||
depends on BR2_PACKAGE_HAS_LIBGL
|
||||
depends on BR2_PACKAGE_XLIB_LIBX11
|
||||
select BR2_PACKAGE_GLMARK2_FLAVOR_ANY
|
||||
|
||||
comment "glmark2 needs a toolchain w/ C++, gcc >= 4.9"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
|
||||
comment "glmark2 needs an OpenGL or an openGL ES and EGL backend"
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 && BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_PACKAGE_GLMARK2_FLAVOR_ANY
|
||||
|
||||
config BR2_PACKAGE_GLMARK2
|
||||
bool "glmark2"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
|
||||
depends on BR2_PACKAGE_GLMARK2_FLAVOR_ANY
|
||||
select BR2_PACKAGE_JPEG
|
||||
select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL
|
||||
select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2
|
||||
help
|
||||
glmark2 is an OpenGL 2.0 and ES 2.0 benchmark.
|
||||
|
||||
https://github.com/glmark2/glmark2
|
||||
@@ -0,0 +1,4 @@
|
||||
# Locally computed
|
||||
sha256 12aef3ce80406bc723542979b9818886a28d0a4c93f62379eaadfd830974790d glmark2-06e78b67702b5413335ecdf1ae816da9c20f6ed9.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
sha256 16fbc228292bd774b263b212ae422c524cbf3b2078bcf21b22f8bdd4373be617 COPYING.SGI
|
||||
@@ -0,0 +1,47 @@
|
||||
################################################################################
|
||||
#
|
||||
# glmark2
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GLMARK2_VERSION = 06e78b67702b5413335ecdf1ae816da9c20f6ed9
|
||||
GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION))
|
||||
GLMARK2_LICENSE = GPL-3.0+, SGIv1
|
||||
GLMARK2_LICENSE_FILES = COPYING COPYING.SGI
|
||||
GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y)
|
||||
GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev
|
||||
GLMARK2_FLAVORS += drm-glesv2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GL),y)
|
||||
GLMARK2_DEPENDENCIES += libgl udev
|
||||
GLMARK2_FLAVORS += drm-gl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_X11_GLESV2),y)
|
||||
GLMARK2_DEPENDENCIES += libgles xlib_libX11
|
||||
GLMARK2_FLAVORS += x11-glesv2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_X11_GL),y)
|
||||
GLMARK2_DEPENDENCIES += libgl xlib_libX11
|
||||
GLMARK2_FLAVORS += x11-gl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2),y)
|
||||
GLMARK2_DEPENDENCIES += libgles wayland wayland-protocols
|
||||
GLMARK2_FLAVORS += wayland-glesv2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL),y)
|
||||
GLMARK2_DEPENDENCIES += libgl wayland wayland-protocols
|
||||
GLMARK2_FLAVORS += wayland-gl
|
||||
endif
|
||||
|
||||
GLMARK2_CONF_OPTS += \
|
||||
--prefix=/usr \
|
||||
--with-flavors=$(subst $(space),$(comma),$(GLMARK2_FLAVORS))
|
||||
|
||||
$(eval $(waf-package))
|
||||
Reference in New Issue
Block a user