|
@@ -12,7 +12,7 @@ CONFIGURATION="Release"
|
|
NONETWORK=no
|
|
NONETWORK=no
|
|
SKIPLIBVLCCOMPILATION=no
|
|
SKIPLIBVLCCOMPILATION=no
|
|
|
|
|
|
-TESTEDHASH=b89c7bd8b
|
|
|
|
|
|
+TESTEDHASH=87b457f18
|
|
|
|
|
|
usage()
|
|
usage()
|
|
{
|
|
{
|
|
@@ -125,7 +125,7 @@ if ! [ -e vlc ]; then
|
|
git clone git://git.videolan.org/vlc/vlc-2.1.git vlc
|
|
git clone git://git.videolan.org/vlc/vlc-2.1.git vlc
|
|
info "Applying patches to vlc.git"
|
|
info "Applying patches to vlc.git"
|
|
cd vlc
|
|
cd vlc
|
|
-#git checkout -B localAspenBranch ${TESTEDHASH}
|
|
|
|
|
|
+git checkout -B localAspenBranch ${TESTEDHASH}
|
|
git am ../../patches/*.patch
|
|
git am ../../patches/*.patch
|
|
if [ $? -ne 0 ]; then
|
|
if [ $? -ne 0 ]; then
|
|
git am --abort
|
|
git am --abort
|
|
@@ -136,6 +136,7 @@ cd ..
|
|
else
|
|
else
|
|
cd vlc
|
|
cd vlc
|
|
git pull --rebase
|
|
git pull --rebase
|
|
|
|
+git reset --hard {TESTEDHASH}
|
|
cd ..
|
|
cd ..
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|