rpms/FlightGear/F-13 FlightGear-2.0.0-bug133-AILocalTraffic.patch, NONE, 1.1 FlightGear-2.0.0-bug133-ATCmgr.patch, NONE, 1.1 FlightGear.spec, 1.18, 1.19

[Fabrice Bellet]

Author: bellet

Update of /cvs/pkgs/rpms/FlightGear/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28191

Modified Files:
	FlightGear.spec 
Added Files:
	FlightGear-2.0.0-bug133-AILocalTraffic.patch 
	FlightGear-2.0.0-bug133-ATCmgr.patch 
Log Message:
* Sun Jul 18 2010 Fabrice Bellet <fabrice at bellet.info> 2.0.0-4
- Fix a crasher in FGATC::NotifyTransmissionFinished (bz#608523)
  Upstream bug report and suggested workaround :
  http://code.google.com/p/flightgear-bugs/issues/detail?id=133


FlightGear-2.0.0-bug133-AILocalTraffic.patch:
 AILocalTraffic.cxx |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE FlightGear-2.0.0-bug133-AILocalTraffic.patch ---
diff -uNrp FlightGear-2.0.0.orig/src/ATCDCL/AILocalTraffic.cxx FlightGear-2.0.0/src/ATCDCL/AILocalTraffic.cxx
--- FlightGear-2.0.0.orig/src/ATCDCL/AILocalTraffic.cxx	2010-02-17 17:11:56.000000000 +0100
+++ FlightGear-2.0.0/src/ATCDCL/AILocalTraffic.cxx	2010-07-18 22:36:22.563740625 +0200
@@ -108,6 +108,12 @@ FGAILocalTraffic::FGAILocalTraffic() {
 	_controlled = false;
 	
 	_invisible = false;
+
+	ground = NULL;
+	tower = NULL;
+	ourGate = NULL;
+	nextTaxiNode = NULL;
+	holdShortNode = NULL;
 }
 
 FGAILocalTraffic::~FGAILocalTraffic() {
@@ -1254,13 +1260,13 @@ void FGAILocalTraffic::ProcessCallback(i
 	if(code == 1) {
 		ground->RequestDeparture(plane, this);
 	} else if(code == 2) {
-		tower->ContactAtHoldShort(plane, this, CIRCUIT);
+		if (_controlled) tower->ContactAtHoldShort(plane, this, CIRCUIT);
 	} else if(code == 3) {
-		tower->ReportRunwayVacated(plane.callsign);
+		if (_controlled) tower->ReportRunwayVacated(plane.callsign);
 	} else if(code == 11) {
-		tower->ReportDownwind(plane.callsign);
+		if (_controlled) tower->ReportDownwind(plane.callsign);
 	} else if(code == 13) {
-		tower->ReportFinal(plane.callsign);
+		if (_controlled) tower->ReportFinal(plane.callsign);
 	} else if(code == 99) { // Flag this instance for deletion
 		responseCounter = 0;
 		_removeSelf = true;

FlightGear-2.0.0-bug133-ATCmgr.patch:
 ATCmgr.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE FlightGear-2.0.0-bug133-ATCmgr.patch ---
diff -uNrp FlightGear-2.0.0.orig/src/ATCDCL/ATCmgr.cxx FlightGear-2.0.0/src/ATCDCL/ATCmgr.cxx
--- FlightGear-2.0.0.orig/src/ATCDCL/ATCmgr.cxx	2010-02-17 17:11:56.000000000 +0100
+++ FlightGear-2.0.0/src/ATCDCL/ATCmgr.cxx	2010-07-18 22:38:35.907740944 +0200
@@ -303,7 +303,9 @@ void FGATCMgr::ZapOtherService(const str
         //cout << "Eradicating service: '" << svc->first << "'" << endl;
     svc->second->SetNoDisplay();
     svc->second->Update(0);     // one last update
-    delete svc->second;
+    //TODO FIXME! AIPlanes keep private copies obtained by "FGATCMgr::GetATCPointer".
+    // Deleting the object causes stale pointers. => For now, rather accept a tiny memory leak...
+    //delete svc->second;
     atc_list->erase(svc);
 // ALL pointers into the ATC list are now invalid,
 // so let's reset them:


Index: FlightGear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear/F-13/FlightGear.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- FlightGear.spec	8 Jun 2010 14:10:26 -0000	1.18
+++ FlightGear.spec	20 Jul 2010 17:09:53 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		FlightGear
 Summary:	The FlightGear Flight Simulator
 Version:	2.0.0
-Release:	2%{?dist}
+Release:	4%{?dist}
 
 License:	GPLv2+
 Group:		Amusements/Games
@@ -17,6 +17,8 @@ Source6:	fg-128.png
 Source7:	COPYING
 Patch0:		FlightGear-0.9.10-no-automake-in-configure.patch
 Patch1:		FlightGear-2.0.0-requested-visual-unavailable.patch
+Patch2:		FlightGear-2.0.0-bug133-AILocalTraffic.patch
+Patch3:		FlightGear-2.0.0-bug133-ATCmgr.patch
 URL:		http://www.flightgear.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openal-soft-devel >= 1.11.753, SimGear-devel >= %{version}, freeglut-devel
@@ -35,6 +37,8 @@ expanded and improved upon by anyone int
 # automake shouldn't be called in configure Summary page
 %patch0 -p1 -b .no-automake-in-configure
 %patch1 -p1 -b .visual-unavailable
+%patch2 -p1 -b .bug133
+%patch3 -p1 -b .bug133
 
 # make rpmlint happy
 find -name \*.h -o -name \*.cpp -o -name \*.cxx -o -name \*.hxx \
@@ -114,6 +118,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sun Jul 18 2010 Fabrice Bellet <fabrice at bellet.info> 2.0.0-4
+- Fix a crasher in FGATC::NotifyTransmissionFinished (bz#608523)
+  Upstream bug report and suggested workaround :
+  http://code.google.com/p/flightgear-bugs/issues/detail?id=133
+
+* Fri Jul 02 2010 Fabrice Bellet <fabrice at bellet.info> 2.0.0-3
+- Rebuild with newer OSG
+
 * Wed Jun 02 2010 Fabrice Bellet <fabrice at bellet.info> 2.0.0-2
 - Fix a crasher when the requested visual cannot be created