diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch')
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch b/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch deleted file mode 100644 index e7be4dfbe1..0000000000 --- a/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | From 322af294390a7f4e1524c5a79312be6cbebce988 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Awais Belal <awais_belal@mentor.com> | ||
| 3 | Date: Wed, 11 Nov 2015 17:22:12 +0500 | ||
| 4 | Subject: [PATCH] only build GLX demos if needed | ||
| 5 | |||
| 6 | There are platforms that default to EGL only configurations | ||
| 7 | in which case the GLX applications are not required | ||
| 8 | at all. Allow the user to control generation of these | ||
| 9 | demos as needed through a configure switch. | ||
| 10 | |||
| 11 | Signed-off-by: Awais Belal <awais_belal@mentor.com> | ||
| 12 | Upstream-Status: Pending | ||
| 13 | --- | ||
| 14 | configure.ac | 9 +++++++++ | ||
| 15 | src/Makefile.am | 6 +++++- | ||
| 16 | 2 files changed, 14 insertions(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/configure.ac b/configure.ac | ||
| 19 | index f8ec7e3..1a4d96d 100644 | ||
| 20 | --- a/configure.ac | ||
| 21 | +++ b/configure.ac | ||
| 22 | @@ -132,6 +132,11 @@ if test "x$enable_glu" = xyes; then | ||
| 23 | DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" | ||
| 24 | fi | ||
| 25 | |||
| 26 | +AC_ARG_ENABLE([glx-demos], | ||
| 27 | + [AS_HELP_STRING([--enable-glx-demos], | ||
| 28 | + [enable GLX demos @<:@default=auto@:>@])], | ||
| 29 | + [glx_demos_enabled="$enableval"], | ||
| 30 | + [glx_demos_enabled=yes]) | ||
| 31 | AC_ARG_ENABLE([egl], | ||
| 32 | [AS_HELP_STRING([--enable-egl], | ||
| 33 | [enable EGL library @<:@default=auto@:>@])], | ||
| 34 | @@ -325,6 +333,7 @@ AC_SUBST([WAYLAND_LIBS]) | ||
| 35 | |||
| 36 | AM_CONDITIONAL(HAVE_GLU, test "x$glu_enabled" = "xyes") | ||
| 37 | AM_CONDITIONAL(HAVE_GLEW, test "x$glew_enabled" = "xyes") | ||
| 38 | +AM_CONDITIONAL(HAVE_GLX, test "x$glx_demos_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 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
| 43 | index 8b89dee..a4d7e8f 100644 | ||
| 44 | --- a/src/Makefile.am | ||
| 45 | +++ b/src/Makefile.am | ||
| 46 | @@ -44,8 +44,12 @@ SUBDIRS = \ | ||
| 47 | slang \ | ||
| 48 | tests \ | ||
| 49 | tools \ | ||
| 50 | - wgl \ | ||
| 51 | + wgl | ||
| 52 | + | ||
| 53 | +if HAVE_GLX | ||
| 54 | +SUBDIRS += \ | ||
| 55 | xdemos | ||
| 56 | +endif | ||
| 57 | |||
| 58 | if HAVE_GLEW | ||
| 59 | SUBDIRS += \ | ||
| 60 | -- | ||
| 61 | 1.9.1 | ||
| 62 | |||
