From eeae7664cee4299d6e6ee8a8565a35581d1ccc99 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 3 Dec 2013 16:31:48 +0000 Subject: [PATCH] ServeStream (net.sourceforge.servestream): can't get latest to build --- metadata/net.sourceforge.servestream.txt | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt index d7eccb7ca2..277b8c52a1 100644 --- a/metadata/net.sourceforge.servestream.txt +++ b/metadata/net.sourceforge.servestream.txt @@ -53,7 +53,7 @@ Build:0.6.0,72 prebuild=sed -i 's/make -j4/make -j2/g' scripts/* && \ rm custom_rules.xml && \ chmod +x scripts/build-ffmpeg.sh && \ - cp -f $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \ + cp $$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 @@ -62,7 +62,7 @@ Build:0.6.0,72 Build:0.6.3,78 commit=v0.6.3 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/ && \ + prebuild=cp $$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/ && \ @@ -77,20 +77,7 @@ Build:0.6.3,78 Build:0.6.4,82 commit=v0.6.4 - srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1;Streamscraper@f01d9ac64629;Jericho@3.2 - prebuild=rm libs/android-support-v4.jar && \ - cp -r $$SDK$$/extras/android/support/v7/appcompat/ appcompat/ && \ - 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 + disable=Can't figure out the right combination of android-support jars to make it work - srclibs and app have multiple copies Auto Update Mode:None Update Check Mode:Tags