From 8d767bc4ed654e00d102f0d3b74803ef6a2efec0 Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 18 Feb 2013 12:08:44 +0000 Subject: [PATCH] another attempt at net.sourceforge.servestream --- metadata/net.sourceforge.servestream.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt index a4b5f4f087..0cbd319b45 100644 --- a/metadata/net.sourceforge.servestream.txt +++ b/metadata/net.sourceforge.servestream.txt @@ -42,21 +42,23 @@ Repo:http://svn.code.sf.net/p/servestream/code/trunk #Build Version:0.4.8,58,1031,prebuild=mv lib/ libs/ #Build Version:0.4.9,59,1049,buildjni=no #Build Version:0.4.12,62,1160,buildjni=no -Build Version:0.5.4,69,1354,prebuild=\ +Build Version:0.5.4,69,1354,srclibs=ActionBarSherlock@4.2.0,prebuild=\ rm custom_rules.xml && echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \ 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 && \ wget http://sourceforge.net/p/servestream/code/1311/tree/ffmpeg/scripts/arm-build.sh?\ -format=raw --output-document=arm-build.sh && \ +format=raw --output-document=arm-build.sh && \ tar -xvf ffmpeg-0.11.1-android-2012-09-18.tar.gz && \ chmod +x arm-build.sh && \ mv arm-build.sh ffmpeg-0.11.1-android-2012-09-18 && \ sed -i 's/armeabi armeabi-v7a x86 mips/armeabi/g' jni/Application.mk && \ cd ffmpeg-0.11.1-android-2012-09-18 && ./extract.sh && \ +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.5.5,70,1361,buildjni=no +Build Version:0.5.5,70,1361,srclibs=ActionBarSherlock@4.2.0,prebuild=\ +echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties,buildjni=no Auto Update Mode:None Update Check Mode:Market