From b1d77a9fb6682aa2a23c5f9239eb380ca8b886ae Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 18 Dec 2012 20:04:38 +0000 Subject: [PATCH] try replacing bash with sh to fix servestream --- metadata/net.sourceforge.servestream.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt index bd60fabdb0..538ff52a7a 100644 --- a/metadata/net.sourceforge.servestream.txt +++ b/metadata/net.sourceforge.servestream.txt @@ -41,7 +41,7 @@ Repo:http://svn.code.sf.net/p/servestream/code/trunk #Build Version:0.4.9,59,1049,buildjni=no #Build Version:0.4.12,62,1160,buildjni=no #adapted from here http://servestream.sourceforge.net/build-servestream.sh. See tags for releases -Build Version:0.5.0,64,!build fails (at 1223),prebuild=\ +Build Version:0.5.0,64,1223,prebuild=\ export NDK=$$NDK$$ && \ wget http://sourceforge.net/p/servestream/code/1175/tree/ffmpeg/ffmpeg-0.11.1-android-2012-09-18.tar.gz?\ format=raw --output-document=ffmpeg-0.11.1-android-2012-09-18.tar.gz && \ @@ -54,6 +54,7 @@ chmod +x arm-build.sh && chmod +x x86-build.sh && \ mv arm-build.sh ffmpeg-0.11.1-android-2012-09-18 && mv x86-build.sh ffmpeg-0.11.1-android-2012-09-18 && \ cd ffmpeg-0.11.1-android-2012-09-18 && ./extract.sh && \ sed -i 's/make -j4/make -j2/g' arm-build.sh && sed -i 's/make -j4/make -j2/g' x86-build.sh && \ +sed -i 's/bash/sh/g' arm-build.sh && sed -i 's/bash/sh/g' x86-build.sh && \ ./arm-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg && \ ./x86-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg && cd ../,buildjni=yes