From fafb373285970937dadfa922e856c7e4707532f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 16 Oct 2013 10:44:50 +0200
Subject: [PATCH] VLC update is almost working (fdroid output pipe hangs it)

---
 metadata/org.videolan.vlc.txt         |  7 +++----
 metadata/org.videolan.vlc/ndkr9.patch | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 metadata/org.videolan.vlc/ndkr9.patch

diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index 304995797c..c142249705 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -43,18 +43,17 @@ update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock,\
 prebuild=sed -i '48d' ../Makefile,build=cd ../ && \
 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,\
-forceversion=yes,forcevercode=yes,\
+Build Version:0.1.3-ARMv7,1300,!wip 0.1.3,subdir=vlc-android,\
+forceversion=yes,forcevercode=yes,patch=ndkr9.patch,\
 srclibs=VLC@7c52aacbe,\
 update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock;../java-libs/WheelView,\
 prebuild=sed -i '/ant/d' ../Makefile && \
          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$$ \
         ./compile.sh release,\
 buildjni=no
 
-# See compile.sh for the VLC commit
 Auto Update Mode:None
 # Update Check Mode:Tags
 Update Check Mode:None
diff --git a/metadata/org.videolan.vlc/ndkr9.patch b/metadata/org.videolan.vlc/ndkr9.patch
new file mode 100644
index 0000000000..c6d673f421
--- /dev/null
+++ b/metadata/org.videolan.vlc/ndkr9.patch
@@ -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?