Browse Source

build script: fix patch application

muarf.
Felix Paul Kühne 11 years ago
parent
commit
cde69a1e2a
1 changed files with 9 additions and 9 deletions
  1. 9 9
      buildAspenProject.sh

+ 9 - 9
buildAspenProject.sh

@@ -116,16 +116,16 @@ spushd ImportedSources
 
 if ! [ -e vlc ]; then
 git clone git://git.videolan.org/vlc/vlc-2.1.git vlc
-#info "Applying patches to vlc.git"
-#cd vlc
+info "Applying patches to vlc.git"
+cd vlc
 #git checkout -B localAspenBranch ${TESTEDHASH}
-#git am ../../patches/*.patch
-#if [ $? -ne 0 ]; then
-#git am --abort
-#info "Applying the patches failed, aborting git-am"
-#exit 1
-#fi
-#cd ..
+git am ../../patches/*.patch
+if [ $? -ne 0 ]; then
+git am --abort
+info "Applying the patches failed, aborting git-am"
+exit 1
+fi
+cd ..
 fi
 if ! [ -e MediaLibraryKit ]; then
 git clone git://git.videolan.org/MediaLibraryKit.git