From 04f55f34f314ceebd12312d3878884a90d386e85 Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 26 Aug 2013 11:20:18 +0100 Subject: [PATCH] Servestream: switch to svn and update to 0.6.3... see https://f-droid.org/repository/issues/?do=view_issue&issue=340 --- metadata/net.sourceforge.servestream.txt | 30 +++++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt index ccad2f2240..2d7efa7c11 100644 --- a/metadata/net.sourceforge.servestream.txt +++ b/metadata/net.sourceforge.servestream.txt @@ -23,9 +23,13 @@ if you find an audio file on a web page, share the link to Servestream. * Supports x86 and MIPS for ffmpeg playback . -Repo Type:git-svn #Repo:https://servestream.svn.sourceforge.net/svnroot/servestream/trunk; old url prior to r1160 -Repo:http://svn.code.sf.net/p/servestream/code;trunk=trunk;tags=tags + +#Repo Type:git-svn +#Repo:http://svn.code.sf.net/p/servestream/code;trunk=trunk;tags=tags + +Repo Type:svn +Repo:http://svn.code.sf.net/p/servestream/code/trunk #Build Version:0.1,35,374,prebuild=mv lib/ libs/ #Build Version:0.2.5,40,!source has wrong version code at r442,prebuild=mv lib/ libs/ @@ -56,7 +60,6 @@ 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 server now doing bash Build Version:0.6.0,72,v0.6.0,\ srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1,prebuild=\ sed -i 's/make -j4/make -j2/g' scripts/* && \ @@ -66,9 +69,24 @@ 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.3,78,r1502,\ +srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1;Streamscraper@f01d9ac64629;Jericho@3.2,\ +prebuild=cp -f $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \ + rm libs/streamscraper.jar && \ + cp -r $$Streamscraper$$/src/net/moraleboost/ src/net/ && \ + cp -r $$Jericho$$/src/java/net/htmlparser/ src/net/ && \ + cp $$Jericho$$/compile-time-dependencies/* libs/ && \ + sed -i 's/make -j4/make -j2/g' scripts/* && \ + rm custom_rules.xml && chmod +x scripts/build-ffmpeg.sh && \ + sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \ + sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties,\ +build=./scripts/build-ffmpeg.sh,\ +buildjni=yes + # sed -i 's/x86 mips/mips/g' jni/Application.mk && \ Auto Update Mode:None -Update Check Mode:Tags -Current Version:0.6.0 -Current Version Code:72 +# Tags not working and e.g. v0.6.3 doesn't even check out +Update Check Mode:None +Current Version:0.6.3 +Current Version Code:78