From: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3/3] mesa3d: bump to 7.10.1 and add support for OpenGL-ES
Date: Sat, 21 Jan 2012 03:32:22 +0100 [thread overview]
Message-ID: <1327113142-19610-4-git-send-email-arnout@mind.be> (raw)
In-Reply-To: <1327113142-19610-1-git-send-email-arnout@mind.be>
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Some source files are generated by python scripts and use libxml2.
Therefore, python support is added to host-libxml2.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/libxml2/libxml2.mk | 7 ++++---
package/x11r7/mesa3d/Config.in | 6 ++++++
package/x11r7/mesa3d/mesa3d.mk | 12 ++++++++----
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 0687137..7f084ed 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -21,9 +21,10 @@ endef
LIBXML2_POST_INSTALL_STAGING_HOOKS += LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
-HOST_LIBXML2_DEPENDENCIES = host-pkg-config
-
-HOST_LIBXML2_CONF_OPT = --without-debug --without-python
+# mesa3d requires libxml2 python support; too bad for other users of libxml2...
+# and the python libxml2 libraries don't work without debug.
+HOST_LIBXML2_DEPENDENCIES = host-pkg-config host-python
+HOST_LIBXML2_CONF_OPT = --with-debug --with-python
define LIBXML2_REMOVE_CONFIG_SCRIPTS
$(RM) -f $(TARGET_DIR)/usr/bin/xml2-config
diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in
index 596eea3..7a98ccb 100644
--- a/package/x11r7/mesa3d/Config.in
+++ b/package/x11r7/mesa3d/Config.in
@@ -13,3 +13,9 @@ config BR2_PACKAGE_MESA3D
help
Mesa 3D, an open-source implementation of the OpenGL specification.
+config BR2_PACKAGE_MESA3D_GLES
+ bool "Mesa 3D OpenGL-ES support"
+ depends on BR2_PACKAGE_MESA3D
+ default y
+ help
+ Include OpenGL-ES 1 and 2 support.
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 095d66d..fe621bc 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -3,13 +3,17 @@
# mesa3d
#
#############################################################
-MESA3D_VERSION:=7.6.1
+MESA3D_VERSION:=7.10.1
MESA3D_SOURCE:=MesaLib-$(MESA3D_VERSION).tar.gz
MESA3D_SITE:=ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
-
-MESA3D_CONF_OPT = --disable-egl --disable-glu --disable-glw --disable-glut --disable-gallium --with-driver=dri --with-dri-drivers=swrast
MESA3D_INSTALL_STAGING = YES
-MESA3D_DEPENDENCIES = xproto_glproto xlib_libXxf86vm xlib_libXdamage xlib_libXfixes xproto_dri2proto libdrm expat
+MESA3D_CONF_OPT = --disable-static --disable-egl --disable-glu --disable-glw --disable-glut --disable-gallium --with-driver=dri --with-dri-drivers=swrast
+
+ifeq ($(BR2_PACKAGE_MESA3D_GLES),y)
+MESA3D_CONF_OPT += --enable-gles1 --enable-gles2
+endif
+
+MESA3D_DEPENDENCIES = xproto_glproto xlib_libXxf86vm xlib_libXdamage xlib_libXfixes xproto_dri2proto libdrm expat host-xutil_makedepend host-python host-libxml2
$(eval $(call AUTOTARGETS))
--
1.7.8.3
next prev parent reply other threads:[~2012-01-21 2:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-17 8:53 [Buildroot] mesa gles2 under buildroot Ozgun
2012-01-21 2:32 ` [Buildroot] [PATCH 0/3] Fix Mesa3D with OpenGL-ES support Arnout Vandecappelle
2012-01-21 2:32 ` [Buildroot] [PATCH 1/3] xproto_glproto: bump version to 1.4.14 Arnout Vandecappelle
2012-01-21 2:32 ` [Buildroot] [PATCH 2/3] host-python: build shared library Arnout Vandecappelle
2012-01-21 2:32 ` Arnout Vandecappelle [this message]
2012-01-23 13:13 ` [Buildroot] mesa gles2 under buildroot Ozgun
2012-01-23 13:46 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327113142-19610-4-git-send-email-arnout@mind.be \
--to=arnout@mind.be \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox