From c33920a4b2bb58fe7a021e3fca0f536d4940140e Mon Sep 17 00:00:00 2001
From: Andre Leiradella <andre@leiradella.com>
Date: Sun, 14 Jun 2015 20:59:41 -0300
Subject: [PATCH 1/2] sync fuse_libretro.info with the one from fuse-libretro

---
 dist/info/fuse_libretro.info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/info/fuse_libretro.info b/dist/info/fuse_libretro.info
index 9372e114..8cb708f6 100644
--- a/dist/info/fuse_libretro.info
+++ b/dist/info/fuse_libretro.info
@@ -1,6 +1,6 @@
 display_name = "ZX Spectrum (Fuse)"
 authors = "Team Fuse"
-supported_extensions = "tzx|tap|z80|rzx"
+supported_extensions = "tzx|tap|z80|rzx|scl|trd"
 corename = "Fuse"
 manufacturer = "Sinclair|Amstrad"
 categories = "Emulator"

From 55cd4deeb06e48b2030fdada069e9cc963af57a7 Mon Sep 17 00:00:00 2001
From: radius <radius@maildrop.cc>
Date: Mon, 15 Jun 2015 23:23:52 -0400
Subject: [PATCH 2/2] gw fixes

---
 libretro-buildbot-recipe.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index bb5b8b16..86dddde5 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -227,9 +227,9 @@ build_libretro_generic_makefile() {
 			$WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
 		fi
                    if [ "${NAME}" = "gw" ]; then
-   		      cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}.${FORMAT_EXT}
+   		      cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}.${FORMAT_EXT}  &> /tmp/buildbot.log
                    else
-   		      cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
+   		      cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}  &> /tmp/buildbot.log
                    fi
 	else
                 ERROR=`cat /tmp/buildbot.log | tail -n 5000`
@@ -808,31 +808,31 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
 
 		cp -rfv media/assets/* android/phoenix/assets/assets/
 		cp -rfv media/autoconfig/* android/phoenix/assets/autoconfig/
-		cp -rfv media/libretrodb/cht android/phoenix/assets/libretrodb/
+		#cp -rfv media/libretrodb/cht android/phoenix/assets/libretrodb/
 		cp -rfv media/libretrodb/rdb android/phoenix/assets/libretrodb/
 		cp -rfv media/libretrodb/cursors android/phoenix/assets/libretrodb/
 		cp -rfv media/overlays/* android/phoenix/assets/overlays/
 		cp -rfv media/shaders_glsl/* android/phoenix/assets/shaders_glsl/
+		cp -rfv media/shaders_glsl /tmp/
 		cp -rfv $RARCH_DIR/info/* android/phoenix/assets/info/
 
-
 		echo "BUILDBOT JOB: $jobid Building"
-		echo 
+		echo
 		cd android/phoenix
 		rm bin/*.apk
 
 		$NDK clean &> /tmp/buildbot.log
 		$NDK -j${JOBS} &>> /tmp/buildbot.log
 		ant clean &>> /tmp/buildbot.log
-		android update project --path . --target android-21
-		android update project --path libs/googleplay --target android-21
-		android update project --path libs/appcompat --target android-21
+		android update project --path . --target android-21 &>> /tmp/buildbot.log
+		android update project --path libs/googleplay --target android-21 &>> /tmp/buildbot.log
+		android update project --path libs/appcompat --target android-21 &>> /tmp/buildbot.log
 		ant debug &>> /tmp/buildbot.log
 		if [ $? -eq 0 ]; then
 			MESSAGE="retroarch build successful [$jobid]"
 			echo $MESSAGE
 		else
-                ERROR=`cat /tmp/buildbot.log | tail -n 5000`
+                ERROR=`cat /tmp/buildbot.log | tail -n 1000`
                 HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'`
 		        MESSAGE="retroarch build failed [$jobid] LOG: http://hastebin.com/$HASTE"
 			echo $MESSAGE