From 9197a615e8f08494ec004489bf0023e2959f164c Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 5 Jul 2012 13:02:06 -0700
Subject: [PATCH] Add rust-opengles

---
 .gitmodules       |  3 +++
 Makefile.in       | 15 +++++++++++++++
 src/rust-azure    |  2 +-
 src/rust-opengles |  1 +
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 160000 src/rust-opengles

diff --git a/.gitmodules b/.gitmodules
index f0932c9b673..e79232ec392 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "src/rust-geom"]
 	path = src/rust-geom
 	url = git://github.com/pcwalton/rust-geom.git
+[submodule "src/rust-opengles"]
+	path = src/rust-opengles
+	url = git://github.com/pcwalton/rust-opengles.git
diff --git a/Makefile.in b/Makefile.in
index 6267361384f..7cc31613384 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,6 +21,7 @@ RUSTFLAGS += \
 	-L src/rust-cocoa \
 	-L src/rust-stb-image \
 	-L src/rust-geom \
+	-L src/rust-opengles \
 	$(NULL)
 
 RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@@ -50,6 +51,7 @@ SERVO_DEPS += \
 	src/rust-sdl/libsdl.dummy \
 	src/rust-stb-image/libstb-image.dummy \
 	src/rust-geom/libgeom.dummy \
+    src/rust-opengles/libopengles.dummy \
 	$(NULL)
 
 CHECK_DEPS += \
@@ -59,6 +61,7 @@ CHECK_DEPS += \
 	check-rust-azure \
 	check-rust-stb-image \
 	check-rust-geom \
+	check-rust-opengles \
 	check-servo \
 	$(NULL)
 
@@ -71,6 +74,7 @@ CLEAN_DEPS += \
 	clean-rust-azure \
 	clean-rust-stb-image \
 	clean-rust-geom \
+	clean-rust-opengles \
 	clean-servo \
 	$(NULL)
 
@@ -117,6 +121,9 @@ src/rust-stb-image/libstb-image.dummy:
 src/rust-geom/libgeom.dummy:
 	$(MAKE) -C src/rust-geom
 
+src/rust-opengles/libopengles.dummy:
+	$(MAKE) -C src/rust-opengles
+
 check: $(CHECK_DEPS)
 
 check-servo: servo-test
@@ -151,6 +158,10 @@ check-rust-stb-image:
 check-rust-geom:
 	$(MAKE) check -C src/rust-geom
 
+.PHONY: check-rust-opengles
+check-rust-opengles:
+	$(MAKE) check -C src/rust-opengles
+
 .PHONY:	clean
 clean: $(CLEAN_DEPS)
 
@@ -190,6 +201,10 @@ clean-rust-stb-image:
 clean-rust-geom:
 	$(MAKE) clean -C src/rust-geom
 
+.PHONY: clean-rust-opengles
+clean-rust-opengles:
+	$(MAKE) clean -C src/rust-opengles
+
 .PHONY: clean-servo
 clean-servo:
 	rm -f servo servo-test
diff --git a/src/rust-azure b/src/rust-azure
index 1e811d44daa..2fa1bbe1295 160000
--- a/src/rust-azure
+++ b/src/rust-azure
@@ -1 +1 @@
-Subproject commit 1e811d44daaf00a8b8ebf0e7ea3f39056da133da
+Subproject commit 2fa1bbe129595d69e0c382c40094d1ed5f533685
diff --git a/src/rust-opengles b/src/rust-opengles
new file mode 160000
index 00000000000..fe0d6376cd6
--- /dev/null
+++ b/src/rust-opengles
@@ -0,0 +1 @@
+Subproject commit fe0d6376cd6b219b3f623d4fc84d0c470dd2e963