Hi Brian,
The attached patches are trivial fixes to a distribution problem and
cofigure.ac. I've done a clean build test
$ make tarballs
$ tar xf MesaLib-7.7-devel.tar.gz
$ cd Mesa-7.7-devel/
$ ./configure --with-state-trackers=egl,es
$ make -j4 CC="ccache gcc"
and tested all ES1/ES2 demos.
Do you have anything you want me to change/fix in this branch? If it all seems
ok and the timing is fine to you, I would like to start fixing conflicts and
merge it to master.
I pinged the fdo admin again (bug #23272) some time ago, but I still did not
get any response. Could you help me merge master to this branch? I want to
fix any issue results from the merge in this branch, and when I am done, I will
ping you back so that it can be merged to master. If you have better ideas,
please let me know. Thanks.
-olv
From 9f5d7456febd1295157efa5d94c03029ed8e6ac3 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olva...@gmail.com>
Date: Wed, 23 Dec 2009 11:18:48 +0800
Subject: [PATCH 1/2] Clean up ES_FILES.
Signed-off-by: Chia-I Wu <olva...@gmail.com>
---
Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 5029f72..b74e848 100644
--- a/Makefile
+++ b/Makefile
@@ -315,9 +315,9 @@ ES_FILES = \
$(DIRECTORY)/src/mesa/es/glapi/*.py \
$(DIRECTORY)/src/mesa/es/state_tracker/*.[ch] \
$(DIRECTORY)/src/mesa/es/main/*.[ch] \
+ $(DIRECTORY)/src/mesa/es/main/*.xml \
$(DIRECTORY)/src/mesa/es/main/*.py \
- $(DIRECTORY)/src/mesa/es/main/*.txt \
- $(DIRECTORY)/src/mesa/es/main/es*_special \
+ $(DIRECTORY)/src/mesa/es/main/*.dtd \
$(DIRECTORY)/src/mesa/es/Makefile \
$(DIRECTORY)/src/mesa/es/sources.mak \
--
1.6.5
From d13c3d32baccb6fb781f198cd1bf720d28149759 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olva...@gmail.com>
Date: Wed, 23 Dec 2009 11:18:00 +0800
Subject: [PATCH 2/2] Add es state tracker to autoconf.
mesa/es is needed in SRC_DIRS to build es state tracker.
Signed-off-by: Chia-I Wu <olva...@gmail.com>
---
configure.ac | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index cc588d5..2984ee2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1154,14 +1154,22 @@ yes)
test -d "$srcdir/src/gallium/state_trackers/$tracker" || \
AC_MSG_ERROR([state tracker '$tracker' doesn't exist])
- if test "$tracker" = egl && test "x$enable_egl" != xyes; then
- AC_MSG_ERROR([cannot build egl state tracker without EGL library])
- fi
- if test "$tracker" = xorg; then
+ case "$tracker" in
+ egl)
+ if test "x$enable_egl" != xyes; then
+ AC_MSG_ERROR([cannot build egl state tracker without EGL library])
+ fi
+ ;;
+ xorg)
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",
HAVE_XEXTPROTO_71="no")
- fi
+ ;;
+ es)
+ # mesa/es is required to build es state tracker
+ SRC_DIRS="mesa/es $SRC_DIRS"
+ ;;
+ esac
done
GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"
;;
--
1.6.5
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
