|
From: Scott G. <sc...@gm...> - 2025-08-25 16:29:13
|
Tried to do it via Gitlab UI, but it was wanting to merge far more than I wanted to target. So I then tried to cherry-pick via VSCode, but I was having difficulty there also. I'm not yet comfortable with the new tools. There were changes made to OSG to not build Applications and Examples. That's what we need to replicate within STABLE. Scott On 8/25/25 03:58, James Turner wrote: > > >> On 23 Aug 2025, at 18:40, Scott Giese <sc...@gm...> wrote: >> >> We will, but I'm still all thumbs with Gitlabs, so I'll let the >> experts assist with this. > > Normally you can create a cherry-pick MR from the gitLab web UI, it > works well, if there’s no conflicts. In this case there are conflicts, > so I tried to do it manually. > > However, I note that on release/2024-build of OSG, the CMake minimum > version is already set to 3.12, and hence we get the NEW (not LEGACY) > OpenGL VND policy anyway. This was done by Gijs about a month ago, > according to the git blame. > > So I *think* there is nothing to do here, by my current understanding, > but please do correct me, if I am wrong. > > Kind regards, > James > > > > _______________________________________________ > Flightgear-devel mailing list > Fli...@li... > https://lists.sourceforge.net/lists/listinfo/flightgear-devel |