initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,88 @@
|
||||
From bb0ffae7164d296d32da24fa5499534de259169a Mon Sep 17 00:00:00 2001
|
||||
From: Spenser Gilliland <spenser@gillilanding.com>
|
||||
Date: Sat, 24 Feb 2018 11:36:17 +0100
|
||||
Subject: [PATCH] demos: makes opengl an optional component
|
||||
|
||||
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
|
||||
[Romain: convert to git patch, rebase on 8.4.0]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
configure.ac | 12 +++++++++++-
|
||||
src/egl/opengl/Makefile.am | 2 ++
|
||||
src/util/Makefile.am | 2 ++
|
||||
3 files changed, 15 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0b5e9a76..24298c44 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -51,6 +51,14 @@ m4_ifndef([PKG_PROG_PKG_CONFIG],
|
||||
ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])
|
||||
PKG_PROG_PKG_CONFIG()
|
||||
|
||||
+AC_ARG_ENABLE([gl],
|
||||
+ [AS_HELP_STRING([--enable-gl],
|
||||
+ [enable GL library @<:@default=no@:>@])],
|
||||
+ [gl_enabled="$enableval"],
|
||||
+ [gl_enabled=auto])
|
||||
+
|
||||
+if test "x$gl_enabled" != "xno"; then
|
||||
+
|
||||
dnl Get the pkg-config definitions for libGL. We include a fallback
|
||||
dnl path for GL implementation that don't provide a .pc file
|
||||
PKG_CHECK_MODULES(GL, [gl], [], [
|
||||
@@ -112,6 +120,8 @@ PKG_CHECK_MODULES(GLU, [glu], [],
|
||||
DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS"
|
||||
DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
|
||||
|
||||
+fi
|
||||
+
|
||||
AC_ARG_ENABLE([egl],
|
||||
[AS_HELP_STRING([--enable-egl],
|
||||
[enable EGL library @<:@default=auto@:>@])],
|
||||
@@ -302,7 +312,7 @@ AC_SUBST([MESA_GLAPI])
|
||||
AC_SUBST([WAYLAND_CFLAGS])
|
||||
AC_SUBST([WAYLAND_LIBS])
|
||||
|
||||
-
|
||||
+AM_CONDITIONAL(HAVE_GL, test "x$gl_enabled" = "xyes")
|
||||
AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes")
|
||||
AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes")
|
||||
AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes")
|
||||
diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am
|
||||
index 6d184ff6..219ab850 100644
|
||||
--- a/src/egl/opengl/Makefile.am
|
||||
+++ b/src/egl/opengl/Makefile.am
|
||||
@@ -56,6 +56,7 @@ endif
|
||||
endif
|
||||
|
||||
if HAVE_EGL
|
||||
+if HAVE_GL
|
||||
bin_PROGRAMS = \
|
||||
eglinfo
|
||||
noinst_PROGRAMS = \
|
||||
@@ -64,6 +65,7 @@ noinst_PROGRAMS = \
|
||||
$(EGL_X11_DEMOS) \
|
||||
$(EGL_WL_DEMOS)
|
||||
endif
|
||||
+endif
|
||||
|
||||
egltri_x11_SOURCES = egltri.c
|
||||
eglgears_x11_SOURCES = eglgears.c
|
||||
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
|
||||
index 759a293a..012b9c75 100644
|
||||
--- a/src/util/Makefile.am
|
||||
+++ b/src/util/Makefile.am
|
||||
@@ -27,7 +27,9 @@ AM_CFLAGS = \
|
||||
AM_LDFLAGS = \
|
||||
$(DEMO_LIBS)
|
||||
|
||||
+if HAVE_GL
|
||||
noinst_LTLIBRARIES = libutil.la
|
||||
+endif
|
||||
|
||||
if HAVE_GLUT
|
||||
AM_CFLAGS += \
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
config BR2_PACKAGE_MESA3D_DEMOS
|
||||
bool "mesa3d-demos"
|
||||
depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \
|
||||
|| BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG
|
||||
select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
|
||||
select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
|
||||
select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
|
||||
help
|
||||
OpenGL demos from the Mesa 3D project.
|
||||
|
||||
http://mesa3d.org
|
||||
@@ -0,0 +1,5 @@
|
||||
# From https://lists.freedesktop.org/archives/mesa-dev/2018-February/186542.html
|
||||
md5 6b65a02622765522176d00f553086fa3 mesa-demos-8.4.0.tar.bz2
|
||||
sha1 57ba892e919fa22ce3db9f25e7331a6fa33c652c mesa-demos-8.4.0.tar.bz2
|
||||
sha256 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d mesa-demos-8.4.0.tar.bz2
|
||||
sha512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957 mesa-demos-8.4.0.tar.bz2
|
||||
@@ -0,0 +1,80 @@
|
||||
################################################################################
|
||||
#
|
||||
# mesa3d-demos
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MESA3D_DEMOS_VERSION = 8.4.0
|
||||
MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2
|
||||
MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos
|
||||
# 0001-demos-makes-opengl-an-optional-component.patch
|
||||
MESA3D_DEMOS_AUTORECONF = YES
|
||||
MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
|
||||
MESA3D_DEMOS_LICENSE = MIT
|
||||
|
||||
MESA3D_DEMOS_CONF_OPTS += \
|
||||
--disable-gles1
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)
|
||||
MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext
|
||||
MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11
|
||||
else
|
||||
MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)
|
||||
MESA3D_DEMOS_DEPENDENCIES += libegl
|
||||
MESA3D_DEMOS_CONF_OPTS += --enable-egl
|
||||
else
|
||||
MESA3D_DEMOS_CONF_OPTS += --disable-egl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
|
||||
MESA3D_DEMOS_DEPENDENCIES += libgles
|
||||
MESA3D_DEMOS_CONF_OPTS += --enable-gles2
|
||||
else
|
||||
MESA3D_DEMOS_CONF_OPTS += --disable-gles2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y)
|
||||
MESA3D_DEMOS_DEPENDENCIES += libopenvg
|
||||
MESA3D_DEMOS_CONF_OPTS += --enable-vg
|
||||
else
|
||||
MESA3D_DEMOS_CONF_OPTS += --disable-vg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MESA3D_GBM),y)
|
||||
MESA3D_DEMOS_DEPENDENCIES += mesa3d
|
||||
MESA3D_DEMOS_CONF_OPTS += --enable-gbm
|
||||
else
|
||||
MESA3D_DEMOS_CONF_OPTS += --disable-gbm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FREETYPE),y)
|
||||
MESA3D_DEMOS_DEPENDENCIES += freetype
|
||||
MESA3D_DEMOS_CONF_OPTS += --enable-freetype2
|
||||
else
|
||||
MESA3D_DEMOS_CONF_OPTS += --disable-freetype2
|
||||
endif
|
||||
|
||||
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_GALLIUM),y)
|
||||
MESA3D_DEMOS_CONF_OPTS += --enable-osmesa
|
||||
else
|
||||
MESA3D_DEMOS_CONF_OPTS += --disable-osmesa
|
||||
endif
|
||||
else
|
||||
MESA3D_DEMOS_CONF_OPTS += --without-glut --disable-osmesa
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WAYLAND),y)
|
||||
MESA3D_DEMOS_DEPENDENCIES += wayland
|
||||
MESA3D_DEMOS_CONF_OPTS += --enable-wayland
|
||||
else
|
||||
MESA3D_DEMOS_CONF_OPTS += --disable-wayland
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user