debian/changelog

+osgearth (2.9~rc2+dfsg-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Update Files-Excluded for osgEarth 2.9rc2.
+  * Don't explicitly disable FastDXT driver, disabled upstream.
+  * Drop spelling-errors.patch, applied upstream.
+  * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 25 Jan 2018 07:36:40 +0100
+
 osgearth (2.9~rc1+dfsg-1~exp2) experimental; urgency=medium
 
   * Update copyright-format URL to use HTTPS.

debian/copyright

@@ -60,6 +60,7 @@ Files-Excluded: data/2s19_ru_desert.tga
  data/flatten_mt_rainier.*
  data/fractal.png
  data/france.*
+ data/honolulu.mbtiles
  data/hospital.png
  data/icon.png
  data/istates_dissolve.*

debian/libosgearth5.symbols

-# SymbolsHelper-Confirmed: 2.9~rc1 amd64
+# SymbolsHelper-Confirmed: 2.9~rc2 amd64
 libosgEarth.so.5 #PACKAGE# #MINVER#
  _Z10TiXmlFOpenPKcS0_@Base 2.4.0
  _ZGVZN13DeclutterSort18sortImplementationEPN7osgUtil9RenderBinEE8s_zero_w@Base 2.5.0
@@ -2730,7 +2730,7 @@ libosgEarth.so.5 #PACKAGE# #MINVER#
  _ZN8osgEarth5Units7MINUTESE@Base 2.4.0
  _ZN8osgEarth5Units7RADIANSE@Base 2.4.0
  _ZN8osgEarth5Units7SECONDSE@Base 2.4.0
- _ZN8osgEarth5Units7convertERKS0_S2_d@Base 2.9~rc1
+ _ZN8osgEarth5Units7convertERKS0_S2_dRd@Base 2.9~rc2
  _ZN8osgEarth5Units8KILOFEETE@Base 2.4.0
  _ZN8osgEarth5Units8unitTestEv@Base 2.8~rc1
  _ZN8osgEarth5Units9KILOYARDSE@Base 2.4.0
@@ -2755,6 +2755,7 @@ libosgEarth.so.5 #PACKAGE# #MINVER#
  _ZN8osgEarth6BoundsD0Ev@Base 2.4.0
  _ZN8osgEarth6BoundsD1Ev@Base 2.4.0
  _ZN8osgEarth6BoundsD2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth6Config11addObjIfSetINS_14ProfileOptionsEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.9~rc2
  (optional=templinst|arch=ia64)_ZN8osgEarth6Config11addObjIfSetINS_14ProfileOptionsEEEvRKSsRKNS_8optionalIT_EE@Base 2.4.0
  _ZN8osgEarth6Config11setReferrerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  (optional=templinst)_ZN8osgEarth6Config11updateIfSetIbEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
@@ -4214,6 +4215,7 @@ libosgEarth.so.5 #PACKAGE# #MINVER#
  _ZNK8osgEarth16SpatialReference26createCoordinateSystemNodeEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference28createTransMercFromLongitudeERKNS_5AngleE@Base 2.7.0
  _ZNK8osgEarth16SpatialReference28populateCoordinateSystemNodeEPN3osg20CoordinateSystemNodeE@Base 2.4.0
+ _ZNK8osgEarth16SpatialReference3KeyltERKS1_@Base 2.9~rc2
  _ZNK8osgEarth16SpatialReference5isLTPEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference6getKeyEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference6getWKTB5cxx11Ev@Base 2.7.0
@@ -4691,11 +4693,11 @@ libosgEarth.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.6.0
  (optional=templinst)_ZNSt11_Deque_baseIN8osgEarth14TileRasterizer3JobESaIS2_EE17_M_initialize_mapEm@Base 2.9~rc1
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt11_Deque_baseIPN8osgEarth4Json5ValueESaIS3_EE17_M_initialize_mapEj@Base 2.4.0
- (optional=templinst)_ZNSt11__copy_moveILb0ELb0ESt26random_access_iterator_tagE8__copy_mIPKN3osg5PlaneEPS4_EET0_T_S9_S8_@Base 2.9~rc1
  (optional=templinst|arch=alpha arm64 armhf m68k mips mipsel powerpc powerpcspe ppc64 ppc64el s390x)_ZNSt11__copy_moveILb0ELb0ESt26random_access_iterator_tagE8__copy_mIPN8osgEarth10DataExtentES5_EET0_T_S7_S6_@Base 2.8~rc1
  (optional=templinst)_ZNSt13_Bvector_baseISaIbEE13_M_deallocateEv@Base 2.7.0
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIN9__gnu_cxx17__normal_iteratorIPKN8osgEarth10vector_mapIjNS4_14VirtualProgram11ShaderEntryEE5ENTRYESt6vectorIS9_SaIS9_EEEEPS9_EET0_T_SI_SH_@Base 2.8~rc1
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrINS4_6ShaderEEESt6vectorIS7_SaIS7_EEEES8_EET0_T_SE_SD_@Base 2.8~rc1
+ (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN3osg5PlaneEPS3_EET0_T_S8_S7_@Base 2.9~rc2
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN3osg7ref_ptrIN8osgEarth10ImageLayerEEEPS6_EET0_T_SB_SA_@Base 2.8~rc1
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN3osg7ref_ptrIN8osgEarth10ModelLayerEEEPS6_EET0_T_SB_SA_@Base 2.8~rc1
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN3osg7ref_ptrIN8osgEarth10PolyShaderEEEPS6_EET0_T_SB_SA_@Base 2.8~rc1
@@ -4704,8 +4706,6 @@ libosgEarth.so.5 #PACKAGE# #MINVER#
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN3osg7ref_ptrINS2_6ShaderEEEPS5_EET0_T_SA_S9_@Base 2.8~rc1
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN8osgEarth10vector_mapIjNS2_14VirtualProgram11ShaderEntryEE5ENTRYEPS7_EET0_T_SC_SB_@Base 2.8~rc1
  (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN8osgEarth14GeoHeightFieldEPS3_EET0_T_S8_S7_@Base 2.9~rc1
- (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN3osg5PlaneES4_EET0_T_S6_S5_@Base 2.9~rc1
- (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN8osgEarth10DataExtentES4_EET0_T_S6_S5_@Base 2.9~rc1
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN3osg7ref_ptrINS3_6ShaderEEEES7_EET0_T_SA_S9_@Base 2.8~rc1
  (optional=templinst|arch=armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt27__uninitialized_default_n_1ILb0EE18__uninit_default_nIPN8osgEarth10vector_mapIjNS2_14VirtualProgram11ShaderEntryEE5ENTRYEjEET_S9_T0_@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt27__uninitialized_default_n_1ILb0EE18__uninit_default_nIPN8osgEarth10vector_mapIjNS2_14VirtualProgram11ShaderEntryEE5ENTRYEmEET_S9_T0_@Base 2.8~rc1
@@ -4758,7 +4758,7 @@ libosgEarth.so.5 #PACKAGE# #MINVER#
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5PlaneESaIS1_EE17_M_default_appendEm@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN3osg5PlaneESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9~rc1
  (optional=templinst)_ZNSt6vectorIN3osg5PlaneESaIS1_EE9push_backERKS1_@Base 2.6.0
- (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5PlaneESaIS1_EEaSERKS3_@Base 2.4.0
+ (optional=templinst|arch=!alpha !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5PlaneESaIS1_EEaSERKS3_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9~rc1
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE12emplace_backIJS1_EEEvDpOT_@Base 2.8~rc1
  (optional=templinst|arch=armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.8~rc1
@@ -4770,6 +4770,7 @@ libosgEarth.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9~rc1
  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE7reserveEj@Base 2.7.0
  (optional=templinst)_ZNSt6vectorIN3osg7MatrixdESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9~rc1
+ (optional=templinst)_ZNSt6vectorIN3osg7MatrixdESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9~rc2
  (optional=templinst)_ZNSt6vectorIN3osg7MatrixfESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9~rc1
  (optional=templinst|subst)_ZNSt6vectorIN3osg7MatrixfESaIS1_EE7reserveE{size_t}@Base 2.4.0
  (optional=templinst|arch=!hurd-i386 !i386 !kfreebsd-i386)_ZNSt6vectorIN3osg7ref_ptrIN7osgUtil10RenderLeafEEESaIS4_EE12emplace_backIJS4_EEEvDpOT_@Base 2.8~rc1
@@ -4894,6 +4895,7 @@ libosgEarth.so.5 #PACKAGE# #MINVER#
  (optional=templinst|arch=alpha arm64 armhf hppa m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4 sparc64)_ZNSt6vectorIN8osgEarth4Json12PathArgumentESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN8osgEarth6ConfigESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9~rc1
  (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9~rc1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9~rc2
  (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EED2Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EEaSERKS3_@Base 2.6.0
@@ -4912,6 +4914,7 @@ libosgEarth.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEaSERKS7_@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIPKN8osgEarth5UnitsESaIS3_EE17_M_realloc_insertIJRKS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9~rc1
  (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9~rc1
+ (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9~rc2
  (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EEaSERKS4_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIPN7osgUtil10RenderLeafESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9~rc1
  (optional=templinst)_ZNSt6vectorIPN7osgUtil10RenderLeafESaIS2_EE9push_backERKS2_@Base 2.9~rc1
@@ -4966,7 +4969,6 @@ libosgEarth.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE18_M_assign_dispatchISt20_List_const_iteratorIS2_EEEvT_S8_St12__false_type@Base 2.8~rc1
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9~rc1
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.7.0
  (optional=templinst|arch=alpha amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sh4 sparc64)_ZNSt7__cxx114listIN9osgShadow16ConvexPolyhedron4FaceESaIS3_EE18_M_assign_dispatchISt20_List_const_iteratorIS3_EEEvT_S9_St12__false_type@Base 2.8~rc1

debian/libosgearthannotation5.symbols

-# SymbolsHelper-Confirmed: 2.9~rc1 amd64
+# SymbolsHelper-Confirmed: 2.9~rc2 amd64
 libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
  _ZN15DraggerCallback17onPositionChangedEPKN8osgEarth10Annotation7DraggerERKNS0_8GeoPointE@Base 2.7.0
  _ZN15DraggerCallbackD0Ev@Base 2.4.0
@@ -625,8 +625,7 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
  _ZN8osgEarth5Layer14removedFromMapEPKNS_3MapE@Base 2.9~rc1
  _ZN8osgEarth5Layer18getSequenceControlEv@Base 2.9~rc1
  _ZN8osgEarth5Layer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.9~rc1
- _ZN8osgEarth5Units7convertERKS0_S2_d@Base 2.9~rc1
- (arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZN8osgEarth5Units7convertERKS0_S2_dRd@Base 2.7.0
+ (arch=!alpha !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZN8osgEarth5Units7convertERKS0_S2_dRd@Base 2.9~rc2
  _ZN8osgEarth5UnitsC1ERKS0_@Base 2.8~rc1
  _ZN8osgEarth5UnitsC2ERKS0_@Base 2.8~rc1
  _ZN8osgEarth5UnitsD1Ev@Base 2.4.0
@@ -1008,11 +1007,10 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNK8osgEarth6Config5valueIdEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES2_@Base 2.7.0
  (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetIN3osg7Texture10FilterModeES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.8~rc1
  (optional=templinst|arch=armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe)_ZNK8osgEarth6Config8getIfSetINS_3URIEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.8~rc1
- (optional=templinst)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEB5cxx11Ev@Base 2.9~rc1
- (optional=templinst)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEv@Base 2.9~rc1
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.6.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9~rc1
+ (optional=templinst)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE9push_backERKS1_@Base 2.9~rc2
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9~rc1
  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sh4 !sparc !sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveEj@Base 2.4.0
@@ -1031,7 +1029,6 @@ libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9~rc1
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeIN7osgUtil22LineSegmentIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.7.0

debian/libosgearthfeatures5.symbols

-# SymbolsHelper-Confirmed: 2.9~rc1 amd64
+# SymbolsHelper-Confirmed: 2.9~rc2 amd64
 libosgEarthFeatures.so.5 #PACKAGE# #MINVER#
  _Z12tileGeometryPN8osgEarth9Symbology8GeometryEPKNS_16SpatialReferenceEjjRSt6vectorIN3osg7ref_ptrIS1_EESaIS9_EE@Base 2.8~rc1
  _Z14zig_zag_decodei@Base 2.8~rc1
@@ -253,7 +253,6 @@ libosgEarthFeatures.so.5 #PACKAGE# #MINVER#
  _ZN8osgEarth5Layer15getOrCreateNodeEv@Base 2.9~rc1
  _ZN8osgEarth5Layer18getSequenceControlEv@Base 2.9~rc1
  _ZN8osgEarth5Layer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.9~rc1
- _ZN8osgEarth5Units7convertERKS0_S2_d@Base 2.9~rc1
  _ZN8osgEarth5UnitsD1Ev@Base 2.4.0
  _ZN8osgEarth5UnitsD2Ev@Base 2.4.0
  _ZN8osgEarth6BoundsD0Ev@Base 2.4.0
@@ -262,7 +261,6 @@ libosgEarthFeatures.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZN8osgEarth6Config11updateIfSetIbEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
  (optional=templinst)_ZN8osgEarth6Config3addINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.7.0
  _ZN8osgEarth6Config6removeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9~rc1
- _ZN8osgEarth6Config6updateIA5_cEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.9~rc1
  (optional=templinst)_ZN8osgEarth6Config8addIfSetIbEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
  (optional=templinst)_ZN8osgEarth6Config8addIfSetIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.9~rc1
  _ZN8osgEarth6ConfigC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.9~rc1
@@ -1427,6 +1425,7 @@ libosgEarthFeatures.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt6vectorISt4pairIPN3osg6CameraENS1_7ref_ptrINS1_8StateSetEEEESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base 2.9~rc1
  (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertIJRKfEEEvN9__gnu_cxx17__normal_iteratorIPfS1_EEDpOT_@Base 2.9~rc1
  (optional=templinst)_ZNSt6vectorIfSaIfEE7reserveEm@Base 2.9~rc1
+ (optional=templinst)_ZNSt6vectorIjSaIjEE12emplace_backIJjEEEvDpOT_@Base 2.9~rc2
  (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 2.9~rc1
  (optional=templinst|arch=armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIjSaIjEE7reserveEj@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIjSaIjEE7reserveEm@Base 2.8~rc1
@@ -1437,7 +1436,6 @@ libosgEarthFeatures.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE18_M_assign_dispatchISt20_List_const_iteratorIS2_EEEvT_S8_St12__false_type@Base 2.8~rc1
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9~rc1
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.9~rc1
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.9~rc1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIRKS1_EESt4pairISt17_Rb_tree_iteratorIS1_EbEOT_@Base 2.8~rc1

debian/libosgearthsplat5.symbols

-# SymbolsHelper-Confirmed: 2.9~rc1 amd64
+# SymbolsHelper-Confirmed: 2.9~rc2 amd64
 libosgEarthSplat.so.5 #PACKAGE# #MINVER#
  _Z15addFeatureToMapPN8osgEarth8Features7FeatureERKNS_9Symbology5StyleERSt6vectorISt4pairIS4_NSt7__cxx114listIN3osg7ref_ptrIS1_EESaISD_EEEESaISG_EE@Base 2.9~rc1
  _Z27sortFeaturesIntoStyleGroupsPN8osgEarth9Symbology10StyleSheetERNSt7__cxx114listIN3osg7ref_ptrINS_8Features7FeatureEEESaIS9_EEERNS7_13FilterContextERSt6vectorISt4pairINS0_5StyleESB_ESaISI_EE@Base 2.9~rc1
@@ -216,9 +216,11 @@ libosgEarthSplat.so.5 #PACKAGE# #MINVER#
  _ZN8osgEarth5Splat14LandUseOptionsD0Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat14LandUseOptionsD1Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat14LandUseOptionsD2Ev@Base 2.8~rc1
+ _ZN8osgEarth5Splat14SplatRangeDataC1EOS1_@Base 2.9~rc2
  _ZN8osgEarth5Splat14SplatRangeDataC1ERKNS_6ConfigE@Base 2.8~rc1
  _ZN8osgEarth5Splat14SplatRangeDataC1ERKS1_@Base 2.8~rc1
  _ZN8osgEarth5Splat14SplatRangeDataC1Ev@Base 2.8~rc1
+ _ZN8osgEarth5Splat14SplatRangeDataC2EOS1_@Base 2.9~rc2
  _ZN8osgEarth5Splat14SplatRangeDataC2ERKNS_6ConfigE@Base 2.8~rc1
  _ZN8osgEarth5Splat14SplatRangeDataC2ERKS1_@Base 2.8~rc1
  _ZN8osgEarth5Splat14SplatRangeDataC2Ev@Base 2.8~rc1
@@ -628,8 +630,8 @@ libosgEarthSplat.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNK8osgEarth6Config8getIfSetIiEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.8~rc1
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.8~rc1
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN3osg7ref_ptrIN8osgEarth5Splat4ZoneEEEPS7_EET0_T_SC_SB_@Base 2.8~rc2
+ (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN8osgEarth5Splat14SplatRangeDataEPS4_EET0_T_S9_S8_@Base 2.9~rc2
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN3osg7ref_ptrIN8osgEarth9Symbology6SymbolEEES8_EET0_T_SA_S9_@Base 2.8~rc2
- (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN8osgEarth5Splat14SplatRangeDataES5_EET0_T_S7_S6_@Base 2.9~rc1
  (optional=templinst)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8osgEarth5Splat10SplatClassEED1Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8osgEarth5Splat10SplatClassEED2Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIN8osgEarth5Splat14SplatRangeDataESaIS9_EEED1Ev@Base 2.8~rc1

debian/libosgearthsymbology5.symbols

-# SymbolsHelper-Confirmed: 2.9~rc1 amd64
+# SymbolsHelper-Confirmed: 2.9~rc2 amd64
 libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
  _ZN3agg10rasterizer15s_default_gammaE@Base 2.4.0
  _ZN3agg10rasterizer5gammaEPKh@Base 2.4.0
@@ -568,7 +568,6 @@ libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
  _ZN8osgEarth3URID0Ev@Base 2.4.0
  _ZN8osgEarth3URID1Ev@Base 2.4.0
  _ZN8osgEarth3URID2Ev@Base 2.4.0
- _ZN8osgEarth5Units7convertERKS0_S2_d@Base 2.9~rc1
  _ZN8osgEarth5UnitsC1ERKS0_@Base 2.9~rc1
  _ZN8osgEarth5UnitsC2ERKS0_@Base 2.9~rc1
  _ZN8osgEarth5UnitsD1Ev@Base 2.4.0
@@ -1900,11 +1899,11 @@ libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt5dequeIN3osg7ref_ptrINS0_4NodeEEESaIS3_EE16_M_push_back_auxIJS3_EEEvDpOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt5dequeIN3osg7ref_ptrINS0_4NodeEEESaIS3_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt5dequeIN3osg7ref_ptrINS0_4NodeEEESaIS3_EED2Ev@Base 2.4.0
- (optional=templinst)_ZNSt5dequeIPKN8osgEarth9Symbology8GeometryESaIS4_EE16_M_push_back_auxIJRKS4_EEEvDpOT_@Base 2.9~rc1
- (optional=templinst)_ZNSt5dequeIPN8osgEarth9Symbology8GeometryESaIS3_EE16_M_push_back_auxIJRKS3_EEEvDpOT_@Base 2.9~rc1
+ (optional=templinst)_ZNSt5dequeIPKN8osgEarth9Symbology8GeometryESaIS4_EE17_M_reallocate_mapEmb@Base 2.9~rc2
+ (optional=templinst)_ZNSt5dequeIPN8osgEarth9Symbology8GeometryESaIS3_EE17_M_reallocate_mapEmb@Base 2.9~rc2
  (optional=templinst)_ZNSt5dequeISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EE16_M_push_back_auxIJRKS5_EEEvDpOT_@Base 2.8~rc1
- (optional=templinst)_ZNSt5dequeIdSaIdEE12emplace_backIJdEEEvDpOT_@Base 2.9~rc1
  (optional=templinst)_ZNSt5dequeIdSaIdEE16_M_push_back_auxIJRKdEEEvDpOT_@Base 2.9~rc1
+ (optional=templinst)_ZNSt5dequeIdSaIdEE17_M_reallocate_mapEmb@Base 2.9~rc2
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIN3osg5Vec2bESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.7.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec2bESaIS1_EE7reserveEm@Base 2.9~rc1
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIN3osg5Vec2dESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.7.0
@@ -2034,7 +2033,6 @@ libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE18_M_assign_dispatchISt20_List_const_iteratorIS2_EEEvT_S8_St12__false_type@Base 2.8~rc1
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9~rc1
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeIN3osg5Vec3fESt4pairIKS1_jESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE24_M_get_insert_unique_posERS3_@Base 2.4.0

debian/libosgearthutil5.symbols

-# SymbolsHelper-Confirmed: 2.9~rc1 amd64
+# SymbolsHelper-Confirmed: 2.9~rc2 amd64
 libosgEarthUtil.so.5 #PACKAGE# #MINVER#
  _Z10intersectsRKdS0_S0_S0_S0_S0_S0_S0_@Base 2.4.0
  _Z17getHorizSRSStringB5cxx11PKN8osgEarth16SpatialReferenceE@Base 2.7.0
@@ -1572,7 +1572,7 @@ libosgEarthUtil.so.5 #PACKAGE# #MINVER#
  _ZN8osgEarth5Layer15getOrCreateNodeEv@Base 2.9~rc1
  _ZN8osgEarth5Layer18getSequenceControlEv@Base 2.9~rc1
  _ZN8osgEarth5Layer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.9~rc1
- _ZN8osgEarth5Units7convertERKS0_S2_d@Base 2.9~rc1
+ _ZN8osgEarth5Units7convertERKS0_S2_dRd@Base 2.9~rc2
  _ZN8osgEarth5UnitsC1ERKS0_@Base 2.7.0
  _ZN8osgEarth5UnitsC2ERKS0_@Base 2.7.0
  _ZN8osgEarth5UnitsD1Ev@Base 2.4.0
@@ -1740,6 +1740,7 @@ libosgEarthUtil.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZN8osgEarth8optionalIjED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIjED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIjED2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8toStringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEES6_RKT_@Base 2.9~rc2
  (optional=templinst)_ZN8osgEarth8toStringIfEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8toStringIjEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
  _ZN8osgEarth9Extension12setDBOptionsEPKN5osgDB7OptionsE@Base 2.7.0
@@ -2404,7 +2405,6 @@ libosgEarthUtil.so.5 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE18_M_assign_dispatchISt20_List_const_iteratorIS2_EEEvT_S8_St12__false_type@Base 2.8~rc1
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9~rc1
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeIN3osg12observer_ptrIN5osgGA15GUIEventHandlerEEESt4pairIKS4_NS1_IN9osgViewer4ViewEEEESt10_Select1stISA_ESt4lessIS4_ESaISA_EE8_M_eraseEPSt13_Rb_tree_nodeISA_E@Base 2.4.0

debian/patches/series

 soversion.patch
-spelling-errors.patch

debian/patches/spelling-errors.patch

-Description: Fix spelling errors.
- * Timout  -> Timeout
- * Argment -> Argument
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/gwaldron/osgearth/pull/1026
-Applied-Upstream: https://github.com/gwaldron/osgearth/commit/e11ae4a7b9a909ca88b3ce48c9be1e2223972a1d
-
---- a/src/osgEarth/ElevationPool.cpp
-+++ b/src/osgEarth/ElevationPool.cpp
-@@ -307,7 +307,7 @@ ElevationPool::getTile(const TileKey& ke
-     if ( !tile.valid() && OE_GET_TIMER(get) >= timeout )
-     {
-         // this means we timed out trying to fetch the map tile.
--        OE_TEST << LC << "Timout fetching tile " << key.str() << std::endl;
-+        OE_TEST << LC << "Timeout fetching tile " << key.str() << std::endl;
-     }
- 
-     if ( tile.valid() )
---- a/src/osgEarth/catch.hpp
-+++ b/src/osgEarth/catch.hpp
-@@ -4751,7 +4751,7 @@ namespace Catch {
-             ss << seed;
-             ss >> config.rngSeed;
-             if( ss.fail() )
--                throw std::runtime_error( "Argment to --rng-seed should be the word 'time' or a number" );
-+                throw std::runtime_error( "Argument to --rng-seed should be the word 'time' or a number" );
-         }
-     }
-     inline void setVerbosity( ConfigData& config, int level ) {

debian/rules

@@ -40,7 +40,6 @@ override_dh_auto_configure:
 		-DDEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH) \
 		-DLIB_POSTFIX="" \
 		-DOSG_DIR=/usr \
-		-DOSGEARTH_ENABLE_FASTDXT=0 \
 		-DOSGEARTH_QT_BUILD=1
 
 override_dh_auto_build:

docs/source/references/drivers/feature/mapnikvectortiles.rst

+Mapnik Vector Tiles
+===========================
+This plugin reads vector data from an `MBTiles`_ file which contains `vector tiles<https://github.com/mapbox/vector-tile-spec>`_.
+
+Note:  This driver does not currently support multi-level mbtiles files.  It will only load the maximum level in the database.  This will change in the future when
+osgEarth has better support for non-additive feature datasources.
+
+This driver requires that you build osgEarth with SQLite3 support and Protobuf support.
+
+Example usage::
+
+    <model driver="feature_geom">
+        <features name="osm" driver="mapnikvectortiles">
+            <url>../data/osm.mbtiles</url>
+        </features>
+        ...
+
+Properties:
+
+    :url:      Location of the mbtiles file.
+
+.. _MBTiles:  https://www.mapbox.com/developers/mbtiles/

docs/source/references/drivers/terrain/mp.rst

@@ -13,7 +13,7 @@ Example usage::
                      normalize_edges          = "false"
                      incremental_update       = "false"
                      quick_release_gl_objects = "true"
-                     min_tile_range_factor    = "6.0"
+                     min_tile_range_factor    = "7.0"
                      cluster_culling          = "true" />
 
 Properties:

docs/source/references/drivers/terrain/terrain_options_shared.rst

@@ -2,7 +2,7 @@ Common Properties:
 
     :min_tile_range_factor:     The "maximum visible distance" ratio for all tiles. The 
                                 maximum visible distance is computed as tile radius * 
-                                this value. (default = 6.0)
+                                this value. (default = 7.0)
     :cluster_culling:           Cluster culling discards back-facing tiles by default. You
                                 can disable it be setting this to ``false``, for example if
                                 you want to go underground and look up at the surface.

docs/source/references/earthfile.rst

@@ -117,8 +117,8 @@ These options control the rendering of the terrain surface.
 +-----------------------+--------------------------------------------------------------------+
 | min_tile_range_factor | Determines how close you need to be to a terrain tile for it to    |
 |                       | display. The value is the ratio of a tile's extent to its          |
-|                       | For example, if a tile has a 10km radius, and the MTRF=6, then the |
-|                       | tile will become visible at a range of about 60km.                 |
+|                       | For example, if a tile has a 10km radius, and the MTRF=7, then the |
+|                       | tile will become visible at a range of about 70km.                 |
 +-----------------------+--------------------------------------------------------------------+
 | min_lod               | The lowest level of detail that the terrain is guaranteed to       |
 |                       | display, even if no source data is available at that LOD. The      |

src/applications/osgearth_tilesource/osgearth_tilesource.cpp

@@ -56,6 +56,7 @@ public:
     // Constructor that takes the user-provided options.
     CustomTileSource() : TileSource(TileSourceOptions())
     {
+        // Create a shape that we will use to render tile images.
         _geom = new Ring();
         _geom->push_back( osg::Vec3(5, 5, 0) );
         _geom->push_back( osg::Vec3(250, 5, 0) );
@@ -68,12 +69,25 @@ public:
     {
         if ( !getProfile() )
         {
+            // Set the profile for this tile source. The profile defines the 
+            // tiling scheme native to this tile source. The terrain engine will
+            // call createImage or createHeightField with TileKeys according to
+            // the profile you set here.
             setProfile( Registry::instance()->getGlobalGeodeticProfile() );
+
+            // Create custom data extents. This is optional, but giving the terrain
+            // engine information about the extents of your dataset will improve
+            // performance in most cases. In this case, the data covers the
+            // entire profile, but we want to tell the terrain engine that this
+            // tile source only has data up to LOD 15:
+            getDataExtents().push_back(DataExtent(getProfile()->getExtent(), 0u, 15u));
         }
         return STATUS_OK;
     }
 
     // Tells the layer not to cache data from this tile source.
+    // Overriding this function is optional - by default it will inherit the 
+    // caching policy from the Layer.
     CachePolicy getCachePolicyHint(const Profile* profile) const 
     {
         return CachePolicy::NO_CACHE;
@@ -94,18 +108,26 @@ public:
 int main(int argc, char** argv)
 {
     osg::ArgumentParser arguments(&argc,argv);
-
     osgViewer::Viewer viewer(arguments);
 
-    // Start by creating the map:
-    MapOptions mapOptions;
-    mapOptions.cachePolicy() = CachePolicy::NO_CACHE;
-    Map* map = new Map( mapOptions );
+    // Start by creating an empty map:
+    Map* map = new Map();
 
     // Create out image layer with a custom tile source.
-    ImageLayerOptions options( "custom" );
     CustomTileSource* tileSource = new CustomTileSource();
-    tileSource->open();
+
+    // Open the tile source. If you don't do this, the Map will automatically try to 
+    // open it when you add the Layer later on. But doing so here allows us to check
+    // for any errors beforehand.
+    Status status = tileSource->open();
+    if (status.isError())
+    {
+        OE_WARN << "Error opening the tile source; message = " << status.message() << std::endl;
+        return -1;
+    }
+
+    // Add a new ImageLayer to the map with our custom tile source.
+    ImageLayerOptions options( "My custom ImageLayer" );
     map->addLayer( new ImageLayer(options, tileSource) );
 
     // That's it, the map is ready; now create a MapNode to render the Map:

src/osgEarth/ElevationPool.cpp

@@ -307,7 +307,7 @@ ElevationPool::getTile(const TileKey& key, MapFrame& frame, osg::ref_ptr<Elevati
     if ( !tile.valid() && OE_GET_TIMER(get) >= timeout )
     {
         // this means we timed out trying to fetch the map tile.
-        OE_TEST << LC << "Timout fetching tile " << key.str() << std::endl;
+        OE_TEST << LC << "Timeout fetching tile " << key.str() << std::endl;
     }
 
     if ( tile.valid() )

src/osgEarth/TerrainLayer.cpp

@@ -380,12 +380,8 @@ TerrainLayer::open()
         }
         else
         {
-            // User supplied the tile source, so attempt to get its profile:
-            setProfile(_tileSource->getProfile() );
-            if (!_profile.valid())
-            {
-                setStatus( Status::Error(getName(), "Cannot establish profile") );
-            }
+            // User supplied the tile source, so attempt to initialize it:
+            _tileSource = createAndOpenTileSource();
         }
 
         // Finally, open and activate a caching bin for this layer if it

src/osgEarth/Units

@@ -23,14 +23,6 @@
 #include <osgEarth/Config>
 #include <ostream>
 
-#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-
-#if GCC_VERSION >= 50300
-#define OPTIMIZE __attribute__((optimize("no-ipa-sra")))
-#else
-#define OPTIMIZE
-#endif
-
 namespace osgEarth
 {
     class Registry;
@@ -113,7 +105,7 @@ namespace osgEarth
             return false;
         }
 
-        static OPTIMIZE double convert( const Units& from, const Units& to, double input ) {
+        static double convert( const Units& from, const Units& to, double input ) {
             double output = input;
             convert( from, to, input, output );
             return output;

src/osgEarth/Version

@@ -31,7 +31,7 @@ extern "C" {
 #define OSGEARTH_MINOR_VERSION    9
 #define OSGEARTH_PATCH_VERSION    0
 #define OSGEARTH_SOVERSION        0
-#define OSGEARTH_RC_VERSION       1
+#define OSGEARTH_RC_VERSION       2
 #define OSGEARTH_DEVEL_VERSION    0     // 0 = release; >0 = interim devel version
 
 /* Convenience macro that can be used to decide whether a feature is present or not i.e.