Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv15379
Added Files:
stellarium.info stellarium.patch
Log Message:
Move to 10.7.
--- NEW FILE: stellarium.patch ---
diff -ru stellarium-0.11.0.orig/CMakeLists.txt stellarium-0.11.0/CMakeLists.txt
--- stellarium-0.11.0.orig/CMakeLists.txt 2011-07-02 09:22:18.000000000
-0400
+++ stellarium-0.11.0/CMakeLists.txt 2011-09-01 19:29:39.000000000 -0400
@@ -232,9 +232,10 @@
########### Set some global variables ###########
IF(UNIX AND NOT WIN32)
-IF(APPLE)
- SET(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/Stellarium.app/Contents")
-ELSE(APPLE)
+IF(APPLE_APP)
+ SET(INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/Resources")
+ SET(INSTALL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/Resources/locale")
+ELSE(APPLE_APP)
ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/stellarium")
ADD_DEFINITIONS(-DINSTALL_LOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale")
ENDIF()
@@ -306,7 +307,7 @@
ENDIF()
########### Macosx Bundling ###############
-IF(APPLE)
+IF(APPLE_APP)
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.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.cpp
stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.cpp
--- stellarium-0.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.cpp
2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.cpp
2011-09-01 19:31:28.000000000 -0400
@@ -207,13 +207,13 @@
*
* ---------------------------------------------------------------------------
*/
-double asinh
+/*double asinh
(
double xval
)
{
return log( xval + sqrt( xval*xval + 1.0 ) );
- } // end asinh
+ } */ // end asinh
/*
-----------------------------------------------------------------------------
diff -ru stellarium-0.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.h
stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.h
--- stellarium-0.11.0.orig/plugins/Satellites/src/gsatellite/sgp4ext.h
2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/plugins/Satellites/src/gsatellite/sgp4ext.h
2011-09-01 19:31:59.000000000 -0400
@@ -62,10 +62,10 @@
double& e0, double& m
);
-double asinh
+/*double asinh
(
double xval
- );
+ );*/
void rv2coe
(
diff -ru stellarium-0.11.0.orig/src/core/StelFileMgr.cpp
stellarium-0.11.0/src/core/StelFileMgr.cpp
--- stellarium-0.11.0.orig/src/core/StelFileMgr.cpp 2011-07-02
09:22:18.000000000 -0400
+++ stellarium-0.11.0/src/core/StelFileMgr.cpp 2011-09-01 19:29:39.000000000
-0400
@@ -51,7 +51,7 @@
{
userDir = winApiPath + "\\Stellarium";
}
-#elif defined(Q_OS_MAC)
+#elif defined(MACOSX_APP)
userDir = QDir::homePath() + "/Library/Application Support/Stellarium";
#else
userDir = QDir::homePath() + "/.stellarium";
@@ -84,13 +84,13 @@
qWarning() << "WARNING: could not locate installation
directory";
}
-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN) || defined(MACOSX_APP)
screenshotDir = getDesktopDir();
#else
screenshotDir = QDir::homePath();
#endif
-#ifdef Q_OS_MAC
+#ifdef MACOSX_APP
QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());
#endif
}
@@ -400,7 +400,7 @@
return ".";
}
-#ifdef Q_OS_MAC
+#ifdef MACOSX_APP
QString relativePath = "/../Resources";
if (QCoreApplication::applicationDirPath().contains("src")) {
relativePath = "/../../../../..";
@@ -457,7 +457,7 @@
{
#ifdef ENABLE_NLS
QFileInfo localePath;
-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN) || defined(MACOSX_APP)
// Windows and MacOS X have the locale dir in the installation folder
localePath = QFileInfo(getInstallationDir() + "/locale");
// or MacosxDirs::getApplicationResourcesDirectory().append( "/locale"
);
diff -ru stellarium-0.11.0.orig/src/core/StelUtils.cpp
stellarium-0.11.0/src/core/StelUtils.cpp
--- stellarium-0.11.0.orig/src/core/StelUtils.cpp 2011-07-02
09:22:18.000000000 -0400
+++ stellarium-0.11.0/src/core/StelUtils.cpp 2011-09-01 19:32:15.000000000
-0400
@@ -413,10 +413,10 @@
}
// Return the inverse sinus hyperbolic of z
-double asinh(double z)
+/*double asinh(double z)
{
return std::log(z+std::sqrt(z*z+1));
-}
+}*/
/*************************************************************************
Convert a QT QDateTime class to julian day
diff -ru stellarium-0.11.0.orig/src/core/StelUtils.hpp
stellarium-0.11.0/src/core/StelUtils.hpp
--- stellarium-0.11.0.orig/src/core/StelUtils.hpp 2011-07-02
09:22:18.000000000 -0400
+++ stellarium-0.11.0/src/core/StelUtils.hpp 2011-09-01 19:32:36.000000000
-0400
@@ -177,7 +177,7 @@
int getBiggerPowerOfTwo(int value);
//! Return the inverse sinus hyperbolic of z.
- double asinh(double z);
+ /*double asinh(double z);*/
///////////////////////////////////////////////////
// New Qt based General Calendar Functions.
diff -ru stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues.h
stellarium-0.11.0/src/core/external/glues_stel/source/glues.h
--- stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues.h
2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/src/core/external/glues_stel/source/glues.h
2011-09-01 19:29:39.000000000 -0400
@@ -39,7 +39,7 @@
#ifdef USE_OPENGL_ES2
# include <GLES2/gl2.h>
-#elif defined(Q_OS_MAC) || defined(__APPLE__) || defined(__APPLE_CC__)
+#elif defined(MACOSX_APP)
# include <OpenGL/gl.h>
#elif defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_1_CL)
# include <GLES/gl.h>
diff -ru
stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues_error.c
stellarium-0.11.0/src/core/external/glues_stel/source/glues_error.c
--- stellarium-0.11.0.orig/src/core/external/glues_stel/source/glues_error.c
2011-07-02 09:22:18.000000000 -0400
+++ stellarium-0.11.0/src/core/external/glues_stel/source/glues_error.c
2011-09-01 19:29:39.000000000 -0400
@@ -33,7 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
-#if defined(Q_OS_MAC) || defined(__APPLE__) || defined(__APPLE_CC__)
+#if defined(MACOSX_APP)
# include <OpenGL/gl.h>
#elif defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_1_CL)
# include <GLES/gl.h>
diff -ru stellarium-0.11.0.orig/util/macosx_bundle.sh
stellarium-0.11.0/util/macosx_bundle.sh
--- stellarium-0.11.0.orig/util/macosx_bundle.sh 2011-07-02
09:22:18.000000000 -0400
+++ stellarium-0.11.0/util/macosx_bundle.sh 2011-09-01 19:29:39.000000000
-0400
@@ -17,20 +17,6 @@
rmdir ${CMAKE_INSTALL_PREFIX}/Resources/stellarium
-mkdir ${CMAKE_INSTALL_PREFIX}/Frameworks
-/usr/bin/perl util/pkgApp.pl ${CMAKE_INSTALL_PREFIX} MacOS/stellarium
Frameworks
-cp -pr /Developer/Applications/Qt/plugins/{imageformats,iconengines}
${CMAKE_INSTALL_PREFIX}/MacOS
-for f in ${CMAKE_INSTALL_PREFIX}/MacOS/{imageformats,iconengines}/*.dylib; do
- fdir=`dirname $f`
- dir=`basename $fdir`
- base=`basename $f`
- #/usr/bin/install_name_tool -id "@executable_path/$dir/$base" $f
- for qt in `otool -L $f | egrep ' Qt' | cut -f 1 -d ' '`; do
- newt="@executable_path/../Frameworks/$qt"
- /usr/bin/install_name_tool -change $qt $newt $f
- done
-done
-
cp -pr $PROJECT_SOURCE_DIR/data/Icon.icns $CMAKE_INSTALL_PREFIX/Resources
cp -pr $PROJECT_SOURCE_DIR/data/{PkgInfo,Info.plist} $CMAKE_INSTALL_PREFIX
cp -pr $PROJECT_SOURCE_DIR/util/qt.conf $CMAKE_INSTALL_PREFIX/Resources
--- NEW FILE: stellarium.info ---
Info2: <<
Package: stellarium-%type_pkg[qt]
Version: 0.11.0
Revision: 2
Type: qt (mac x11)
Description: Real time 3D sky renderer
Maintainer: Daniel Johnson <[email protected]>
Source: mirror:sourceforge:stellarium/stellarium-%v.tar.gz
Source-MD5: 5a4447661fcdeabe8730dca2081367db
PatchFile: stellarium.patch
PatchFile-MD5: 1d7254c6a16499f5f01bf884c58ddae5
BuildDepends: <<
boost1.41.cmake,
cmake (>= 2.8.4-1),
fink (>= 0.24.12-1),
gettext-tools,
libgettext8-dev,
( %type_pkg[qt] = x11 ) libgl-dev,
libiconv-dev,
phonon-%type_pkg[qt] (>= 4.5.0-1),
qt4-base-%type_pkg[qt] (>= 4.7.3-1)
<<
Depends: <<
libgettext8-shlibs,
( %type_pkg[qt] = x11 ) libgl-shlibs,
libiconv,
phonon-%type_pkg[qt]-shlibs (>= 4.5.0-1),
qt4-base-%type_pkg[qt]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtdbus-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtnetwork-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtopengl-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtscript-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtxml-shlibs (>= 4.7.3-1)
<<
Conflicts: stellarium (<< 0.10.2-3), stellarium-x11 (<< 0.10.2-3)
Replaces: stellarium (<< 0.10.2-3), stellarium-x11 (<< 0.10.2-3)
GCC: 4.0
CompileScript: <<
#!/bin/bash -ev
mkdir -p build/unix
cd build/unix
if [ %type_raw[qt] = x11 ]; then
params="-DOPENGL_gl_LIBRARY:FILEPATH=/usr/X11R6/lib/libGL.dylib
-DOPENGL_glu_LIBRARY:FILEPATH=/usr/X11R6/lib/libGLU.dylib
-DOPENGL_INCLUDE_DIR:PATH=/usr/X11R6/include
-DCMAKE_EXE_LINKER_FLAGS=-L/usr/X11R6/lib -DCMAKE_INSTALL_PREFIX:PATH=%p"
else
params="-DAPPLE_APP=1 -DCMAKE_C_FLAGS=-DMACOSX_APP
-DCMAKE_INSTALL_PREFIX:PATH=%p/Applications/stellarium.app/Contents"
fi
cmake -DCMAKE_PREFIX_PATH:PATH=%p \
-DQT_QMAKE_EXECUTABLE:FILEPATH=%p/lib/qt4-%type_pkg[qt]/bin/qmake \
-DENABLE_SOUND=1 \
$params \
../..
make
<<
InstallScript: <<
#!/bin/bash -ev
cd build/unix
make install DESTDIR=%d
if [ "%type_pkg[qt]" = "mac" ]; then
cd ../..
/bin/bash util/macosx_bundle.sh
%i/Applications/stellarium.app/Contents .
chmod -R o-w '%i/Applications/'
fi
<<
DescDetail: <<
Stellarium renders a real time, photorealistic 3D image of the sky using
OpenGL. Its features include:
Over 120000 stars from the Hipparcos Catalogue with name and info for
the brightest ones.
Planets and major satellites in real time, with a powerfull zoom mode
to see them like in a telescope.
Planet position computation now accurate enough for eclipse or transit
simulation.
Drawing of the 88 constellations with their names.
Textured displaying of more than 70 nebulas (Orion, M31 etc..).
Photorealistic Milky Way.
Ground, fog, and landscape.
Ultra fast realistic atmosphere rendering.
Automatic eye adaptation to luminance.
Star twinkling.
Smooth real time intuitive navigation.
Equatorial and altazimutal mode.
Fisheye projection mode (e.g for planetarium dome).
Grids in Equatorial and Azimuthal coordinates.
Time control (real time and accelered time modes).
Graphical menu for simple utilisation.
Clikable stars, planets and nebulas with information.
Ecliptic and celestrial equator lines.
Windowed and fullscreen modes.
<<
DescUsage: <<
stellarium-mac installs as %p/Applications/stellarium.app.
stellarium-x11 installs as %p/bin/stellarium.
<<
DocFiles: AUTHORS ChangeLog COPYING README
License: GPL2+
Homepage: http://stellarium.sourceforge.net/
<<
------------------------------------------------------------------------------
Using storage to extend the benefits of virtualization and iSCSI
Virtualization increases hardware utilization and delivers a new level of
agility. Learn what those decisions are and how to modernize your storage
and backup environments for virtualization.
http://www.accelacomm.com/jaw/sfnl/114/51434361/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
