Ticket #390: celestia-1.6.0.patch

configure.in

@@ -193 +193 @@
 AM_CONDITIONAL(ENABLE_SPICE, test "$SPICELIB" != "")
 
 
-LIBS="$LIBS -lm"
+LIBS="$LIBS -lintl"
 
 dnl Use Gtk if requested
 GTK_LIBS=""
@@ -237 +237 @@
 CFLAGS="$CFLAGS $CELESTIAFLAGS $CELESTIA_CFLAGS"
 CXXFLAGS="$CXXFLAGS $CELESTIAFLAGS $CELESTIA_CXXFLAGS"
 LIBS="$LIBS $CELESTIALIBS"
-LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lXmu -lXi -lXext -lX11 -lm -lz $X_EXTRA_LIBS"
+LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lz $X_EXTRA_LIBS"
 
 dnl Check for zlib -- libGL requires it.
 AC_CHECK_LIB(z, deflate, ,

data/Makefile.am

@@ -15 +15 @@
         $(wildcard *.xyz) \
         $(wildcard *.xyzv) \
         $(wildcard *.dsc) \
-        $(wildcard *.stc) \
-        stars.dat
+        $(wildcard *.stc)
 
 EXTRA_DIST = \
         $(pkgdata_DATA) \

src/celengine/astro.cpp

@@ -522 +522 @@
     cal_time.tm_sec = (int)seconds;
     cal_time.tm_wday = wday;
     cal_time.tm_gmtoff = utc_offset;
-#if defined(TARGET_OS_MAC) || defined(__FreeBSD__)
+#if defined(TARGET_OS_MAC) || defined(__FreeBSD__) || defined(__HAIKU__)
     // tm_zone is a non-const string field on the Mac and FreeBSD (why?)
     cal_time.tm_zone = const_cast<char*>(tzname.c_str());
 #else

src/celengine/glext.cpp

@@ -12 +12 @@
 
 #ifndef _WIN32
 // Assume that this is a UNIX/X11 system if it's not Windows or Mac OS X.
-#ifndef TARGET_OS_MAC
+#if !defined(TARGET_OS_MAC) && !defined(__HAIKU__)
 #include "GL/glx.h"
 #include <dlfcn.h>
-#endif /* ! TARGET_OS_MAC */
+#endif /* ! TARGET_OS_MAC || HAIKU */
 #endif /* ! _WIN32 */
 
 #include "glext.h"
@@ -306 +306 @@
 
 #else
 
-#ifndef TARGET_OS_MAC
+#if !defined(TARGET_OS_MAC) && !defined(__HAIKU__)
 #if defined(_WIN32)
 
 #define GET_GL_PROC_ADDRESS(name) wglGetProcAddress(name)
@@ -692 +692 @@
 
 static void InitExt_GLX_SGI_video_sync()
 {
+#if defined(GET_GL_PROC_ADDRESS)
     glx::glXGetVideoSyncSGI = (glx::PFNGLXGETVIDEOSYNCSGIPROC) GET_GL_PROC_ADDRESS("glXGetVideoSyncSGI");
     glx::glXWaitVideoSyncSGI = (glx::PFNGLXWAITVIDEOSYNCSGIPROC) GET_GL_PROC_ADDRESS("glXWaitVideoSyncSGI");
     glx::glXGetRefreshRateSGI = (glx::PFNGLXGETREFRESHRATESGIPROC) GET_GL_PROC_ADDRESS("glXGetRefreshRateSGI");
+#endif
 }
 
 

src/celengine/image.cpp

@@ -737 +737 @@
 
     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
     {
-        png_set_gray_1_2_4_to_8(png_ptr);
+        png_set_expand_gray_1_2_4_to_8(png_ptr);
     }
 
     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))

src/celutil/unixdirectory.cpp

@@ -11 +11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
+#if !defined(__HAIKU__)
 #include <wordexp.h>
+#endif
 #include "directory.h"
 
 using namespace std;
 
 
-#ifdef TARGET_OS_MAC
-#ifdef QT_CORE_LIB
+#if defined(__HAIKU__) || defined(TARGET_OS_MAC) && defined(QT_CORE_LIB)
 // Crash on Mac OS X / Qt4 version when calling wordfree.
 // This seems to happen only with Leopard.
 #define WORDEXP_PROBLEM
 #endif
-#endif
 
 class UnixDirectory : public Directory
 {