commit: 1650a8ede6a9ff75aea348580d7a557aa36c6f21 Author: Michael Weber <michael <AT> xmw <DOT> de> AuthorDate: Thu Feb 11 14:15:40 2016 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Thu Feb 11 14:15:40 2016 +0000 URL: https://gitweb.gentoo.org/dev/xmw.git/commit/?id=1650a8ed
games-util/atlas: drop old. Package-Manager: portage-2.2.27 Manifest-Sign-Key: 0x71D573A82F434065 games-util/atlas/Manifest | 1 - games-util/atlas/atlas-0.4_p20140519.ebuild | 65 ---- .../atlas/files/atlas-0.4_p20140519-fg3.patch | 328 --------------------- 3 files changed, 394 deletions(-) diff --git a/games-util/atlas/Manifest b/games-util/atlas/Manifest deleted file mode 100644 index 3031249..0000000 --- a/games-util/atlas/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST atlas-0.4_p20140519.tar.bz2 361977 SHA256 efd8a94fba447e7157955040fa33664bb87116b46104a33c79a6431fe5383159 SHA512 0d0ba468fe748362b23de647a27cd279f2f3eee06699ac8a113ce8eeb24af6977a6567b5daedb2e6d95a976195db6131e8589d1db39b7d4ae2ea06424c539ef5 WHIRLPOOL 86eecc7d8fa3c9347e84c5e2ee9666613a604b83ef7cd2be2087a30b47f85020efb07d5618b2c42f2424503b29467248a195769558e9b39d473221d5d9f51676 diff --git a/games-util/atlas/atlas-0.4_p20140519.ebuild b/games-util/atlas/atlas-0.4_p20140519.ebuild deleted file mode 100644 index 13b656e..0000000 --- a/games-util/atlas/atlas-0.4_p20140519.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit autotools games - -DESCRIPTION="Chart Program to use with Flightgear Flight Simulator" -HOMEPAGE="http://atlas.sourceforge.net/"; -SRC_URI="http://dev.gentoo.org/~xmw/atlas-0.4_p20140519.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -COMMON_DEPEND=" - media-libs/freeglut - >=media-libs/libpng-1.4 - net-misc/curl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/opengl -" -DEPEND="${COMMON_DEPEND} - >=dev-games/simgear-2.4.0 - media-libs/plib -" -RDEPEND="${COMMON_DEPEND} - >=games-simulation/flightgear-2.4.0 -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-fg3.patch - eautoreconf -} - -src_configure() { - egamesconf \ - --disable-dependency-tracking \ - --with-fgbase="${GAMES_DATADIR}"/flightgear \ - --enable-simgear-shared -} - -pkg_postinst() { - games_pkg_postinst - elog "You now can make the maps with the following commands:" - elog "${GAMES_BINDIR}/Map --atlas=${GAMES_DATADIR}/flightgear/Atlas" - elog - elog "To run Atlas concurrently with FlightGear use the following:" - elog "Atlas --path=[path of map images] --udp=[port number]" - elog "and start fgfs with the following switch (or in .fgfsrc):" - elog "--nmea=socket,out,0.5,[host that you run Atlas on],[port number],udp" - echo -} - -pkg_postrm() { - elog "You must manually remove the maps if you don't want them around." - elog "They are found in the following directory:" - echo - elog "${GAMES_DATADIR}/flightgear/Atlas" - echo -} diff --git a/games-util/atlas/files/atlas-0.4_p20140519-fg3.patch b/games-util/atlas/files/atlas-0.4_p20140519-fg3.patch deleted file mode 100644 index e367e22..0000000 --- a/games-util/atlas/files/atlas-0.4_p20140519-fg3.patch +++ /dev/null @@ -1,328 +0,0 @@ -Based on a patch by Frederik Tilmann, posted at http://forum.flightgear.org/viewtopic.php?f=31&t=21972#p202275 - ---- atlas-0.4_p20140519/src/NavData.hxx -+++ atlas-0.4_p20140519/src/NavData.hxx -@@ -219,6 +219,7 @@ - void _loadAirways640(const gzFile& arp); - void _checkEnd(AwyLabel &end, bool isLow); - void _loadAirports810(const gzFile& arp); -+ void _loadAirports1000(const gzFile& arp); - - Searcher *_searcher; - ---- atlas-0.4_p20140519/src/NavData.cxx -+++ atlas-0.4_p20140519/src/NavData.cxx -@@ -1016,6 +1016,8 @@ - if (version == 810) { - // It looks like we have a valid file. - _loadAirports810(arp); -+ } else if ( version == 1000 ) { -+ _loadAirports1000(arp); - } else { - // EYE - throw an error? - fprintf(stderr, "AirportsOverlay::load: \"%s\": unknown version %d.\n", -@@ -1397,3 +1399,304 @@ - _frustumCullers[AIRPORTS]->culler().addObject(ap); - } - } -+ -+ -+void NavData::_loadAirports1000(const gzFile& arp) -+{ -+ char *line; -+ ARP *ap = NULL; -+ -+ while (gzGetLine(arp, &line)) { -+ int lineCode, offset; -+ -+ if (strcmp(line, "") == 0) { -+ // Blank line. -+ continue; -+ } -+ -+ if (strcmp(line, "99") == 0) { -+ // Last line. -+ break; -+ } -+ -+ sscanf(line, "%d%n", &lineCode, &offset); -+ line += offset; -+ switch (lineCode) { -+ case 1: -+ case 16: -+ case 17: -+ { -+ // The presence of a 1/16/17 means that we're starting a -+ // new airport/seaport/heliport, and therefore ending an -+ // old one. Deal with the old airport first. -+ if (ap != NULL) { -+ // Calculate the airport's center in lat, lon. -+ __airportLatLon(ap); -+ // Add it to our airports vector. -+ _airports.push_back(ap); -+ // Add our airport text to the searcher object. -+ _searcher->add(ap); -+ // Add to our culler. -+ _frustumCullers[AIRPORTS]->culler().addObject(ap); -+ -+ ap = NULL; -+ } -+ -+ // EYE - add seaports and heliports! (Note: the -+ // classification of seaports is iffy - Pearl Harbor -+ // is called an airport, even though it's in the -+ // ocean, and Courchevel is called a seaport, even -+ // though it's on top of a mountain). -+ if (lineCode != 1) { -+ // We only handle airports (16 = seaport, 17 = heliport) -+ break; -+ } -+ -+ // Create a new airport record. -+ ap = new ARP; -+ -+ float elevation; -+ int controlled; -+ char code[5]; // EYE - safe? -+ -+ sscanf(line, "%f %d %*d %s %n", -+ &elevation, &controlled, code, &offset); -+ line += offset; -+ -+ ap->elev = elevation * SG_FEET_TO_METER; -+ // FJT: according to 1000 spec this parameter is deprecated - still leave it in -+ ap->controlled = (controlled == 1); -+ ap->id = code; -+ ap->name = line; -+ // This will be set to true if we find a runway with -+ // any kind of runway lighting. -+ ap->lighting = false; -+ // If set to true, then beaconLat and beaconLon -+ // contain the location of the beacon. -+ ap->beacon = false; -+ } -+ -+ break; -+ case 100: -+ // 100: runway (i.e. ignore water runway 101, helipad 102) -+ { -+ if (ap == NULL) { -+ // If we're not working on an airport (ie, if this is -+ // a heliport), just continue. -+ break; -+ } -+ -+ double lat1, lon1,lat2,lon2,latdif,londif; -+ char rwyid1[4],rwyid2[4]; // EYE - safe? -+ float heading, length, width; -+ int centre_light,edge_light,reil_light,tdz_light; -+ // char *lighting; -+ -+ // sscanf(line, "%lf %lf %s %n", &lat, &lon, rwyid, &offset); -+ // skipped parameters: surface type, runway should surface type, smoothness, auto-generate distance signs -+ sscanf(line,"%f %*d %*d %*f %d %d %*d %n",&width,¢re_light,&edge_light,&offset); -+ line += offset; -+ if ( edge_light || centre_light) -+ ap->lighting=true; -+ -+ // skipped values: displaced threshold, overrun, runway markings, approach lighting, runway touchdown lighting, runway end identifier light -+ sscanf(line,"%4s %lf %lf %*f %*f %*d %*d %d %d %n",rwyid1,&lat1,&lon1,&tdz_light,&reil_light,&offset); -+ line += offset; -+ if ( tdz_light || reil_light) -+ ap->lighting=true; -+ // skipped values: displaced threshold, overrun, runway markings, approach lighting, runway touchdown lighting, runway end identifier light -+ sscanf(line,"%4s %lf %lf %*f %*f %*d %*d %d %d %n",rwyid2,&lat2,&lon2,&tdz_light,&reil_light,&offset); -+ line += offset; -+ if ( tdz_light || reil_light) -+ ap->lighting=true; -+ // We ignore taxiways and helipads. -+ // if (strcmp(rwyid, "xxx") == 0) { -+ // break; -+ //} -+ //if (strncmp(rwyid, "H", 1) == 0) { -+ // break; -+ //} -+ -+ // Strip off trailing x's. -+ int firstX = strcspn(rwyid1, "x"); -+ if (firstX > 0) { -+ rwyid1[firstX] = '\0'; -+ } -+ assert(strlen(rwyid1) <= 3); -+ -+ // Runway! -+ RWY *rwy = new RWY; -+ -+ // sscanf(line, "%f %f %*f %*f %f %n", -+ // &heading, &length, &width, &offset); -+ // lighting = line + offset; -+ -+ rwy->lat = (lat1+lat2)/2.0; -+ rwy->lon = (lon1+lon2)/2.0; -+ latdif=(lat2-lat1)*SGD_DEGREES_TO_RADIANS*SG_EQUATORIAL_RADIUS_M; -+ londif=(lon2-lon1)*SGD_DEGREES_TO_RADIANS*cos(SGD_DEGREES_TO_RADIANS*rwy->lat)*SG_EQUATORIAL_RADIUS_M; -+ rwy->hdg = float(atan2(londif,latdif)*SGD_RADIANS_TO_DEGREES); -+ //fprintf(stderr,"DEBUG: airport: %lf %lf %lf %lf latdif %lf, londif %lf head %f\n",lat1,lon1,lat2,lon2,latdif,londif,rwy->hdg); -+ rwy->length = sqrt(latdif*latdif+londif*londif); -+ // rwy->length = length * SG_FEET_TO_METER; -+ // rwy->width = width * SG_FEET_TO_METER; -+ rwy->width = width; -+ rwy->id = rwyid1; -+ ap->rwys.push_back(rwy); -+ -+ __runwayExtents(rwy, ap->elev); -+ ap->_bounds.extend(&(rwy->_bounds)); -+ -+ // According to the FAA's "VFR Aeronautical Chart -+ // Symbols", lighting codes on VFR maps refer to -+ // runway lights (not approach lights). -+ // -+ // In apt.dat, visual approach, runway, and approach -+ // lighting is given by a six-digit "number" (which we -+ // treat as a string). We're concerned with digits 2 -+ // and 5, which concern the runway itself. If the -+ // value is '1', there is no runway lighting. -+ // -+ // Note that the apt.dat database does not tell us -+ // about lighting limitations, nor whether the -+ // lighting is pilot-controlled. -+ // if ((lighting[1] != '1') || (lighting[4] != '1')) { -+ // ap->lighting = true; -+ // } -+ } -+ -+ break; -+ case 18: -+ if (ap != NULL) { -+ // Beacon -+ double lat, lon; -+ int beaconType; -+ -+ sscanf(line, "%lf %lf %d", &lat, &lon, &beaconType); -+ if (beaconType != 0) { -+ ap->beacon = true; -+ ap->beaconLat = lat; -+ ap->beaconLon = lon; -+ } -+ } -+ break; -+ case WEATHER: // AWOS, ASOS, ATIS -+ case UNICOM: // Unicom/CTAF (US), radio (UK) -+ case DEL: // Clearance delivery -+ case GND: // Ground -+ case TWR: // Tower -+ case APP: // Approach -+ case DEP: // Departure -+ { -+ // ATC frequencies. -+ // -+ // Here's a sample, from LFPG (Paris Charles De -+ // Gaulle), which is a rather extreme case: -+ // -+ // 50 12712 DE GAULLE ATIS -+ // 53 11810 DE GAULLE TRAFFIC -+ // 53 11955 DE GAULLE TRAFFIC -+ // 53 12160 DE GAULLE GND -+ // 53 12167 DE GAULLE TRAFFIC -+ // 53 12177 DE GAULLE GND -+ // 53 12177 DE GAULLE GND -+ // 53 12180 DE GAULLE GND -+ // 53 12192 DE GAULLE TRAFFIC -+ // 53 12192 DE GAULLE TRAFFIC -+ // 53 12197 DE GAULLE GND -+ // 53 12197 DE GAULLE GND -+ // 54 11865 DE GAULLE TWR -+ // 54 11925 DE GAULLE TWR -+ // 54 12090 DE GAULLE TWR -+ // 54 12360 DE GAULLE TWR -+ // 54 12532 DE GAULLE TWR -+ // -+ // [...] -+ // -+ // There are several important things to note: -+ // -+ // (1) There many be several entries for a given -+ // type. For example, there is only one WEATHER -+ // entry (type code 50), but 10 GND entries -+ // (type code 53). -+ // -+ // (2) There may be several frequencies with the -+ // same name in a given type. For example, -+ // there are 4 GND entries labelled "DE GAULLE -+ // TRAFFIC", and 6 labelled "DE GAULLE GND". -+ // They are not guaranteed to be grouped -+ // together. -+ // -+ // When rendering these, we only print the label -+ // once, and all frequencies with that label are -+ // printed after the label. This makes for a -+ // less cluttered display: -+ // -+ // DE GAULLE TRAFFIC 118.1 119.55 121.675 121.925 -+ // -+ // (3) There may be duplicates. For example, '53 -+ // 12192 DE GAULLE TRAFFIC' is given twice. The -+ // duplicates should presumably be ignored. -+ // -+ // (4) Frequencies are given as integers, and should -+ // be divided by 100.0 to give the true -+ // frequency in MHz. That is, 11810 is 118.1 -+ // MHz. In addition, they are missing a -+ // significant digit: 12192 really means 121.925 -+ // MHz, not 121.92 MHz (communications -+ // frequencies have a 25 kHz spacing). So, we -+ // need to correct frequencies with end in the -+ // digits '2' and '7'. -+ // -+ // Internally, we also store the frequencies as -+ // integers, but multiplied by 1000.0, not -+ // 100.0. And we add a final '5' when -+ // necessary. So, we store 12192 as 121925, and -+ // 11810 as 118100. -+ -+ // EYE - what should I do about multiple frequencies -+ // of one type? A: Check San Jose (KSJC) - it has 2 -+ // CT frequencies, and just lists them. However, -+ // the VFR_Chart_Symbols.pdf file says that it lists -+ // the "primary frequency." -+ -+ // Note: Unicom frequencies are written in bold -+ // italics, others in bold. CT seems to be written -+ // slightly larger than the others. -+ -+ // Note: Some airports, like Reid-Hillview, have -+ // CTAF and UNICOM. CTAF is written with a circled -+ // C in front, the frequency bold and slightly -+ // enlarged (like CT), UNICOM in bold italics. -+ -+ if (ap != NULL) { -+ int freq; -+ -+ sscanf(line, "%d %n", &freq, &offset); -+ line += offset; -+ -+ FrequencyMap& f = ap->freqs[(ATCCodeType)lineCode]; -+ set<int>& freqs = f[line]; -+ if ((freq % 10 == 2) || (freq % 10 == 7)) { -+ freqs.insert(freq * 10 + 5); -+ } else { -+ freqs.insert(freq * 10); -+ } -+ } -+ } -+ break; -+ } -+ } -+ -+ if (ap != NULL) { -+ // Calculate the airport's center in lat, lon. -+ __airportLatLon(ap); -+ // Add it to our airports vector. -+ _airports.push_back(ap); -+ // Add our airport text to the searcher object. -+ _searcher->add(ap); -+ // Add to our culler. -+ _frustumCullers[AIRPORTS]->culler().addObject(ap); -+ } -+} -+
