[Android] compile-medialibrary.sh: Revert to using a commit instead of a tag

Hugo Beauzée-Luyssen git at videolan.org
Mon Feb 28 13:46:06 UTC 2022


vlc-android | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Feb 28 13:36:53 2022 +0100| [682004334f8cf9ef6bdfa199ad033e8d9e212388] | committer: Hugo Beauzée-Luyssen

compile-medialibrary.sh: Revert to using a commit instead of a tag

Using a tag isn't working well during development and makes bisecting
intermediate commits extremely difficult.

> https://code.videolan.org/videolan/vlc-android/commit/682004334f8cf9ef6bdfa199ad033e8d9e212388
---

 buildsystem/compile-medialibrary.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index 28e8663cb..00640476b 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -6,7 +6,7 @@ set -e
 # ARGUMENTS #
 #############
 
-MEDIALIBRARY_TAG=0.11.0
+MEDIALIBRARY_HASH=725ff59a2ac3c8107f2cc2ae34bce627aa1202c5
 
 while [ $# -gt 0 ]; do
   case $1 in
@@ -96,9 +96,11 @@ cd ${SRC_DIR}
 # The CI will always use this block
 if [ ! -d "${MEDIALIBRARY_MODULE_DIR}/medialibrary" ]; then
   echo -e "\e[1m\e[32mmedialibrary source not found, cloning\e[0m"
-  git clone --depth 1 -b ${MEDIALIBRARY_TAG}  http://code.videolan.org/videolan/medialibrary.git "${MEDIALIBRARY_MODULE_DIR}/medialibrary"
+  git clone http://code.videolan.org/videolan/medialibrary.git "${MEDIALIBRARY_MODULE_DIR}/medialibrary"
   avlc_checkfail "medialibrary source: git clone failed"
   cd ${MEDIALIBRARY_MODULE_DIR}/medialibrary
+  git reset --hard ${MEDIALIBRARY_HASH}
+  avlc_checkfail "medialibrary source: Failed to switch to expected commit hash"
   git submodule update --init libvlcpp
   # TODO: remove when switching to VLC 4.0
   cd libvlcpp
@@ -106,7 +108,8 @@ if [ ! -d "${MEDIALIBRARY_MODULE_DIR}/medialibrary" ]; then
 elif [ "$RESET" = "1" ]; then
     cd ${SRC_DIR}/medialibrary/medialibrary
     git fetch --all --tags
-    git checkout ${MEDIALIBRARY_TAG} -b ${MEDIALIBRARY_TAG}-branch
+    git reset --hard ${MEDIALIBRARY_HASH}
+    avlc_checkfail "medialibrary source: Failed to switch to expected commit hash"
     git submodule update --init libvlcpp
     # TODO: remove when switching to VLC 4.0
     cd libvlcpp



More information about the Android mailing list