[Kstars-devel] branches/KDE/4.6/kdeedu

[Akarsh Simha]

SVN commit 1210036 by asimha:

Temporary fix of KStars, just in case I don't fix everything before
the 4.6 release.

If this is done, the only significant changes, if I remember, in 4.6
are fixing a lot of projection-related bugs, refraction code, moon
phase almanac and some cities.dat fixes. Maybe there are a couple
more, but I'm disabling OpenGL support.

Hopefully, before the final release, I should have an option to switch
to the "Beta" OpenGL rendering mode which will be a regression from a
feature POV, but will run much much faster, so that many users will
still be interested in that.

CCMAIL: kstars-devel at kde.org, hdevalence at gmail.com



 M  +6 -4      CMakeLists.txt  
 M  +2 -1      kstars/kstars/skymap.h  


--- branches/KDE/4.6/kdeedu/CMakeLists.txt #1210035:1210036
@@ -92,12 +92,14 @@
 
 macro_optional_find_package(Eigen2 2.0.3)
 macro_log_feature(EIGEN2_FOUND "Eigen2" "A generic C++ template library for dense and sparse matrices" "http://eigen.tuxfamily.org" FALSE "2.0.3" "Required to build Step and KStars.")
-macro_optional_find_package(OpenGL)
+
+## For the 4.6 release, keeping OGL disabled by default.
+#macro_optional_find_package(OpenGL)
 # Really, OpenGL should be optional to build KStars, but as it stands now, it is a requisite.
-macro_log_feature(OPENGL_FOUND "OpenGL" "3D Graphics Library" "http://www.opengl.org/" FALSE "" "Required to build KStars.")
-if( EIGEN2_FOUND AND OPENGL_FOUND )
+#macro_log_feature(OPENGL_FOUND "OpenGL" "3D Graphics Library" "http://www.opengl.org/" FALSE "" "Required to build KStars.")
+if( EIGEN2_FOUND )
    macro_optional_add_subdirectory(kstars)
-endif( EIGEN2_FOUND AND OPENGL_FOUND )
+endif( EIGEN2_FOUND )
 
 macro_optional_add_subdirectory(kalzium)
 if (EIGEN2_FOUND AND NOT WIN32)
--- branches/KDE/4.6/kdeedu/kstars/kstars/skymap.h #1210035:1210036
@@ -18,7 +18,8 @@
 #ifndef SKYMAP_H_
 #define SKYMAP_H_
 
-#define USEGL
+// Disable GL for KDE 4.6 release at the moment.
+// #define USEGL
 
 #include <QTimer>
 #ifdef USEGL