[Android] [PATCH] Use vlc.git, with a known to work hash in case further updates break.

[Jean-Baptiste Kempf]

Fine for me.

On Fri, Mar 09, 2012 at 01:55:39PM -0500, Rafaël Carré wrote :
> Checkout this hash in 'android' branch.
> Using reset --hard could delete work without noticing it.
> ---
> I am not sure of what happens if people already have an 'android' branch with 
> unmerged commits.
> 
> Any suggestion?
> 
>  compile.sh |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/compile.sh b/compile.sh
> index 28c5624..92f54a8 100755
> --- a/compile.sh
> +++ b/compile.sh
> @@ -38,14 +38,16 @@ fi
>  export PATH=${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:${PATH}
>  
>  # 1/ libvlc, libvlccore and its plugins
> -
> +TESTED_HASH=797ca65c8f
>  if [ ! -d "vlc" ]; then
>      echo "VLC source not found, cloning"
> -    git clone git://git.videolan.org/vlc/vlc-2.0.git vlc
> +    git clone git://git.videolan.org/vlc.git vlc
> +    git checkout -B android ${TESTED_HASH}
>  else
> -    echo "VLC source found, pulling from remote master"
> +    echo "VLC source found, updating"
>      cd vlc
> -    git pull origin master
> +    git fetch origin
> +    git checkout -B android ${TESTED_HASH}
>      cd -
>  fi
>  
> -- 
> 1.7.9.1
> _______________________________________________
> Android mailing list
> Android at videolan.org
> http://mailman.videolan.org/listinfo/android

-- 
Best regards,

-- 
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device