correct ffmpeg and libevent version issues

Change-Id: I77781700928f880492a4dd680a3dc6c4f88a6d45
Signed-off-by: Angelo Mantellini <[email protected]>

diff --git a/scripts/init.sh b/scripts/init.sh
index 39d8e66..647e2ef 100755 (executable)
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -158,7 +158,6 @@ if [ ! -d ${INSTALLATION_DIR}/include/boost ]; then
                    echo "using gcc : arm64-v8a : aarch64-linux-android-g++ ;" >> project-config.jam
                    export PATH=$PATH:${NDK}/toolchains/aarch64-4.9/prebuilt/${OS}-${ARCH}/bin
                fi
-               
                echo "option.set keep-going : false ;" >> project-config.jam
                echo "before compile"
                bash ${BASE_DIR}/scripts/build-boost.sh
@@ -168,14 +167,13 @@ if [ ! -d ${INSTALLATION_DIR}/include/boost ]; then
        cp -rf install_boost/include/* ${INSTALLATION_DIR}/include/
        cp -rf install_boost/lib/* ${INSTALLATION_DIR}/lib/
        cd ..
-       
 fi
 
 echo "Create libevent"
 
 if [ ! -d ${INSTALLATION_DIR}/include/event2 ]; then
        if [ ! -d libevent ]; then
-               git clone https://android.googlesource.com/platform/external/libevent
+               git clone -b nougat-release https://android.googlesource.com/platform/external/libevent
        fi
        cd libevent
        cp -rf ../libevent_files/* .

diff --git a/scripts/init_qt.sh b/scripts/init_qt.sh
index cdddcc9..c082b6b 100755 (executable)
--- a/scripts/init_qt.sh
+++ b/scripts/init_qt.sh
@@ -56,7 +56,7 @@ if [ ! -d ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/boost ]; then
 fi
 
 if [ ! -d ffmpeg ]; then
-       git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
+       git clone -b release/3.3 https://git.ffmpeg.org/ffmpeg.git ffmpeg
 fi
 export FFSRC=`pwd`/ffmpeg
 export ANDROID_NDK=${NDK}
@@ -64,14 +64,16 @@ export ANDROID_HOME=${SDK}
 export ANDROID_NDK_HOST=${OS}-${ARCH}
 export ANDROID_NDK_PLATFORM=${ANDROID_PLATFORM}
 export ANDROID_NDK_ROOT=${NDK}
-export ANDROID_NDK_TOOLCHAIN_PREFIX=arm-linux-androideabi  
+export ANDROID_NDK_TOOLCHAIN_PREFIX=arm-linux-androideabi
 export ANDROID_NDK_TOOLCHAIN_VERSION=4.9
-export ANDROID_NDK_TOOLS_PREFIX=arm-linux-androideabi  
-export ANDROID_SDK_ROOT=${SDK} 
+export ANDROID_NDK_TOOLS_PREFIX=arm-linux-androideabi
+export ANDROID_SDK_ROOT=${SDK}
 export ANDROID_API_VERSION=${ANDROID_PLATFORM}
 export PATH=$PATH:${ANDROID_HOME}/tools:${JAVA_HOME}/bin
 if [ ! -d ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/QtAV ]; then
-       git clone https://github.com/wang-bin/QtAV.git 
+    if [ ! -d QtAv ]; then
+        git clone https://github.com/wang-bin/QtAV.git
+    fi
        cd QtAV
        git submodule update --init
        cd tools/build_ffmpeg
@@ -86,4 +88,4 @@ if [ ! -d ${QT_HOME}/5.7/android_${ANDROID_ARCH}/include/QtAV ]; then
        make install INSTALL_ROOT=android
        sh sdk_install.sh
 fi
-cd ${DISTILLERY_ROOT_DIR}
\ No newline at end of file
+cd ${DISTILLERY_ROOT_DIR}