• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/mesa3d-demos/0001-demos-optional-gl.patch
Bernd KuhlsBernd Kuhls committed 36a974dbc4d14 Dec 2015
Raw file
Source viewDiff to previous
 
1
This patches makes opengl an optional component.
2
​
3
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
4
---
5
Index: mesa3d-demos-8.1.0/configure.ac
6
===================================================================
7
--- mesa3d-demos-8.1.0.orig/configure.ac
8
+++ mesa3d-demos-8.1.0/configure.ac
9
@@ -51,6 +51,14 @@
10
   ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])
11
 PKG_PROG_PKG_CONFIG()
12
 
13
+AC_ARG_ENABLE([gl],
14
+    [AS_HELP_STRING([--enable-gl],
15
+        [enable GL library @<:@default=no@:>@])],
16
+    [gl_enabled="$enableval"],
17
+    [gl_enabled=auto])
18
+
19
+if test "x$gl_enabled" != "xno"; then
20
+
21
 dnl Get the pkg-config definitions for libGL.  We include a fallback
22
 dnl path for GL implementation that don't provide a .pc file
23
 PKG_CHECK_MODULES(GL, [gl], [], [
24
@@ -113,6 +121,8 @@
25
 DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS"
26
 DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
27
 
28
+fi
29
+
30
 AC_ARG_ENABLE([egl],
31
     [AS_HELP_STRING([--enable-egl],
32
         [enable EGL library @<:@default=auto@:>@])],
33
@@ -303,7 +313,7 @@
34
 AC_SUBST([WAYLAND_CFLAGS])
35
 AC_SUBST([WAYLAND_LIBS])
36
 
37
-
38
+AM_CONDITIONAL(HAVE_GL, test "x$gl_enabled" = "xyes")
39
 AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes")
40
 AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes")
41
 AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes")
42
Index: mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am
43
===================================================================
44
--- mesa3d-demos-8.1.0.orig/src/egl/opengl/Makefile.am
45
+++ mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am
46
@@ -50,12 +50,14 @@
47
 endif
48
 
49
 if HAVE_EGL
50
+if HAVE_GL
51
 noinst_PROGRAMS = \
52
    eglinfo \
53
    peglgears \
54
    $(EGL_DRM_DEMOS) \
55
    $(EGL_X11_DEMOS)
56
 endif
57
+endif
58
 
59
 egltri_x11_SOURCES = egltri.c
60
 eglgears_x11_SOURCES = eglgears.c
61
Index: mesa3d-demos-8.1.0/src/util/Makefile.am
62
===================================================================
63
--- mesa3d-demos-8.1.0.orig/src/util/Makefile.am
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.