From ovek at users.alioth.debian.org Sat Oct 17 00:24:25 2009 From: ovek at users.alioth.debian.org (ovek at users.alioth.debian.org) Date: Sat, 17 Oct 2009 00:24:25 -0000 Subject: [pkg-fgfs-crew] r92 - in /fgfs-atlas/trunk: config.guess config.sub Message-ID: Author: ovek Date: Sat Oct 17 00:24:24 2009 New Revision: 92 URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=92 Log: Up-to-date config.guess and config.sub. Modified: fgfs-atlas/trunk/config.guess fgfs-atlas/trunk/config.sub Modified: fgfs-atlas/trunk/config.guess URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/config.guess?rev=92&op=diff ============================================================================== --- fgfs-atlas/trunk/config.guess (original) +++ fgfs-atlas/trunk/config.guess Sat Oct 17 00:24:24 2009 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-27' +timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -170,7 +170,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -656,7 +656,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -822,6 +822,9 @@ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -882,40 +885,17 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif @@ -947,7 +927,7 @@ EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; @@ -1001,14 +981,6 @@ elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -1074,7 +1046,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1182,7 +1154,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) Modified: fgfs-atlas/trunk/config.sub URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/config.sub?rev=92&op=diff ============================================================================== --- fgfs-atlas/trunk/config.sub (original) +++ fgfs-atlas/trunk/config.sub Sat Oct 17 00:24:24 2009 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-17' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -152,6 +152,9 @@ -apple | -axis | -knuth | -cray) os= basic_machine=$1 + ;; + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -467,6 +470,10 @@ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos @@ -1260,7 +1267,7 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ @@ -1613,7 +1620,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) From ovek at users.alioth.debian.org Sat Oct 17 00:32:17 2009 From: ovek at users.alioth.debian.org (ovek at users.alioth.debian.org) Date: Sat, 17 Oct 2009 00:32:17 -0000 Subject: [pkg-fgfs-crew] r93 - in /fgfs-atlas/trunk: debian/changelog src/Atlas.cxx src/FlightTrack.hxx src/Map.cxx src/MapBrowser.hxx src/MapMaker.cxx src/MapMaker.hxx src/MapPS.cxx src/OutputGL.hxx src/Overlays.cxx src/Overlays.hxx src/Scenery.cxx Message-ID: Author: ovek Date: Sat Oct 17 00:32:16 2009 New Revision: 93 URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=93 Log: Applied patch by Peter Green and Stefan Potyra. Modified: fgfs-atlas/trunk/debian/changelog fgfs-atlas/trunk/src/Atlas.cxx fgfs-atlas/trunk/src/FlightTrack.hxx fgfs-atlas/trunk/src/Map.cxx fgfs-atlas/trunk/src/MapBrowser.hxx fgfs-atlas/trunk/src/MapMaker.cxx fgfs-atlas/trunk/src/MapMaker.hxx fgfs-atlas/trunk/src/MapPS.cxx fgfs-atlas/trunk/src/OutputGL.hxx fgfs-atlas/trunk/src/Overlays.cxx fgfs-atlas/trunk/src/Overlays.hxx fgfs-atlas/trunk/src/Scenery.cxx Modified: fgfs-atlas/trunk/debian/changelog URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/debian/changelog?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/debian/changelog (original) +++ fgfs-atlas/trunk/debian/changelog Sat Oct 17 00:32:16 2009 @@ -1,3 +1,11 @@ +fgfs-atlas (0.3.1-2) unstable; urgency=low + + * Applied patch by Peter Green and Stefan Potyra (of Ubuntu) + to make Atlas build with SimGear 1.9. + Closes: #545593. + + -- Ove Kaaven Sat, 17 Oct 2009 02:27:02 +0200 + fgfs-atlas (0.3.1-1) unstable; urgency=low * New upstream release. Modified: fgfs-atlas/trunk/src/Atlas.cxx URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/src/Atlas.cxx?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/src/Atlas.cxx (original) +++ fgfs-atlas/trunk/src/Atlas.cxx Sat Oct 17 00:32:16 2009 @@ -29,6 +29,9 @@ #include #include #include +#ifndef SG_GLUT_H + #define SG_GLUT_H +#endif #include SG_GLUT_H #include #include @@ -41,6 +44,10 @@ #include "FlightTrack.hxx" #define SCALECHANGEFACTOR 1.3f + +#include +using std::cout; +using std::endl; SGIOChannel *input_channel; Modified: fgfs-atlas/trunk/src/FlightTrack.hxx URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/src/FlightTrack.hxx?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/src/FlightTrack.hxx (original) +++ fgfs-atlas/trunk/src/FlightTrack.hxx Sat Oct 17 00:32:16 2009 @@ -27,7 +27,12 @@ #include #include -SG_USING_STD(list); + +#ifdef SG_USING_STD + SG_USING_STD(list); +#else + using std::list; +#endif struct FlightData { float lat, lon, alt, hdg, spd; Modified: fgfs-atlas/trunk/src/Map.cxx URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/src/Map.cxx?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/src/Map.cxx (original) +++ fgfs-atlas/trunk/src/Map.cxx Sat Oct 17 00:32:16 2009 @@ -39,6 +39,13 @@ #include #include +#ifndef SG_GLUT_H + #define SG_GLUT_H +#endif +#ifndef SG_GL_H + #define SG_GL_H +#endif + #include SG_GL_H #ifdef UL_GLX # define GLX_GLXEXT_PROTOTYPES @@ -65,10 +72,16 @@ #include #include "Scenery.hxx" #include -#include STL_STRING - -SG_USING_STD(vector); -SG_USING_STD(string); +#include +#include + +#ifdef SG_USING_STD + SG_USING_STD(vector); + SG_USING_STD(string); +#else + using std::vector; + using std::string; +#endif typedef vector string_list; @@ -318,6 +331,9 @@ return true; } +using std::cout; +using std::cin; + bool ContinueIfNoHeadless() { cout << "Unable to continue in headless mode - revert to doublebuffer mode? [Y/n] "; char c; Modified: fgfs-atlas/trunk/src/MapBrowser.hxx URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/src/MapBrowser.hxx?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/src/MapBrowser.hxx (original) +++ fgfs-atlas/trunk/src/MapBrowser.hxx Sat Oct 17 00:32:16 2009 @@ -27,10 +27,16 @@ #include "FlightTrack.hxx" #include "Projection.hxx" #include +#ifndef SG_GL_H + #define SG_GL_H +#endif #include SG_GL_H #include #include #include + +using std::map; + class MapBrowser { public: @@ -107,6 +113,7 @@ bool tex; }; + struct TileLess { bool operator()(const Coord &v1, const Coord &v2) const { return (v1.lat < v2.lat || (v1.lat == v2.lat && v1.lon < v2.lon)); Modified: fgfs-atlas/trunk/src/MapMaker.cxx URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/src/MapMaker.cxx?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/src/MapMaker.cxx (original) +++ fgfs-atlas/trunk/src/MapMaker.cxx Sat Oct 17 00:32:16 2009 @@ -31,9 +31,11 @@ #endif #include #include +#include #include "MapMaker.hxx" /*#include */ + // Utility function that I needed to put somewhere - this probably isn't the best place for it. // Appends a path separator to a directory path if not present. @@ -653,9 +655,9 @@ /* convert point_list of wgs84 nodes to a list of points transformed into the maps local coordinate system */ - const point_list wgs84_nodes = tile.get_wgs84_nodes(); - for ( point_list::const_iterator node = wgs84_nodes . begin(); - node != wgs84_nodes . end(); + const std::vector &wgs84_nodes = tile.get_wgs84_nodes(); + for ( std::vector::const_iterator node = wgs84_nodes.begin(); + node != wgs84_nodes.end(); node++ ) { float *nv = new sgVec3; @@ -674,8 +676,8 @@ } // same as above for normals - const point_list m_norms = tile.get_normals(); - for ( point_list::const_iterator normal = m_norms.begin(); + const std::vector &m_norms = tile.get_normals(); + for ( std::vector::const_iterator normal = m_norms.begin(); normal != m_norms.end(); normal++ ) { // Make a new normal @@ -760,8 +762,8 @@ } if(0) { - cout << "Node_list sizes are nodes: " << wgs84_nodes.size() << " -- normals: " << m_norms.size() << '\n'; - cout << "Group_list sizes are tris: " << tris.size() << " -- fans: " << fans.size() << " -- strips: " << strips.size() << '\n'; + std::cout << "Node_list sizes are nodes: " << wgs84_nodes.size() << " -- normals: " << m_norms.size() << '\n'; + std::cout << "Group_list sizes are tris: " << tris.size() << " -- fans: " << fans.size() << " -- strips: " << strips.size() << '\n'; } for (i = 0; i < v.size(); i++) { Modified: fgfs-atlas/trunk/src/MapMaker.hxx URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/src/MapMaker.hxx?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/src/MapMaker.hxx (original) +++ fgfs-atlas/trunk/src/MapMaker.hxx Sat Oct 17 00:32:16 2009 @@ -31,14 +31,19 @@ #include #include #include -#include STL_STRING +#include #include "Output.hxx" #include "Overlays.hxx" #include "Geodesy.hxx" -SG_USING_STD(vector); -SG_USING_STD(string); +#ifdef SG_USING_STD + SG_USING_STD(vector); + SG_USING_STD(string); +#else + using std::vector; + using std::string; +#endif // Utility function that I needed to put somewhere - this probably isn't the best place for it. // Appends a path separator to a directory path if not present. Modified: fgfs-atlas/trunk/src/MapPS.cxx URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/src/MapPS.cxx?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/src/MapPS.cxx (original) +++ fgfs-atlas/trunk/src/MapPS.cxx Sat Oct 17 00:32:16 2009 @@ -38,9 +38,15 @@ #include "OutputPS.hxx" #include #include "Scenery.hxx" - +#include + +#ifdef SG_USING_STD SG_USING_STD(vector); SG_USING_STD(string); +#else +using std::vector; +using std::string; +#endif typedef vector string_list; @@ -149,7 +155,7 @@ scenerypath = new char[max_path_length + 256]; scenery_pos = 0; } else { - cout << "No scenery paths could be found. You need to set either a valid FG_ROOT and/or FG_SCENERY variable, or specify a valid --fg-root and/or --fg-scenery on the command line.\n"; + std::cout << "No scenery paths could be found. You need to set either a valid FG_ROOT and/or FG_SCENERY variable, or specify a valid --fg-root and/or --fg-scenery on the command line.\n"; exit(-1); } Modified: fgfs-atlas/trunk/src/OutputGL.hxx URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/src/OutputGL.hxx?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/src/OutputGL.hxx (original) +++ fgfs-atlas/trunk/src/OutputGL.hxx Sat Oct 17 00:32:16 2009 @@ -2,6 +2,9 @@ #define __OUTPUTGL_H__ #include +#ifndef SG_GLUT_H + #define SG_GLUT_H +#endif #include SG_GLUT_H #include #include Modified: fgfs-atlas/trunk/src/Overlays.cxx URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/src/Overlays.cxx?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/src/Overlays.cxx (original) +++ fgfs-atlas/trunk/src/Overlays.cxx Sat Oct 17 00:32:16 2009 @@ -27,7 +27,11 @@ #include "Overlays.hxx" #include "Geodesy.hxx" -SG_USING_STD(map); +#ifdef SG_USING_STD + SG_USING_STD(map); +#else + using std::map; +#endif #ifdef _MSC_VER @@ -151,6 +155,8 @@ return y; } +using std::string; + // Convert an angle to degrees and possibly minutes and possibly seconds, // according to the given resolution. // 'ns' is the prefixes for positive and negative, e.g. "NS" or "EW" or "+-". @@ -184,6 +190,9 @@ sprintf(s, format, *ns, deg, min % 60, sec % 60); return string(s); } + +using std::max; +using std::min; // Draw grid lines in latitude range lat-dtheta to lat+dtheta radians, // longitude range lon-dalpha to lon+dalpha. Modified: fgfs-atlas/trunk/src/Overlays.hxx URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/src/Overlays.hxx?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/src/Overlays.hxx (original) +++ fgfs-atlas/trunk/src/Overlays.hxx Sat Oct 17 00:32:16 2009 @@ -34,6 +34,8 @@ #include "Output.hxx" #include "FlightTrack.hxx" #include "Projection.hxx" + +using std::vector; class Overlays { public: Modified: fgfs-atlas/trunk/src/Scenery.cxx URL: http://svn.debian.org/wsvn/pkg-fgfs/fgfs-atlas/trunk/src/Scenery.cxx?rev=93&op=diff ============================================================================== --- fgfs-atlas/trunk/src/Scenery.cxx (original) +++ fgfs-atlas/trunk/src/Scenery.cxx Sat Oct 17 00:32:16 2009 @@ -3,8 +3,13 @@ #include "MapMaker.hxx" +#ifdef SG_USING_STD SG_USING_STD(vector); SG_USING_STD(string); +#else +using std::vector; +using std::string; +#endif typedef vector string_list; From ovek at users.alioth.debian.org Sat Oct 17 00:33:45 2009 From: ovek at users.alioth.debian.org (ovek at users.alioth.debian.org) Date: Sat, 17 Oct 2009 00:33:45 -0000 Subject: [pkg-fgfs-crew] r94 - /fgfs-atlas/tags/0.3.1-2/ Message-ID: Author: ovek Date: Sat Oct 17 00:33:44 2009 New Revision: 94 URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=94 Log: [svn-buildpackage] Tagging fgfs-atlas (0.3.1-2) Added: fgfs-atlas/tags/0.3.1-2/ - copied from r93, fgfs-atlas/trunk/