Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,74 @@
|
||||
This patches makes opengl an optional component.
|
||||
|
||||
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
|
||||
---
|
||||
Index: mesa3d-demos-8.1.0/configure.ac
|
||||
===================================================================
|
||||
--- mesa3d-demos-8.1.0.orig/configure.ac
|
||||
+++ mesa3d-demos-8.1.0/configure.ac
|
||||
@@ -51,6 +51,14 @@
|
||||
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], [], [
|
||||
@@ -113,6 +121,8 @@
|
||||
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@:>@])],
|
||||
@@ -303,7 +313,7 @@
|
||||
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")
|
||||
Index: mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am
|
||||
===================================================================
|
||||
--- mesa3d-demos-8.1.0.orig/src/egl/opengl/Makefile.am
|
||||
+++ mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am
|
||||
@@ -50,12 +50,14 @@
|
||||
endif
|
||||
|
||||
if HAVE_EGL
|
||||
+if HAVE_GL
|
||||
noinst_PROGRAMS = \
|
||||
eglinfo \
|
||||
peglgears \
|
||||
$(EGL_DRM_DEMOS) \
|
||||
$(EGL_X11_DEMOS)
|
||||
endif
|
||||
+endif
|
||||
|
||||
egltri_x11_SOURCES = egltri.c
|
||||
eglgears_x11_SOURCES = eglgears.c
|
||||
Index: mesa3d-demos-8.1.0/src/util/Makefile.am
|
||||
===================================================================
|
||||
--- mesa3d-demos-8.1.0.orig/src/util/Makefile.am
|
||||
+++ mesa3d-demos-8.1.0/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 += \
|
||||
12
deprecated/firmware/buildroot/package/mesa3d-demos/Config.in
Normal file
12
deprecated/firmware/buildroot/package/mesa3d-demos/Config.in
Normal file
@@ -0,0 +1,12 @@
|
||||
config BR2_PACKAGE_MESA3D_DEMOS
|
||||
bool "mesa3d-demos"
|
||||
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
|
||||
depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \
|
||||
|| BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG
|
||||
help
|
||||
OpenGL demos from the Mesa 3D project.
|
||||
|
||||
http://mesa3d.org
|
||||
@@ -0,0 +1,2 @@
|
||||
# From http://lists.freedesktop.org/archives/mesa-announce/2015-December/000191.html
|
||||
sha256 c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef mesa-demos-8.3.0.tar.bz2
|
||||
@@ -0,0 +1,80 @@
|
||||
################################################################################
|
||||
#
|
||||
# mesa3d-demos
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MESA3D_DEMOS_VERSION = 8.3.0
|
||||
MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2
|
||||
MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos/$(MESA3D_DEMOS_VERSION)
|
||||
MESA3D_DEMOS_AUTORECONF = YES
|
||||
MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
|
||||
MESA3D_DEMOS_LICENSE = MIT
|
||||
|
||||
MESA3D_DEMOS_CONF_OPTS += \
|
||||
--disable-osmesa \
|
||||
--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_OPENGL_EGL),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),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