- update to 1.5.1

- fix a stack corruption on startup (bits taken from celestia SVN)
- use SUBST_CMD (gotta love that stuff!)
This commit is contained in:
ajacoutot 2008-05-10 17:25:52 +00:00
parent fb45a35004
commit 31612d2f8a
8 changed files with 72 additions and 31 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2008/04/08 16:04:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.6 2008/05/10 17:25:52 ajacoutot Exp $
COMMENT= free space simulator and planetarium
DISTNAME= celestia-1.5.0
DISTNAME= celestia-1.5.1
CATEGORIES= astro x11
HOMEPAGE= http://www.shatters.net/celestia/
@ -45,8 +45,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-theora
pre-configure:
@perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' \
${WRKSRC}/src/celestia/celestiacore.cpp
${SUBST_CMD} ${WRKSRC}/src/celestia/celestiacore.cpp
post-install:
${INSTALL_DATA} ${WRKSRC}/models/*.3ds \

View File

@ -1,5 +1,5 @@
MD5 (celestia-1.5.0.tar.gz) = FWvBCA0nkGEilFog2E1Kgg==
RMD160 (celestia-1.5.0.tar.gz) = /hh8iWTqx4MpgqJoo6e3ZYB+gAU=
SHA1 (celestia-1.5.0.tar.gz) = y3YScPBIGTqwEVnKsUCC8lETzao=
SHA256 (celestia-1.5.0.tar.gz) = oHg07lsbtL52wpCGsLf67Iw7qvohus6MzXZbrmMkc+A=
SIZE (celestia-1.5.0.tar.gz) = 29116952
MD5 (celestia-1.5.1.tar.gz) = 32hUos9i0ulmEjmME7aP0g==
RMD160 (celestia-1.5.1.tar.gz) = JvEFrPwmpe3Mtz/inDNjiASw83A=
SHA1 (celestia-1.5.1.tar.gz) = LWoRfa9qQAq0xHpaUcE/KrYB5ts=
SHA256 (celestia-1.5.1.tar.gz) = WgKN7GNML9GyCX62cX+ObKXQUFK39j9fwgXQy/JUiIw=
SIZE (celestia-1.5.1.tar.gz) = 34144780

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.2 2008/04/08 16:04:27 ajacoutot Exp $
--- Makefile.in.orig Sat Jan 26 03:03:46 2008
+++ Makefile.in Fri Apr 4 10:22:59 2008
@@ -371,7 +371,6 @@ noinst_DATA = \
pkgdata_DATA = \
celestia.cfg \
controls.txt \
- COPYING \
$(wildcard *.cel)
EXTRA_DIST = \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2008/04/08 16:04:27 ajacoutot Exp $
--- configure.orig Fri Apr 4 10:23:56 2008
+++ configure Fri Apr 4 10:31:17 2008
@@ -22595,8 +22595,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
$OpenBSD: patch-configure,v 1.3 2008/05/10 17:25:52 ajacoutot Exp $
--- configure.orig Wed Apr 23 23:27:35 2008
+++ configure Sat May 10 17:35:15 2008
@@ -18997,8 +18997,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
CELESTIA_CPPFLAGS=""

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_celengine_astro_cpp,v 1.1 2008/04/08 16:04:27 ajacoutot Exp $
--- src/celengine/astro.cpp.orig Fri Apr 4 10:41:18 2008
+++ src/celengine/astro.cpp Fri Apr 4 10:44:01 2008
@@ -445,7 +445,7 @@ const char* astro::Date::toCStr(Format format) const
$OpenBSD: patch-src_celengine_astro_cpp,v 1.2 2008/05/10 17:25:52 ajacoutot Exp $
--- src/celengine/astro.cpp.orig Wed Apr 23 23:17:16 2008
+++ src/celengine/astro.cpp Sat May 10 17:35:15 2008
@@ -459,7 +459,7 @@ const char* astro::Date::toCStr(Format format) const
{
static char date[255];

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_celengine_render_cpp,v 1.1 2008/05/10 17:25:52 ajacoutot Exp $
--- src/celengine/render.cpp.orig Sat May 10 19:19:49 2008
+++ src/celengine/render.cpp Sat May 10 19:19:55 2008
@@ -7861,7 +7861,9 @@ void PointStarRenderer::process(const Star& star, floa
nProcessed++;
Point3f starPos = star.getPosition();
- Vec3f relPos = starPos - obsPos;
+ Vec3f relPos((float) ((double) starPos.x - obsPos.x),
+ (float) ((double) starPos.y - obsPos.y),
+ (float) ((double) starPos.z - obsPos.z));
float orbitalRadius = star.getOrbitalRadius();
bool hasOrbit = orbitalRadius > 0.0f;

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_celestia_celestiacore_cpp,v 1.2 2008/04/08 16:04:27 ajacoutot Exp $
$OpenBSD: patch-src_celestia_celestiacore_cpp,v 1.3 2008/05/10 17:25:52 ajacoutot Exp $
--- src/celestia/celestiacore.cpp.orig Tue Jan 22 03:44:57 2008
+++ src/celestia/celestiacore.cpp Fri Apr 4 10:22:59 2008
@@ -3915,7 +3915,7 @@ bool CelestiaCore::initSimulation(const string* config
@ -6,7 +6,7 @@ $OpenBSD: patch-src_celestia_celestiacore_cpp,v 1.2 2008/04/08 16:04:27 ajacouto
else
{
- config = ReadCelestiaConfig("celestia.cfg");
+ config = ReadCelestiaConfig("!!SYSCONFDIR!!/celestia.cfg");
+ config = ReadCelestiaConfig("${SYSCONFDIR}/celestia.cfg");
string localConfigFile = WordExp("~/.celestia.cfg");
if (localConfigFile != "")

View File

@ -1,22 +1,34 @@
@comment $OpenBSD: PLIST,v 1.2 2008/04/08 16:04:27 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2008/05/10 17:25:52 ajacoutot Exp $
bin/celestia
share/applications/celestia.desktop
share/celestia/
share/celestia/COPYING
@comment share/celestia/COPYING_bg
@comment share/celestia/COPYING_de
@comment share/celestia/COPYING_es
@comment share/celestia/COPYING_fr
@comment share/celestia/COPYING_it
@comment share/celestia/COPYING_ja
@comment share/celestia/COPYING_pt
@comment share/celestia/COPYING_ru
@comment share/celestia/COPYING_sv
@comment share/celestia/COPYING_uk
share/celestia/celestia-logo.png
share/celestia/celestia.cfg
@sample ${SYSCONFDIR}/celestia.cfg
share/celestia/celestiaui.xml
share/celestia/controls.txt
share/celestia/controls_bg.txt
share/celestia/controls_de.txt
share/celestia/controls_es.txt
share/celestia/controls_fr.txt
share/celestia/controls_it.txt
share/celestia/controls_ja.txt
share/celestia/controls_nl.txt
share/celestia/controls_pt.txt
share/celestia/controls_ru.txt
share/celestia/controls_sv.txt
share/celestia/controls_uk.txt
share/celestia/data/
share/celestia/data/asterisms.dat
share/celestia/data/asteroids.ssc
@ -55,14 +67,18 @@ share/celestia/data/venus_locs.ssc
share/celestia/data/visualbins.stc
share/celestia/data/world-capitals.ssc
share/celestia/demo.cel
share/celestia/demo_de.cel
share/celestia/demo_es.cel
share/celestia/demo_fr.cel
share/celestia/demo_it.cel
share/celestia/demo_ja.cel
share/celestia/demo_ko.cel
share/celestia/demo_lv.cel
share/celestia/demo_nl.cel
share/celestia/demo_pt.cel
share/celestia/demo_ru.cel
share/celestia/demo_sv.cel
share/celestia/demo_uk.cel
share/celestia/extras/
share/celestia/extras/apollo.ssc
share/celestia/extras/comets.ssc
@ -87,20 +103,38 @@ share/celestia/fonts/helvbold24.txf
share/celestia/fonts/sans10.txf
share/celestia/fonts/sans12.txf
share/celestia/fonts/sans12_bg.txf
share/celestia/fonts/sans12_ja.txf
share/celestia/fonts/sans12_ru.txf
share/celestia/fonts/sans12_uk.txf
share/celestia/fonts/sans12_zh.txf
share/celestia/fonts/sans14.txf
share/celestia/fonts/sans14_ja.txf
share/celestia/fonts/sans14_ru.txf
share/celestia/fonts/sans14_uk.txf
share/celestia/fonts/sans14_zh.txf
share/celestia/fonts/sans20.txf
share/celestia/fonts/sansbold10.txf
share/celestia/fonts/sansbold12.txf
share/celestia/fonts/sansbold14.txf
share/celestia/fonts/sansbold20.txf
share/celestia/fonts/sansbold20_bg.txf
share/celestia/fonts/sansbold20_ja.txf
share/celestia/fonts/sansbold20_ru.txf
share/celestia/fonts/sansbold20_uk.txf
share/celestia/fonts/sansbold20_zh.txf
share/celestia/guide.cel
share/celestia/guide_bg.cel
share/celestia/guide_de.cel
share/celestia/guide_es.cel
share/celestia/guide_fr.cel
share/celestia/guide_it.cel
share/celestia/guide_ja.cel
share/celestia/guide_ko.cel
share/celestia/guide_nl.cel
share/celestia/guide_pt.cel
share/celestia/guide_ru.cel
share/celestia/guide_sv.cel
share/celestia/guide_uk.cel
share/celestia/models/
share/celestia/models/E0.png
share/celestia/models/MilkyWay.png
@ -220,15 +254,20 @@ share/celestia/shaders/texphong_nv.fp
share/celestia/splash/
share/celestia/splash/splash.png
share/celestia/start.cel
share/celestia/start_bg.cel
share/celestia/start_de.cel
share/celestia/start_es.cel
share/celestia/start_fr.cel
share/celestia/start_hu.cel
share/celestia/start_it.cel
share/celestia/start_ja.cel
share/celestia/start_ko.cel
share/celestia/start_lv.cel
share/celestia/start_nl.cel
share/celestia/start_pt.cel
share/celestia/start_ru.cel
share/celestia/start_sv.cel
share/celestia/start_uk.cel
share/celestia/textures/
share/celestia/textures/flare.jpg
share/celestia/textures/hires/