Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-17 Thread Bertrand Coconnier
2011/2/17 Tim Moore : > I've committed one more fix that should make things right on 2.8.3. > Tim > It works now with OSG 2.8.1 ! Thanks Tim. Bertrand. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel S

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-17 Thread Martin Spott
Tim Moore wrote: > I've committed one more fix that should make things right on 2.8.3. Works with stock OSG libs on Debian 6, Martin. -- Unix _IS_ user friendly - it's just selective about who its friends are ! --

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-17 Thread Tim Moore
I've committed one more fix that should make things right on 2.8.3. Tim On Wed, Feb 16, 2011 at 8:16 PM, Tim Moore wrote: > OK, I see that merely removing the 2.8.3 case from my conditional, > which I checked in a couple of hours ago, isn't correct. I'll have > another go. > > On Wed, Feb 16, 2

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-16 Thread Tim Moore
OK, I see that merely removing the 2.8.3 case from my conditional, which I checked in a couple of hours ago, isn't correct. I'll have another go. On Wed, Feb 16, 2011 at 7:10 PM, ThorstenB wrote: > On 15.02.2011 13:41, Tim Moore wrote: >> I've checked in fixes for this change in osgDB:DatabasePag

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-16 Thread ThorstenB
On 15.02.2011 13:41, Tim Moore wrote: > I've checked in fixes for this change in osgDB:DatabasePager to the > SimGear and FlightGear next and releases/2.2.0 branches. Still doesn't compile with OSG <= 2.8.5. We also need the patch that Bertrand sent yesterday, i.e. the "#ifdef" logic for the "_

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-16 Thread Bertrand Coconnier
My patch may not work for OSG >=2.9 but the fact is that _readerWriterOptions is also needed for SimGear to compile with OSG 2.8.1. Cheers, Bertrand Le 16 févr. 2011 02:53, "Frederic Bouvier" a écrit : - "Bertrand Coconnier" a écrit : > 2011/2/15 Tim Moore : > > I've checked in fixes fo

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-16 Thread Anders Gidenstam
On Wed, 16 Feb 2011, Frederic Bouvier wrote: >> By the way, I committed the changes to releases/2.2.0 and then merged that >> branch into next. This is the way fixes should move between the two >> branches. Please don't commit a fix to next and then cherry-pick it to the >> release branch. It i

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-16 Thread Frederic Bouvier
> By the way, I committed the changes to releases/2.2.0 and then merged that > branch into next. This is the way fixes should move between the two branches. > Please don't commit a fix to next and then cherry-pick it to the release > branch. It is very messy to have the same change committed on

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-16 Thread Tim Moore
I was confused, by my git SVN import of the OSG source tree, about what commits are in 2.8.3. I'll check in a correction soon. Tim On Wed, Feb 16, 2011 at 8:51 AM, Frederic Bouvier wrote: > > - "Bertrand Coconnier" a écrit : > >> 2011/2/15 Tim Moore : >> > I've checked in fixes for this chan

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-15 Thread Frederic Bouvier
- "Bertrand Coconnier" a écrit : > 2011/2/15 Tim Moore : > > I've checked in fixes for this change in osgDB:DatabasePager to the SimGear > > and FlightGear next and releases/2.2.0 branches. Part of the delay resulted > > from the fact that the Open Scene Graph change introduced a new bug; I h

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-15 Thread Bertrand Coconnier
2011/2/15 Tim Moore : > I've checked in fixes for this change in osgDB:DatabasePager to the SimGear > and FlightGear next and releases/2.2.0 branches. Part of the delay resulted > from the fact that the Open Scene Graph change introduced a new bug; I have > waited until my patch for that was accept

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-02-15 Thread Tim Moore
I've checked in fixes for this change in osgDB:DatabasePager to the SimGear and FlightGear next and releases/2.2.0 branches. Part of the delay resulted from the fact that the Open Scene Graph change introduced a new bug; I have waited until my patch for that was accepted in OSG to avoid a situation

Re: [Flightgear-devel] Simgear and OSG out of sync?

2011-01-16 Thread James Turner
On 16 Jan 2011, at 10:56, fiers...@zonnet.nl wrote: > When I saw this, I removed all sources for OSG and Simgear and restarted with > a fresh git clone, but the error remains. I searched the forums and noticed > someone else has the same problem with a completely freshly cloned git > version.

[Flightgear-devel] Simgear and OSG out of sync?

2011-01-16 Thread fierst42
Hi All, I have been away for a couple of weeks, so perhaps I have missed something. When I tried to compile a fresh git version using download_and_compile.sh, I noticed there were some updates in OSG. It seems simgear is not in sync (yet?), though, because I am getting the following error: