Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8701
Modified Files:
stellarium.info stellarium.patch
Log Message:
Moved to stable.
Index: stellarium.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/stellarium.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- stellarium.patch 1 Feb 2006 23:36:08 -0000 1.2
+++ stellarium.patch 22 Jun 2006 00:10:59 -0000 1.3
@@ -1,7 +1,7 @@
-diff -ru stellarium-0.6.2.orig/configure stellarium-0.6.2/configure
---- stellarium-0.6.2.orig/configure 2004-11-18 17:54:06.000000000 -0500
-+++ stellarium-0.6.2/configure 2006-02-01 18:10:57.000000000 -0500
-@@ -5653,7 +5653,7 @@
+diff -ru stellarium-0.7.1.orig/configure stellarium-0.7.1/configure
+--- stellarium-0.7.1.orig/configure 2005-09-14 09:22:05.000000000 -0400
++++ stellarium-0.7.1/configure 2005-12-02 12:55:27.000000000 -0500
+@@ -13934,7 +13934,7 @@
CFLAGS="$CFLAGS $X_CFLAGS"
case "$host" in
@@ -10,7 +10,7 @@
SDL_VERSION=1.2.0
;;
-@@ -6359,7 +6359,7 @@
+@@ -14725,7 +14725,7 @@
case "$host" in
@@ -19,7 +19,7 @@
PKGDATADIR="Stellarium.app/Contents/Resources"
;;
*)
-@@ -6384,7 +6384,7 @@
+@@ -14756,7 +14756,7 @@
#define MACOSX 1
_ACEOF
@@ -28,21 +28,96 @@
LIBS="$LIBS -framework OpenGL -lobjc "
;;
-diff -ru stellarium-0.6.2.orig/src/main.cpp stellarium-0.6.2/src/main.cpp
---- stellarium-0.6.2.orig/src/main.cpp 2004-10-08 20:14:04.000000000 -0400
-+++ stellarium-0.6.2/src/main.cpp 2006-02-01 18:10:57.000000000 -0500
-@@ -142,7 +142,7 @@
+diff -ru stellarium-0.7.1.orig/src/fmath.h stellarium-0.7.1/src/fmath.h
+--- stellarium-0.7.1.orig/src/fmath.h 2005-09-08 12:22:01.000000000 -0400
++++ stellarium-0.7.1/src/fmath.h 2005-12-02 12:55:27.000000000 -0500
+@@ -27,9 +27,9 @@
+ # include "config.h"
+ #endif
- // If the system is non unix (windows) or if it's macosx the config
file is in the
- // config/ directory of the dataRoot directory
--#if defined(WIN32) || defined(CYGWIN) || defined(__MINGW32__) ||
defined(MACOSX)
-+#if defined(WIN32) || defined(CYGWIN) || defined(__MINGW32__)
- CDIR = DATA_ROOT + "/config/";
+-#ifndef HAVE_POW10
++//#ifndef HAVE_POW10
+ # define pow10(x) (float)pow(10.f,(x))
+-#endif
++//#endif
+ #ifndef HAVE_ACOSF
+ # define acosf(x) (float)(acos(x))
+ #endif
+diff -ru stellarium-0.7.1.orig/src/main.cpp stellarium-0.7.1/src/main.cpp
+--- stellarium-0.7.1.orig/src/main.cpp 2005-09-17 04:41:58.000000000 -0400
++++ stellarium-0.7.1/src/main.cpp 2005-12-02 12:55:27.000000000 -0500
+@@ -93,6 +93,7 @@
+ // This enable to launch stellarium from the local directory without
installing it
+ void setDirectories(const char* executableName)
+ {
++#undef MACOSX
+ #if !defined(MACOSX) && !defined(XCODE)
+ // The variable CONFIG_DATA_DIR must have been set by the configure
script
+ // Its value is the dataRoot directory, ie the one containing data/ and
textures/
+@@ -228,6 +229,7 @@
+ CDIR = cdir;
+ DATA_ROOT = data_root;
+ #endif
++#define MACOSX 1
+ }
- if ((tempFile = fopen((CDIR + "config.ini").c_str(),"r")))
-diff -ru stellarium-0.6.2.orig/src/vecmath.h stellarium-0.6.2/src/vecmath.h
---- stellarium-0.6.2.orig/src/vecmath.h 2004-10-08 20:14:04.000000000
-0400
-+++ stellarium-0.6.2/src/vecmath.h 2006-02-01 18:22:36.000000000 -0500
+
+@@ -264,11 +266,11 @@
+ stel_core* core = new stel_core(DDIR, TDIR, CDIR, DATA_ROOT);
+
+ // Give the config file parameters which has to be given "hard coded"
+-#if !defined(MACOSX) && !defined(XCODE)
++//#if !defined(MACOSX) && !defined(XCODE)
+ core->set_config_files("config.ini");
+-#else
+- core->set_config_files(STELLARIUM_CONF_FILE);
+-#endif
++//#else
++// core->set_config_files(STELLARIUM_CONF_FILE);
++//#endif
+
+ // Load the configuration options from the given file names
+ // This includes the video parameters
+diff -ru stellarium-0.7.1.orig/src/observator.cpp
stellarium-0.7.1/src/observator.cpp
+--- stellarium-0.7.1.orig/src/observator.cpp 2005-09-14 08:46:21.000000000
-0400
++++ stellarium-0.7.1/src/observator.cpp 2005-12-02 12:55:27.000000000
-0500
+@@ -230,7 +230,7 @@
+ struct tm *timeinfo;
+ time_t rawtime; time(&rawtime);
+ timeinfo = localtime(&rawtime);
+- return -(float)timezone/3600 + (timeinfo->tm_isdst!=0);
++ return (float)timeinfo->tm_gmtoff/3600;
+ #endif
+
+ //#endif
+diff -ru stellarium-0.7.1.orig/src/stellarium.h
stellarium-0.7.1/src/stellarium.h
+--- stellarium-0.7.1.orig/src/stellarium.h 2005-09-08 12:28:09.000000000
-0400
++++ stellarium-0.7.1/src/stellarium.h 2005-12-02 12:55:27.000000000 -0500
+@@ -41,15 +41,15 @@
+ #define MY_MIN(a,b) (((a)<(b))?(a):(b))
+
+ // Used for GNU gettext translations
+-#ifndef MACOSX
++//#ifndef MACOSX
+ #include "gettext.h"
+ #define _(String) gettext (String)
+ #define N_(String) gettext_noop(String)
+-#else
+-# include "POSupport.h"
+-# define _(String) localizedUTF8String(String)
+-# define N_(String) (String)
+-#endif
++//#else
++//# include "POSupport.h"
++//# define _(String) localizedUTF8String(String)
++//# define N_(String) (String)
++//#endif
+
+ #include <cassert>
+
+diff -ru stellarium-0.7.1.orig/src/vecmath.h stellarium-0.7.1/src/vecmath.h
+--- stellarium-0.7.1.orig/src/vecmath.h 2005-09-08 12:31:26.000000000
-0400
++++ stellarium-0.7.1/src/vecmath.h 2005-12-02 12:55:55.000000000 -0500
@@ -41,7 +41,7 @@
typedef Vector4<double> Vec4d;
@@ -52,36 +127,3 @@
typedef Matrix4<float> Mat4f;
typedef Matrix4<double> Mat4d;
-@@ -73,8 +73,8 @@
- inline Vector2 operator-(const Vector2<T>&) const;
- inline Vector2 operator+(const Vector2<T>&) const;
-
-- inline Vector2 Vector2<T>::operator-() const;
-- inline Vector2 Vector2<T>::operator+() const;
-+ inline Vector2 operator-() const;
-+ inline Vector2 operator+() const;
-
- inline Vector2 operator*(T) const;
- inline Vector2 operator/(T) const;
-@@ -119,8 +119,8 @@
- inline Vector3 operator-(const Vector3<T>&) const;
- inline Vector3 operator+(const Vector3<T>&) const;
-
-- inline Vector3 Vector3<T>::operator-() const;
-- inline Vector3 Vector3<T>::operator+() const;
-+ inline Vector3 operator-() const;
-+ inline Vector3 operator+() const;
-
- inline Vector3 operator*(T) const;
- inline Vector3 operator/(T) const;
-@@ -168,8 +168,8 @@
- inline Vector4 operator-(const Vector4<T>&) const;
- inline Vector4 operator+(const Vector4<T>&) const;
-
-- inline Vector4 Vector4<T>::operator-() const;
-- inline Vector4 Vector4<T>::operator+() const;
-+ inline Vector4 operator-() const;
-+ inline Vector4 operator+() const;
-
- inline Vector4 operator*(T) const;
- inline Vector4 operator/(T) const;
Index: stellarium.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/stellarium.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- stellarium.info 1 Feb 2006 23:36:08 -0000 1.3
+++ stellarium.info 22 Jun 2006 00:10:59 -0000 1.4
@@ -1,14 +1,17 @@
Package: stellarium
-Version: 0.6.2
-Revision: 1005
+Version: 0.7.1
+Revision: 1011
Description: Real time 3D sky renderer
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Source: mirror:sourceforge:stellarium/stellarium-%v.tar.gz
-Source-MD5: f00e99b88f53273419683cf18905e39c
+Source-MD5: 94cb47d20d31d5e0bba5d9e0189c331b
Patch: %n.patch
+# The following line can be removed when we're moved to the "real" 10.4 tree.
+SetCXX: g++-4.0
ConfigureParams: --mandir=%p/share/man --with-sdl-prefix=%p
--disable-dependency-tracking --disable-sdltest
-BuildDepends: sdl (>= 1.2.8-1), macosx (>= 10.3.0-1)
-Depends: sdl-shlibs (>= 1.2.8-1), macosx (>= 10.3.0-1)
+BuildDepends: sdl (>= 1.2.9-1001), macosx (>= 10.3.0-1), libgettext3-dev,
libiconv-dev, libpng3
+Depends: sdl-shlibs (>= 1.2.9-1001), macosx (>= 10.3.0-1), libgettext3-shlibs,
libiconv, libpng3-shlibs
+BuildConflicts: sdl-mixer
GCC: 4.0
DescDetail: <<
Stellarium renders a real time, photorealistic 3D image of the sky using
@@ -46,7 +49,7 @@
Patched configure to link with libmx.dylib, needed for some math functions.
Made some patches to recognize SDL. Patched main.cpp
to save configuration file in ~/.stellarium/config.ini instead of
- /sw/share/stellarium/config/config.ini. Patched vecmath.h to build with g++
4.0.
+ /sw/share/stellarium/config/config.ini. Patched vecmath.h to build with
g++-4.0.
<<
DescUsage: <<
User interface uses SDL and OpenGL; X11 is NOT used. Can be run from
@@ -62,4 +65,4 @@
<<
DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
doc/developer_guide.tex
License: GPL
-Homepage: http://stellarium.free.fr/
\ No newline at end of file
+Homepage: http://stellarium.sourceforge.net/
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
