Looks like the 0002-Look-for-binaries-in-Mesa-demos-path-as-well.patch patch was rebased incorrectly. Should be fixed with 5.25.0.