diff options
| author | Romain Naour <romain.naour@gmail.com> | 2018-02-24 12:12:14 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-02-25 22:06:46 +0100 |
| commit | ee5efb464418fb31c6c96434f4ede4f83f8afb0c (patch) | |
| tree | a00e0224b8d8e06c0797ed6670534fc468bd440d /package/mesa3d-demos/0001-demos-optional-gl.patch | |
| parent | cc2f3a2a5924934b14a078d914ad3c4d731f3e8a (diff) | |
| download | buildroot-ee5efb464418fb31c6c96434f4ede4f83f8afb0c.tar.gz buildroot-ee5efb464418fb31c6c96434f4ede4f83f8afb0c.zip | |
package/mesa3d-demos: bump to 8.4.0
Use the new upstream url.
Added all hashes provided by upstream.
Rebase patch on top of 8.4.0 and convert it to git formated patch.
Add a comment above "MESA3D_DEMOS_AUTORECONF = YES"
See https://lists.freedesktop.org/archives/mesa-dev/2018-February/186542.html
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/mesa3d-demos/0001-demos-optional-gl.patch')
| -rw-r--r-- | package/mesa3d-demos/0001-demos-optional-gl.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/package/mesa3d-demos/0001-demos-optional-gl.patch b/package/mesa3d-demos/0001-demos-optional-gl.patch deleted file mode 100644 index 6470e9d8d9..0000000000 --- a/package/mesa3d-demos/0001-demos-optional-gl.patch +++ /dev/null @@ -1,74 +0,0 @@ -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 += \ |
