Merge pull request xbmc#26158 from thexai/fix-ffmpeg-dav1d-rebuild

[Windows] Force rebuild FFmpeg when dav1d version changes
Rechi · Dec 22, 2024 · 4af868a · 4af868a
2 parents 776b0aa + 28e9d67
commit 4af868a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/tools/buildsteps/windows/buildhelpers.sh b/tools/buildsteps/windows/buildhelpers.sh
@@ -163,10 +163,11 @@ PATH_CHANGE_REV_FILENAME=".last_success_revision"
 #params paths to be hashed
 function getBuildHash ()
 {
-  local version="$(extractVersion $3)"
+  local package="$(extractPackage $3)"
+  local version="$(extractVersion $4)"
   local hashStr
   hashStr="$(git rev-list HEAD --max-count=1  -- $@)"
-  hashStr="$hashStr $@ $version"
+  hashStr="$hashStr $@ $version $package"
   echo $hashStr
 }
 
@@ -216,3 +217,12 @@ function extractVersion()
 
   echo $ver
 }
+
+function extractPackage()
+{
+  local path="$1"
+  local file="$path/0_package.target-$TRIPLET.list"
+  local package=$(grep '^dav1d-' $file)
+
+  echo $package
+}
diff --git a/tools/buildsteps/windows/make-mingwlibs.sh b/tools/buildsteps/windows/make-mingwlibs.sh
@@ -73,7 +73,7 @@ checkfiles() {
 
 buildProcess() {
 export PREFIX=/xbmc/project/BuildDependencies/mingwlibs/$TRIPLET
-if [ "$(pathChanged $PREFIX /xbmc/tools/buildsteps/windows /xbmc/tools/depends/target/ffmpeg/FFMPEG-VERSION)" == "0" ]; then
+if [ "$(pathChanged $PREFIX /xbmc/tools/buildsteps/windows /xbmc/project/BuildDependencies/scripts /xbmc/tools/depends/target/ffmpeg/FFMPEG-VERSION)" == "0" ]; then
   return
 fi
 
@@ -106,7 +106,7 @@ echo "--------------------------------------------------------------------------
 echo " compile mingw libs $TRIPLET done..."
 echo "-------------------------------------------------------------------------------"
 
-tagSuccessFulBuild $PREFIX /xbmc/tools/buildsteps/windows /xbmc/tools/depends/target/ffmpeg/FFMPEG-VERSION
+tagSuccessFulBuild $PREFIX /xbmc/tools/buildsteps/windows /xbmc/project/BuildDependencies/scripts /xbmc/tools/depends/target/ffmpeg/FFMPEG-VERSION
 }
 
 run_builds() {