|
From: Florent R. <f.r...@fr...> - 2025-08-21 07:56:20
|
Hi,
Le 20/08/2025, bo23--- via Flightgear-devel <fli...@li...> a écrit:
> I went a little further and applied Scott's commit 7ee1243a from OSG
> next to OSG release/2024-build, defacto cherry-picking it.
> After cleaning up the merge conflicts as best as I could, I came up with
> the attached patch. And the error disappeared! Can anyone (Florent?;-)
> check my results?
Compilation and running of FG 2024.1 work for me with:
download_and_compile.sh --cleanup
download_and_compile.sh -s -pn -rn -cn
git -C openscenegraph apply \
/tmp/2025-08-20_CMake_minimum_version_to_3.20_-_from_next_to_release_2024-build.patch
download_and_compile.sh -s -pn -dn -j$(nproc) -GNinja
The purpose of the second command is to update all repositories before
applying the patch (d&c can stash uncommitted stuff and reapply it after
updating, however I prefer using -dn when working with local changes).
Repos are in this state, modulo the OSG patch:
CARES 4c8820a6 origin/v1.34 https://github.com/c-ares/c-ares.git
DATA e737992f4 origin/release/2024.1 https://gitlab.com/flightgear/fgdata.git
FGFS 4a98505ac origin/release/2024.1 https://gitlab.com/flightgear/flightgear.git
OSG a4ea8ec53 origin/release/2024-build https://gitlab.com/flightgear/openscenegraph.git
PLIB 2052276 origin/master https://git.code.sf.net/p/libplib/code
SIMGEAR 71b49e29 origin/release/2024.1 https://gitlab.com/flightgear/simgear.git
Regards
--
Florent
|