Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13007
Modified Files:
stellarium.info stellarium.patch
Log Message:
New upstream version. Completely overhauled to use cmake and qt4-mac. Now 10.5
compatible.
Index: stellarium.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/stellarium.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- stellarium.patch 20 Jan 2006 20:30:40 -0000 1.1
+++ stellarium.patch 3 Apr 2009 00:04:30 -0000 1.2
@@ -1,129 +1,131 @@
-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
--*-*-darwin*)
-+*-*-skip*)
- SDL_VERSION=1.2.0
- ;;
-
-@@ -14725,7 +14725,7 @@
+diff -ru stellarium-0.10.2/CMakeLists.txt stellarium-0.10.2.new/CMakeLists.txt
+--- stellarium-0.10.2/CMakeLists.txt 2009-03-09 07:28:34.000000000 -0400
++++ stellarium-0.10.2.new/CMakeLists.txt 2009-04-02 18:52:53.000000000
-0400
+@@ -32,9 +32,7 @@
+ # best way to get to APPLE?
+ IF(APPLE)
+- SET(CMAKE_INCLUDE_PATH
"/usr/X11/include:/usr/X11/include/freetype2:/Developer/SDKs/MacOSX10.5.sdk/usr/X11/include:/Developer/SDKs/MacOSX10.5.sdk/usr/X11/include/freetype2:/sw/include:${CMAKE_INCLUDE_PATH}")
+- SET(CMAKE_LIBRARY_PATH
"/Developer/SDKs/MacOSX10.5.sdk/usr/X11/lib:/sw/lib:${CMAKE_LIBRARY_PATH}")
+- SET(CMAKE_C_FLAGS "-fno-common -Wall -Wextra -Wno-unused-parameter -DMACOSX
-I/Developer/SDKs/MacOSX10.5.sdk/usr/X11/include
-I/Developer/SDKs/MacOSX10.5.sdk/usr/X11/include/freetype2")
++ SET(CMAKE_C_FLAGS "-fno-common -Wall -Wextra -Wno-unused-parameter -DMACOSX")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
+ SET(CMAKE_EXE_LINKER_FLAGS "-dylib_file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
+ ENDIF()
+@@ -110,14 +108,8 @@
- case "$host" in
--*-*-darwin*)
-+*-*-skip*)
- PKGDATADIR="Stellarium.app/Contents/Resources"
- ;;
- *)
-@@ -14756,7 +14756,7 @@
- #define MACOSX 1
- _ACEOF
+ ########### Set some global variables ###########
+ IF(UNIX AND NOT WIN32)
+-IF(APPLE)
+- SET(CMAKE_INSTALL_PREFIX "/Users/Shared/stellarium/Stellarium.app/Contents")
+- SET(INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/Resources/data")
+- SET(INSTALL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/Resources/locale")
+-ELSE(APPLE)
+ SET(INSTALL_DATADIR ${CMAKE_INSTALL_PREFIX}/share/stellarium)
+ SET(INSTALL_LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
+-ENDIF(APPLE)
+ ELSE()
+ SET(INSTALL_DATADIR .)
+ SET(INSTALL_LOCALEDIR ./locale)
+@@ -202,8 +194,4 @@
+ ADD_SUBDIRECTORY( sip )
+ ENDIF()
-- LDFLAGS="$LDFLAGS -flat_namespace -undefined suppress -lz "
-+ LDFLAGS="$LDFLAGS -flat_namespace -undefined suppress -lmx -lz "
- LIBS="$LIBS -framework OpenGL -lobjc "
- ;;
+-########### Macosx Bundling ###############
+-IF(APPLE)
+-ADD_CUSTOM_TARGET(macosx_bundle bash util/macosx_bundle.sh
${CMAKE_INSTALL_PREFIX} ${PROJECT_SOURCE_DIR} DEPENDS install WORKING_DIRECTORY
${PROJECT_SOURCE_DIR} COMMENT "making the macosx bundle." VERBATIM)
+-ENDIF()
-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"
+diff -ru stellarium-0.10.2/src/core/StelFileMgr.cpp
stellarium-0.10.2.new/src/core/StelFileMgr.cpp
+--- stellarium-0.10.2/src/core/StelFileMgr.cpp 2009-03-09 07:28:33.000000000
-0400
++++ stellarium-0.10.2.new/src/core/StelFileMgr.cpp 2009-04-02
19:14:53.000000000 -0400
+@@ -16,9 +16,6 @@
+ # endif
#endif
--#ifndef HAVE_POW10
-+//#ifndef HAVE_POW10
- # define pow10(x) (float)pow(10.f,(x))
+-#ifdef MACOSX
+-#include "StelMacosxDirs.hpp"
-#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
- }
+ #include "StelFileMgr.hpp"
-@@ -264,11 +266,11 @@
- stel_core* core = new stel_core(DDIR, TDIR, CDIR, DATA_ROOT);
+@@ -354,18 +351,10 @@
+ if (QFileInfo(CHECK_FILE).exists())
+ return ".";
- // 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");
+-#if defined(MACOSX)
+- QFileInfo MacOSdir(QCoreApplication::applicationDirPath());
+- QDir ResourcesDir = MacOSdir.dir();
+- ResourcesDir.cd(QString("Resources"));
+- QFileInfo installLocation(ResourcesDir.absolutePath());
+- QFileInfo checkFile(installLocation.filePath() + QString("/") +
QString(CHECK_FILE));
-#else
-- core->set_config_files(STELLARIUM_CONF_FILE);
+ // Linux, BSD, Solaris etc.
+ // We use the value from the config.h filesystem
+ QFileInfo installLocation(QFile::decodeName(INSTALL_DATADIR));
+ QFileInfo checkFile(QFile::decodeName(INSTALL_DATADIR "/" CHECK_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;
+ if (checkFile.exists())
+ {
+@@ -405,7 +394,7 @@
+ QString StelFileMgr::getLocaleDir(void)
+ {
+ QFileInfo localePath;
+-#if defined(WIN32) || defined(CYGWIN) || defined(__MINGW32__) ||
defined(MINGW32) || defined(MACOSX)
++#if defined(WIN32) || defined(CYGWIN) || defined(__MINGW32__) ||
defined(MINGW32)
+ // Windows and MacOS X have the locale dir in the installation folder
+ // TODO: check if this works with OSX
+ localePath = QFileInfo(getInstallationDir() + "/locale");
+diff -ru stellarium-0.10.2/src/core/StelIniParser.hpp
stellarium-0.10.2.new/src/core/StelIniParser.hpp
+--- stellarium-0.10.2/src/core/StelIniParser.hpp 2009-03-09
07:28:33.000000000 -0400
++++ stellarium-0.10.2.new/src/core/StelIniParser.hpp 2009-04-02
19:15:27.000000000 -0400
+@@ -27,8 +27,6 @@
+ // ourselves.
+ #if defined(WIN32)
+ static const QString stelEndl="\r\n";
+-#elif defined(MACOSX)
+- static const QString stelEndl="\r";
+ #else
+ static const QString stelEndl="\n";
#endif
+diff -ru stellarium-0.10.2/src/core/StelTranslator.cpp
stellarium-0.10.2.new/src/core/StelTranslator.cpp
+--- stellarium-0.10.2/src/core/StelTranslator.cpp 2009-03-09
07:28:33.000000000 -0400
++++ stellarium-0.10.2.new/src/core/StelTranslator.cpp 2009-04-02
19:16:28.000000000 -0400
+@@ -39,12 +39,8 @@
+ QString StelTranslator::systemLangName;
- //#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)
+ // Use system locale language by default
+-#if defined(MACOSX)
+-#include "StelMacosxDirs.hpp"
+-StelTranslator StelTranslator::globalTranslator =
StelTranslator(PACKAGE_NAME,
StelMacosxDirs::getApplicationResourcesDirectory().append( "/locale" ),
"system");
-#else
--# include "POSupport.h"
--# define _(String) localizedUTF8String(String)
--# define N_(String) (String)
+ StelTranslator StelTranslator::globalTranslator =
StelTranslator(PACKAGE_NAME, INSTALL_LOCALEDIR, "system");
-#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 @@
+ #ifdef WIN32
+ # include <windows.h>
+diff -ru stellarium-0.10.2/src/main.cpp stellarium-0.10.2.new/src/main.cpp
+--- stellarium-0.10.2/src/main.cpp 2009-03-09 07:28:33.000000000 -0400
++++ stellarium-0.10.2.new/src/main.cpp 2009-04-02 19:16:55.000000000 -0400
+@@ -26,9 +26,6 @@
+ #include <QDebug>
+ #include <QGLFormat>
+ #include <QPlastiqueStyle>
+-#ifdef MACOSX
+-#include "StelMacosxDirs.hpp"
+-#endif
- typedef Vector4<double> Vec4d;
- typedef Vector4<float> Vec4f;
--typedef Vector4<int> Vec4i;
-+typedef Vector4<long> Vec4i;
+ //! @class GettextStelTranslator
+ //! Provides i18n support through gettext.
+@@ -65,9 +62,6 @@
+ int argc2 = argc+2;
+ QApplication app(argc2, argv2);
- typedef Matrix4<float> Mat4f;
- typedef Matrix4<double> Mat4d;
+-#ifdef MACOSX
+- StelMacosxDirs::addApplicationPluginDirectory();
+-#endif
+ GettextStelTranslator trans;
+ app.installTranslator(&trans);
+ if (!QGLFormat::hasOpenGL())
Index: stellarium.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/stellarium.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- stellarium.info 21 Dec 2008 18:31:19 -0000 1.4
+++ stellarium.info 3 Apr 2009 00:04:30 -0000 1.5
@@ -1,20 +1,54 @@
Package: stellarium
-Version: 0.7.1
-Revision: 1011
-Distribution: 10.4
+Version: 0.10.2
+Revision: 1
Description: Real time 3D sky renderer
Maintainer: Daniel Johnson <[email protected]>
Source: mirror:sourceforge:stellarium/stellarium-%v.tar.gz
-Source-MD5: 94cb47d20d31d5e0bba5d9e0189c331b
+Source-MD5: c544fff9e75e9317055075b658ae5924
PatchFile: %n.patch
-PatchFile-MD5: eae0d2371baec4edcd47e8dce4c2430a
-# 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.9-1001), macosx (>= 10.3.0-1), libgettext3-dev,
libiconv-dev, libpng3, fink (>= 0.24.12-1)
-Depends: sdl-shlibs (>= 1.2.9-1001), macosx (>= 10.3.0-1), libgettext3-shlibs,
libiconv, libpng3-shlibs
-BuildConflicts: sdl-mixer
+PatchFile-MD5: fe6e6c4a88c682d83b8bdf785f48ada5
+BuildDepends: <<
+ boost1.35.nopython,
+ cmake,
+ fink (>= 0.24.12-1),
+ freetype219,
+ gettext-tools,
+ libgettext3-dev,
+ libiconv-dev,
+ libjpeg,
+ libpng3,
+ qt4-mac (>= 4.5.0-3),
+ system-openssl-dev
+<<
+Depends: <<
+ freetype219-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libjpeg-shlibs,
+ libpng3-shlibs,
+ qt4-mac-core-shlibs (>= 4.5.0-3),
+ qt4-mac-gui-shlibs (>= 4.5.0-3)
+<<
GCC: 4.0
+CompileScript: <<
+ #!/bin/bash -ev
+ mkdir -p build/unix
+ cd build/unix
+ cmake -DCMAKE_INSTALL_PREFIX:PATH=%p \
+ -DCMAKE_PREFIX_PATH:PATH=%p \
+ -DQT_QMAKE_EXECUTABLE:FILEPATH=%p/lib/qt4-mac/bin/qmake \
+ -DFreeType2_INCLUDE_DIR:PATH=%p/include/freetype2 \
+ -DFreeType2_LIBRARIES:FILEPATH=%p/lib/libfreetype.dylib \
+ -DOPENSSL_INCLUDE_DIR:PATH=%p/lib/system-openssl/include \
+
-DOPENSSL_LIBRARIES:FILEPATH=%p/lib/system-openssl/lib/libssl.dylib \
+ ../..
+ make
+<<
+InstallScript: <<
+ #!/bin/bash -ev
+ cd build/unix
+ make install DESTDIR=%d
+<<
DescDetail: <<
Stellarium renders a real time, photorealistic 3D image of the sky using
OpenGL. Its features include:
@@ -42,29 +76,6 @@
Ecliptic and celestrial equator lines.
Windowed and fullscreen modes.
<<
-DescPackaging: <<
- This version is compiled with g++-4.0, even in the 10.4-transitional tree.
- Stellarium neither depends on nor is depended on by any C++ packages, so it's
- safe to do this. It should also now compile on Intel Macs (in theory).
-<<
-DescPort: <<
- 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.
-<<
-DescUsage: <<
- User interface uses SDL and OpenGL; X11 is NOT used. Can be run from
- Terminal.app without X11 running. Due to limitations of SDL library,
- stellarium will NOT work in full screen mode if X11 is also running in
- full screen mode; rootless mode is fine. In addition, full screen mode
- won't work if your Mac does not support OpenGL hardware acceleration.
- Basically, if full screen mode doesn't work, try windowed mode; set
- "fullscreen = true" to "fullscreen = false" in your ~/.stellarium/config.ini
- and make your screen_h and screen_w smaller than your screen size.
- Stellarium will often replace your config.ini when upgrading to a new
- version; make a backup copy first.
-<<
-DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
doc/developer_guide.tex
+DocFiles: AUTHORS ChangeLog COPYING README
License: GPL
Homepage: http://stellarium.sourceforge.net/
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
