From 2b48ca7735d0c503b70756012065980bdba36b63 Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 2 May 2013 17:12:42 +0100 Subject: [PATCH] try again net.sourceforge.servestream fdroid is saying that it can't find the prebuilts in jni/ffmpeg/ffmpeg/. These should have been built and placed by the scripts. I have just noticed that the script contains another bashism so hopefully this by removing $PIPESTATUS , dash should run the script successfully. --- metadata/net.sourceforge.servestream.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt index d86c3bacb8..e60194d389 100644 --- a/metadata/net.sourceforge.servestream.txt +++ b/metadata/net.sourceforge.servestream.txt @@ -57,15 +57,16 @@ sed -i 's/make -j4/make -j1/g' arm-build.sh && \ sed -i 's/bash/sh/g' arm-build.sh && \ sed -i '/PIPESTATUS/d' arm-build.sh && \ NDK=$$NDK$$ ./arm-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg,buildjni=yes -Build Version:0.6.0,72,!scripts aren't creating libs in jni/ffmpeg (at v0.6.0),\ +Build Version:0.6.0,72,v0.6.0,\ srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1,prebuild=\ -sed -i 's/bash/sh/g;s/make -j4/make -j2/g' scripts/* && \ +sed -i 's/bash/sh/g;s/make -j4/make -j2/g;/PIPESTATUS/d' scripts/* && \ rm custom_rules.xml && chmod +x scripts/build-ffmpeg.sh && \ cp -f $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \ echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \ echo "android.library.reference.2=$$DragSort$$" >> project.properties,\ build=./scripts/build-ffmpeg.sh,buildjni=yes +#Build Version:0.6.0,72,!scripts aren't creating libs in jni/ffmpeg (at v0.6.0),\ Auto Update Mode:None Update Check Mode:Tags Current Version:0.6.0