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

Merge pull request #27573 from thexai/fix-ffmpeg-rebuild 

[Windows] Fix the ability to detect dav1d version changes to rebuild FFmpeg
This commit is contained in:
thexai 2025-12-11 15:13:34 +01:00 committed by GitHub
parent 0e02cbc69f fb0b15c4da
commit 78a12b700f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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
function getBuildHash ()
{
local package="$(extractPackage $3)"
local version="$(extractVersion $4)"
local ver_dav1d="$(extractVersion $3)"
local ver_ffmpeg="$(extractVersion $4)"
local hashStr
hashStr="$(git rev-list HEAD --max-count=1 -- $@)"
hashStr="$hashStr $@ $version $package"
hashStr="$hashStr $@ $ver_ffmpeg $ver_dav1d"
echo $hashStr
}
@ -239,15 +239,6 @@ function extractVersion()
echo $ver
}
function extractPackage()
{
local path="$1"
local file="$path/0_package.target-$TRIPLET.list"
local package=$(grep '^dav1d-' $file)
echo $package
}
function cleanLastSuccess()
{
local path="$1"

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

@ -77,7 +77,7 @@ checkfiles() {
buildProcess() {
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
fi
@ -110,7 +110,7 @@ echo "--------------------------------------------------------------------------
echo " compile mingw libs $TRIPLET done..."
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() {