mirror
/
xbmc
mirror of https://github.com/xbmc/xbmc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Windows] Fix the ability to detect dav1d version changes to rebuild FFmpeg

This commit is contained in:
thexai 2025-12-10 16:30:43 +01:00
parent 0e02cbc69f
commit fb0b15c4da
No known key found for this signature in database
GPG Key ID: F8B77BEF17DE6F8D
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/buildsteps/windows/buildhelpers.sh
View File

@ -184,11 +184,11 @@ PATH_CHANGE_REV_FILENAME=".last_success_revision"
#params paths to be hashed #params paths to be hashed
function getBuildHash () function getBuildHash ()
{ {
local package="$(extractPackage $3)" local ver_dav1d="$(extractVersion $3)"
local version="$(extractVersion $4)" local ver_ffmpeg="$(extractVersion $4)"
local hashStr local hashStr
hashStr="$(git rev-list HEAD --max-count=1 -- $@)" hashStr="$(git rev-list HEAD --max-count=1 -- $@)"
hashStr="$hashStr $@ $version $package" hashStr="$hashStr $@ $ver_ffmpeg $ver_dav1d"
echo $hashStr echo $hashStr
} }
@ -239,15 +239,6 @@ function extractVersion()
echo $ver echo $ver
} }
function extractPackage()
{
local path="$1"
local file="$path/0_package.target-$TRIPLET.list"
local package=$(grep '^dav1d-' $file)
echo $package
}
function cleanLastSuccess() function cleanLastSuccess()
{ {
local path="$1" local path="$1"

4
tools/buildsteps/windows/make-mingwlibs.sh
View File

@ -77,7 +77,7 @@ checkfiles() {
buildProcess() { buildProcess() {
export PREFIX=/xbmc/project/BuildDependencies/mingwlibs/$TRIPLET export PREFIX=/xbmc/project/BuildDependencies/mingwlibs/$TRIPLET
if [ "$(pathChanged $PREFIX /xbmc/tools/buildsteps/windows /xbmc/project/BuildDependencies/scripts /xbmc/tools/depends/target/ffmpeg/FFMPEG-VERSION)" == "0" ]; then if [ "$(pathChanged $PREFIX /xbmc/tools/buildsteps/windows /xbmc/tools/depends/target/dav1d/DAV1D-VERSION /xbmc/tools/depends/target/ffmpeg/FFMPEG-VERSION)" == "0" ]; then
return return
fi fi
@ -110,7 +110,7 @@ echo "--------------------------------------------------------------------------
echo " compile mingw libs $TRIPLET done..." echo " compile mingw libs $TRIPLET done..."
echo "-------------------------------------------------------------------------------" echo "-------------------------------------------------------------------------------"
tagSuccessFulBuild $PREFIX /xbmc/tools/buildsteps/windows /xbmc/project/BuildDependencies/scripts /xbmc/tools/depends/target/ffmpeg/FFMPEG-VERSION tagSuccessFulBuild $PREFIX /xbmc/tools/buildsteps/windows /xbmc/tools/depends/target/dav1d/DAV1D-VERSION /xbmc/tools/depends/target/ffmpeg/FFMPEG-VERSION
} }
run_builds() { run_builds() {