Commit 9a5d53ec authored by Felix Paul Kühne's avatar Felix Paul Kühne

libvlc: move patches to a different places as they are no longer specific to MVK

parent 8112341a
...@@ -1054,7 +1054,7 @@ if [ "$VLCROOT" = "" ]; then ...@@ -1054,7 +1054,7 @@ if [ "$VLCROOT" = "" ]; then
cd vlc cd vlc
git checkout -B localBranch ${TESTEDHASH} git checkout -B localBranch ${TESTEDHASH}
git branch --set-upstream-to=origin/master localBranch git branch --set-upstream-to=origin/master localBranch
git am ${ROOT_DIR}/Resources/MobileVLCKit/patches/*.patch git am ${ROOT_DIR}/libvlc/patches/*.patch
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
git am --abort git am --abort
info "Applying the patches failed, aborting git-am" info "Applying the patches failed, aborting git-am"
...@@ -1065,7 +1065,7 @@ if [ "$VLCROOT" = "" ]; then ...@@ -1065,7 +1065,7 @@ if [ "$VLCROOT" = "" ]; then
cd vlc cd vlc
git fetch --all git fetch --all
git reset --hard ${TESTEDHASH} git reset --hard ${TESTEDHASH}
git am ${ROOT_DIR}/Resources/MobileVLCKit/patches/*.patch git am ${ROOT_DIR}/libvlc/patches/*.patch
cd .. cd ..
fi fi
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment