missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

VLC update is almost working (fdroid output pipe hangs it)

Browse source
This commit is contained in:
Daniel Martí 2013-10-16 10:44:50 +02:00
parent 5b0235573f
commit fafb373285
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
metadata/org.videolan.vlc.txt
View file

@ -43,18 +43,17 @@ update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock,\
prebuild=sed -i '48d' ../Makefile,build=cd ../ && \ prebuild=sed -i '48d' ../Makefile,build=cd ../ && \
ANDROID_ABI=mips ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release,buildjni=no ANDROID_ABI=mips ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release,buildjni=no
Build Version:0.1.3-ARMv7,1300,0.1.3,subdir=vlc-android,\ Build Version:0.1.3-ARMv7,1300,!wip 0.1.3,subdir=vlc-android,\
forceversion=yes,forcevercode=yes,\ forceversion=yes,forcevercode=yes,patch=ndkr9.patch,\
srclibs=VLC@7c52aacbe,\ srclibs=VLC@7c52aacbe,\
update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock;../java-libs/WheelView,\ update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock;../java-libs/WheelView,\
prebuild=sed -i '/ant/d' ../Makefile && \ prebuild=sed -i '/ant/d' ../Makefile && \
sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
ln -s ../srclib/VLC ../vlc,\ ln -s vlc-android/$$VLC$$ ../vlc,\
build=cd ../ && ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ \ build=cd ../ && ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ \
./compile.sh release,\ ./compile.sh release,\
buildjni=no buildjni=no
# See compile.sh for the VLC commit
Auto Update Mode:None Auto Update Mode:None
# Update Check Mode:Tags # Update Check Mode:Tags
Update Check Mode:None Update Check Mode:None

15
metadata/org.videolan.vlc/ndkr9.patch Normal file
View file

@ -0,0 +1,15 @@
diff --git a/compile.sh b/compile.sh
index c53cee6..a95fd4d 100755
--- a/compile.sh
+++ b/compile.sh
@@ -15,6 +15,10 @@ fi
# try to detect NDK version
REL=$(grep -o '^r[0-9]*.*' $ANDROID_NDK/RELEASE.TXT 2>/dev/null|cut -b2-)
case "$REL" in
+ 9*)
+ GCCVER=4.8
+ CXXSTL="/"${GCCVER}
+ ;;
8?*)
# we don't use 4.4.3 because it doesn't handle threads correctly.
# TODO : clang?