Changes 0.10.4:

* Bug fix release.
* Fixed unpredictable openGL related crashes on win32.
* Fixed run on MacOSX Tiger/Leopard/Snow Leopard.
* Disable OpenGL shaders by default for stars and atmosphere. User activate
  it by setting use_glshaders = true in the [main] section of the config.ini
* Fixed the handling of the Qt -graphicssystem parameter. Now it is ignored
  if it is not used properly.
* Improved OpenGLES2 support (not finished yet).
* Added Qt widgets flags on the main windows to avoid filling background
  (this boosted the program a lot on linux).

5 files changed, 57 insertions, 20 deletions

diff --git a/misc/stellarium/Makefile b/misc/stellarium/Makefile
index 8a380db092b..c0e511e7233 100644
--- a/misc/stellarium/Makefile
+++ b/misc/stellarium/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2010/01/18 09:59:15 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/03/11 11:15:17 adam Exp $
 
-DISTNAME=	stellarium-0.10.2
-PKGREVISION=	3
+DISTNAME=	stellarium-0.10.4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=stellarium/}
 
diff --git a/misc/stellarium/PLIST b/misc/stellarium/PLIST
index 190089f1b2a..db603155500 100644
--- a/misc/stellarium/PLIST
+++ b/misc/stellarium/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:07:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/03/11 11:15:17 adam Exp $
 bin/stellarium
 man/man1/stellarium.1
 share/locale/af/LC_MESSAGES/stellarium-skycultures.mo
@@ -149,13 +149,14 @@ share/stellarium/data/base_locations.txt
 share/stellarium/data/constellations_boundaries.dat
 share/stellarium/data/countryCodes.dat
 share/stellarium/data/default_config.ini
-share/stellarium/data/fontmap.dat
 share/stellarium/data/gui/nightHtml.css
 share/stellarium/data/gui/nightStyle.css
 share/stellarium/data/gui/normalHtml.css
 share/stellarium/data/gui/normalStyle.css
 share/stellarium/data/gui/world.png
+share/stellarium/data/iso3166-1-alpha-2.utf8
 share/stellarium/data/iso639-1.utf8
+share/stellarium/data/shaders/xyYToRGB.glsl
 share/stellarium/data/ssystem.ini
 share/stellarium/data/stellarium.ico
 share/stellarium/data/zone.tab
@@ -314,6 +315,7 @@ share/stellarium/nebulae/default/ngc2000.dat
 share/stellarium/nebulae/default/ngc2000names.dat
 share/stellarium/nebulae/default/pleiades.png
 share/stellarium/nebulae/default/textures.json
+share/stellarium/scripts/common_objects.inc
 share/stellarium/scripts/landscapes.ssc
 share/stellarium/scripts/lunar_partial.ssc
 share/stellarium/scripts/lunar_total.ssc
@@ -321,14 +323,41 @@ share/stellarium/scripts/screensaver.ssc
 share/stellarium/scripts/solar_eclipse.ssc
 share/stellarium/scripts/startup.ssc
 share/stellarium/scripts/zodiac.ssc
+share/stellarium/skycultures/aztec/Primeros_Memoriales.png
+share/stellarium/skycultures/aztec/Tianquiztli_T.png
+share/stellarium/skycultures/aztec/aztec0.png
+share/stellarium/skycultures/aztec/citlaltlachtli.png
+share/stellarium/skycultures/aztec/citlaltlachtli_t.png
+share/stellarium/skycultures/aztec/colotlixayac.png
+share/stellarium/skycultures/aztec/colotlixayac_image.png
+share/stellarium/skycultures/aztec/colotlixayac_t.png
+share/stellarium/skycultures/aztec/constellation_names.eng.fab
+share/stellarium/skycultures/aztec/constellation_names.esp.fab
+share/stellarium/skycultures/aztec/constellationsart.fab
+share/stellarium/skycultures/aztec/constellationship.fab
+share/stellarium/skycultures/aztec/description.en.utf8
+share/stellarium/skycultures/aztec/description.es.utf8
+share/stellarium/skycultures/aztec/edificios.png
+share/stellarium/skycultures/aztec/info.ini
+share/stellarium/skycultures/aztec/mamalhuaztli.png
+share/stellarium/skycultures/aztec/mamalhuaztli_image.png
+share/stellarium/skycultures/aztec/mamalhuaztli_t.png
+share/stellarium/skycultures/aztec/nanahuatzin.png
+share/stellarium/skycultures/aztec/tianquiztli.png
+share/stellarium/skycultures/aztec/tiaquitztli_image.png
+share/stellarium/skycultures/aztec/xonecuilli.png
+share/stellarium/skycultures/aztec/xonecuilli_Glifo.png
+share/stellarium/skycultures/aztec/xonecuilli_t.png
 share/stellarium/skycultures/chinese/constellation_names.eng.fab
 share/stellarium/skycultures/chinese/constellationship.fab
 share/stellarium/skycultures/chinese/description.en.utf8
+share/stellarium/skycultures/chinese/description.it.utf8
 share/stellarium/skycultures/chinese/info.ini
 share/stellarium/skycultures/chinese/star_names.fab
 share/stellarium/skycultures/egyptian/constellation_names.eng.fab
 share/stellarium/skycultures/egyptian/constellationship.fab
 share/stellarium/skycultures/egyptian/description.en.utf8
+share/stellarium/skycultures/egyptian/description.it.utf8
 share/stellarium/skycultures/egyptian/info.ini
 share/stellarium/skycultures/egyptian/star_names.fab
 share/stellarium/skycultures/inuit/blubber-container.png
@@ -339,6 +368,7 @@ share/stellarium/skycultures/inuit/constellation_names.eng.fab
 share/stellarium/skycultures/inuit/constellationsart.fab
 share/stellarium/skycultures/inuit/constellationship.fab
 share/stellarium/skycultures/inuit/description.en.utf8
+share/stellarium/skycultures/inuit/description.it.utf8
 share/stellarium/skycultures/inuit/dogs.png
 share/stellarium/skycultures/inuit/info.ini
 share/stellarium/skycultures/inuit/lamp-stand.png
@@ -353,39 +383,46 @@ share/stellarium/skycultures/korean/constellation_names.exp.fab
 share/stellarium/skycultures/korean/constellationsart.fab
 share/stellarium/skycultures/korean/constellationship.fab
 share/stellarium/skycultures/korean/description.en.utf8
+share/stellarium/skycultures/korean/description.it.utf8
 share/stellarium/skycultures/korean/info.ini
 share/stellarium/skycultures/korean/on_korea_constellations.txt
 share/stellarium/skycultures/korean/star_names.fab
 share/stellarium/skycultures/lakota/constellation_names.eng.fab
 share/stellarium/skycultures/lakota/constellationship.fab
 share/stellarium/skycultures/lakota/description.en.utf8
+share/stellarium/skycultures/lakota/description.it.utf8
 share/stellarium/skycultures/lakota/info.ini
 share/stellarium/skycultures/lakota/star_names.fab
 share/stellarium/skycultures/maori/constellation_names.eng.fab
 share/stellarium/skycultures/maori/constellationship.fab
 share/stellarium/skycultures/maori/description.en.utf8
+share/stellarium/skycultures/maori/description.it.utf8
 share/stellarium/skycultures/maori/info.ini
 share/stellarium/skycultures/maori/references.txt
 share/stellarium/skycultures/maori/star_names.fab
 share/stellarium/skycultures/navajo/constellation_names.eng.fab
 share/stellarium/skycultures/navajo/constellationship.fab
 share/stellarium/skycultures/navajo/description.en.utf8
+share/stellarium/skycultures/navajo/description.it.utf8
 share/stellarium/skycultures/navajo/info.ini
 share/stellarium/skycultures/navajo/star_names.fab
 share/stellarium/skycultures/norse/constellation_names.eng.fab
 share/stellarium/skycultures/norse/constellationship.fab
 share/stellarium/skycultures/norse/description.en.utf8
+share/stellarium/skycultures/norse/description.it.utf8
 share/stellarium/skycultures/norse/info.ini
 share/stellarium/skycultures/norse/star_names.fab
 share/stellarium/skycultures/polynesian/constellation_names.eng.fab
 share/stellarium/skycultures/polynesian/constellationsart.fab
 share/stellarium/skycultures/polynesian/constellationship.fab
 share/stellarium/skycultures/polynesian/description.en.utf8
+share/stellarium/skycultures/polynesian/description.it.utf8
 share/stellarium/skycultures/polynesian/info.ini
 share/stellarium/skycultures/polynesian/star_names.fab
 share/stellarium/skycultures/tupi/constellation_names.eng.fab
 share/stellarium/skycultures/tupi/constellationship.fab
 share/stellarium/skycultures/tupi/description.en.utf8
+share/stellarium/skycultures/tupi/description.it.utf8
 share/stellarium/skycultures/tupi/info.ini
 share/stellarium/skycultures/tupi/star_names.fab
 share/stellarium/skycultures/western/andromeda.png
@@ -424,6 +461,7 @@ share/stellarium/skycultures/western/crux.png
 share/stellarium/skycultures/western/cygnus.png
 share/stellarium/skycultures/western/delphinus.png
 share/stellarium/skycultures/western/description.en.utf8
+share/stellarium/skycultures/western/description.it.utf8
 share/stellarium/skycultures/western/dorado.png
 share/stellarium/skycultures/western/draco.png
 share/stellarium/skycultures/western/equuleus.png
@@ -479,8 +517,8 @@ share/stellarium/skycultures/western/ursa-minor.png
 share/stellarium/skycultures/western/virgo.png
 share/stellarium/skycultures/western/volans.png
 share/stellarium/skycultures/western/vulpecula.png
+share/stellarium/stars/default/defaultStarsConfig.json
 share/stellarium/stars/default/name.fab
-share/stellarium/stars/default/stars.ini
 share/stellarium/stars/default/stars_0_0v0_1.cat
 share/stellarium/stars/default/stars_1_0v0_1.cat
 share/stellarium/stars/default/stars_2_0v0_1.cat
@@ -521,7 +559,7 @@ share/stellarium/textures/callisto.png
 share/stellarium/textures/city.png
 share/stellarium/textures/deimos.png
 share/stellarium/textures/dione.png
-share/stellarium/textures/earth-clouds.jpg
+share/stellarium/textures/earth-clouds.png
 share/stellarium/textures/earth-shadow.png
 share/stellarium/textures/earthmap.png
 share/stellarium/textures/enceladus.png
diff --git a/misc/stellarium/distinfo b/misc/stellarium/distinfo
index fad48d9f7fb..0a873d5728e 100644
--- a/misc/stellarium/distinfo
+++ b/misc/stellarium/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2009/07/28 19:12:36 drochner Exp $
+$NetBSD: distinfo,v 1.14 2010/03/11 11:15:17 adam Exp $
 
-SHA1 (stellarium-0.10.2.tar.gz) = aa24cbb8d4a911121108df67483b4c753402928e
-RMD160 (stellarium-0.10.2.tar.gz) = ea88f1ba4c29a3a9087e5ca89a16258e59d12e72
-Size (stellarium-0.10.2.tar.gz) = 35250510 bytes
-SHA1 (patch-aa) = 308fb712725a7651a91c553fbc3c68e6b64a6cd9
+SHA1 (stellarium-0.10.4.tar.gz) = 8a9f22da5a0049ea10b19b24d28490dc15dea1a8
+RMD160 (stellarium-0.10.4.tar.gz) = ed2ea67c905adb211266df29dca2f8ed1626ad8e
+Size (stellarium-0.10.4.tar.gz) = 36129866 bytes
+SHA1 (patch-aa) = de6b97a0933d32ee77f9f94845ad1bc83ff695c5
 SHA1 (patch-ab) = d94f54f6945d19b340748fbfd2a9187c543aed2a
-SHA1 (patch-ac) = 5853ceaa1325a85c95e9f0967f860638c8d271f4
+SHA1 (patch-ac) = 8d4db22a7ae457bd0b0fba25899ada5d62be7742
diff --git a/misc/stellarium/patches/patch-aa b/misc/stellarium/patches/patch-aa
index b1249d1fd36..d1dfe7cd734 100644
--- a/misc/stellarium/patches/patch-aa
+++ b/misc/stellarium/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2008/10/26 14:03:37 adam Exp $
+$NetBSD: patch-aa,v 1.3 2010/03/11 11:15:17 adam Exp $
 
---- src/modules/ConstellationMgr.cpp.orig	2008-10-26 14:25:08.000000000 +0100
+--- src/modules/ConstellationMgr.cpp.orig	2010-02-22 11:22:31.000000000 +0000
 +++ src/modules/ConstellationMgr.cpp
-@@ -402,7 +402,7 @@ void ConstellationMgr::loadLinesAndArt(c
+@@ -396,7 +396,7 @@ void ConstellationMgr::loadLinesAndArt(c
  				{
- 					texturePath = StelApp::getInstance().getFileMgr().findFile(QString("textures/")+texfile);
+ 					texturePath = StelFileMgr::findFile(QString("textures/")+texfile);
  				}
 -				catch(exception& e2)
 +				catch (std::exception& e2)
diff --git a/misc/stellarium/patches/patch-ac b/misc/stellarium/patches/patch-ac
index 28b44b78b83..ab96c4de01d 100644
--- a/misc/stellarium/patches/patch-ac
+++ b/misc/stellarium/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2009/07/28 19:12:37 drochner Exp $
+$NetBSD: patch-ac,v 1.4 2010/03/11 11:15:17 adam Exp $
 
---- src/external/GLee.h.orig	2009-07-09 17:30:53.000000000 +0200
+--- src/external/GLee.h.orig	2010-02-22 11:22:31.000000000 +0000
 +++ src/external/GLee.h
-@@ -797,10 +797,10 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_texture
+@@ -814,10 +814,10 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_texture
  

  	/* GLX */