Celestia Forums

Hello!

I have built the latest SVN of Celestia under Intrepid, but it required some changes - mostly I think because GCC is a newer version.
I had to #include <libintl.h> in quite a few places, and also <cstring>. In one place I had to change Std::time to just "time", but I think this may just be for GCC, so I put it in a #ifdef for _WIN32.

For anyone else trying to build this, here are the libs needed:

build-essential libtheora-dev liblua5.1-0-dev libgl1-mesa-dev libglut3-dev libgnomeui-dev libgtkglext1-dev libjpeg62-dev

zlib1g-dev

After installing zlib, configure kept complaining about it not being installed, but config.log revealed that it was libxmu-dev that was missing. The error I was getting was:

configure: error: zlib not found.

So I installed: libxmu-dev

I then ran: ./configure --with-gnome --with-lua --enable-theora

The source changes I made to get it to compile are against SVN r4534. Since there is no clue as to what extensions I can upload here, I will paste the unified diff that SVN generated below. Perhaps these can be reviewed and merged? I can't test it on anything but GCC 4.3.2.

----8<---- snip ----8<----

Index: src/celestia/eclipsefinder.cpp
===================================================================
--- src/celestia/eclipsefinder.cpp (revision 4534)
+++ src/celestia/eclipsefinder.cpp (working copy)
@@ -10,7 +10,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

-#include <string>
+#include <cstring>
#include <sstream>
#include <algorithm>
#include <set>
Index: src/celestia/celestiacore.cpp
===================================================================
--- src/celestia/celestiacore.cpp (revision 4534)
+++ src/celestia/celestiacore.cpp (working copy)
@@ -13,6 +13,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
#include <cstdio>
#include <iostream>
#include <fstream>
Index: src/celestia/url.cpp
===================================================================
--- src/celestia/url.cpp (revision 4534)
+++ src/celestia/url.cpp (working copy)
@@ -15,7 +15,8 @@
* *
***************************************************************************/

-#include <string>
+#include <libintl.h>
+#include <cstring>
#include <cstdio>
#include <cassert>
#include <sstream>
Index: src/celestia/oggtheoracapture.cpp
===================================================================
--- src/celestia/oggtheoracapture.cpp (revision 4534)
+++ src/celestia/oggtheoracapture.cpp (working copy)
@@ -59,13 +59,14 @@
# define _REENTRANT
#endif

+#include <libintl.h>
#include <cstdlib>
#include <cstdio>
#include <cmath>
#include <celutil/debug.h>
#include <celutil/util.h>
#include "../celengine/gl.h"
-#include <string>
+#include <cstring>
#include "theora/theora.h"

using namespace std;
@@ -159,7 +160,12 @@
return false;
}
/* Set up Ogg output stream */
- std::srand(std::time(NULL));
+ #ifdef _WIN32
+ std::srand(std::time(NULL));
+ #else
+ std::srand(time(NULL));
+ #endif
+
ogg_stream_init(&to,std::rand());

frame_x = w;
Index: src/celestia/celx_object.cpp
===================================================================
--- src/celestia/celx_object.cpp (revision 4534)
+++ src/celestia/celx_object.cpp (working copy)
@@ -9,6 +9,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <cstring>
#include "celx.h"
#include "celx_internal.h"
#include "celx_object.h"
Index: src/celengine/location.cpp
===================================================================
--- src/celengine/location.cpp (revision 4534)
+++ src/celengine/location.cpp (working copy)
@@ -7,6 +7,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
#include <map>
#include <celengine/location.h>
#include <celengine/body.h>
Index: src/celengine/body.cpp
===================================================================
--- src/celengine/body.cpp (revision 4534)
+++ src/celengine/body.cpp (working copy)
@@ -7,6 +7,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
#include <cstdlib>
#include <cassert>
#include <algorithm>
Index: src/celengine/texture.cpp
===================================================================
--- src/celengine/texture.cpp (revision 4534)
+++ src/celengine/texture.cpp (working copy)
@@ -21,6 +21,7 @@
#endif
#endif

+#include <libintl.h>
#include <cmath>
#include <algorithm>
#include <iostream>
Index: src/celengine/opencluster.cpp
===================================================================
--- src/celengine/opencluster.cpp (revision 4534)
+++ src/celengine/opencluster.cpp (working copy)
@@ -7,6 +7,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
#include <algorithm>
#include <stdio.h>
#include "celestia.h"
Index: src/celengine/nebula.cpp
===================================================================
--- src/celengine/nebula.cpp (revision 4534)
+++ src/celengine/nebula.cpp (working copy)
@@ -7,6 +7,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
#include <algorithm>
#include <stdio.h>
#include "celestia.h"
Index: src/celengine/stardb.cpp
===================================================================
--- src/celengine/stardb.cpp (revision 4534)
+++ src/celengine/stardb.cpp (working copy)
@@ -7,6 +7,8 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
+#include <cstring>
#include <cmath>
#include <cstdlib>
#include <cstdio>
Index: src/celengine/globular.cpp
===================================================================
--- src/celengine/globular.cpp (revision 4534)
+++ src/celengine/globular.cpp (working copy)
@@ -11,6 +11,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
#include <fstream>
#include <algorithm>
#include <cstdio>
Index: src/celengine/asterism.cpp
===================================================================
--- src/celengine/asterism.cpp (revision 4534)
+++ src/celengine/asterism.cpp (working copy)
@@ -7,6 +7,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
#include <algorithm>

#ifndef _WIN32
Index: src/celengine/solarsys.cpp
===================================================================
--- src/celengine/solarsys.cpp (revision 4534)
+++ src/celengine/solarsys.cpp (working copy)
@@ -9,6 +9,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
#include <cassert>
// #include <limits>
#include <cstdio>
Index: src/celengine/image.cpp
===================================================================
--- src/celengine/image.cpp (revision 4534)
+++ src/celengine/image.cpp (working copy)
@@ -8,6 +8,7 @@
// of the License, or (at your option) any later version.

#include <fstream>
+#include <libintl.h>

#ifndef TARGET_OS_MAC
#define JPEG_SUPPORT
Index: src/celengine/galaxy.cpp
===================================================================
--- src/celengine/galaxy.cpp (revision 4534)
+++ src/celengine/galaxy.cpp (working copy)
@@ -7,6 +7,8 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <cstring>
+#include <libintl.h>
#include <fstream>
#include <algorithm>
#include <cstdio>
Index: src/celengine/fragmentprog.cpp
===================================================================
--- src/celengine/fragmentprog.cpp (revision 4534)
+++ src/celengine/fragmentprog.cpp (working copy)
@@ -7,6 +7,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
#include <iostream>
#include <fstream>
#include <string>
Index: src/celengine/vertexprog.cpp
===================================================================
--- src/celengine/vertexprog.cpp (revision 4534)
+++ src/celengine/vertexprog.cpp (working copy)
@@ -7,6 +7,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
#include <iostream>
#include <fstream>
#include <string>
Index: src/celengine/overlay.cpp
===================================================================
--- src/celengine/overlay.cpp (revision 4534)
+++ src/celengine/overlay.cpp (working copy)
@@ -7,6 +7,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <cstring>
#include <cstdarg>
#include <cstdio>
#include <celutil/utf8.h>
Index: src/celengine/dsodb.cpp
===================================================================
--- src/celengine/dsodb.cpp (revision 4534)
+++ src/celengine/dsodb.cpp (working copy)
@@ -10,6 +10,7 @@
//
//

+#include <libintl.h>
#include <cmath>
#include <cstdlib>
#include <cstdio>
Index: src/celengine/console.cpp
===================================================================
--- src/celengine/console.cpp (revision 4534)
+++ src/celengine/console.cpp (working copy)
@@ -7,6 +7,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <cstring>
#include <cstdarg>
#include <cstdio>
#include <cassert>
Index: src/celengine/meshmanager.cpp
===================================================================
--- src/celengine/meshmanager.cpp (revision 4534)
+++ src/celengine/meshmanager.cpp (working copy)
@@ -10,6 +10,7 @@
// Experimental particle system support
#define PARTICLE_SYSTEM 0

+#include <libintl.h>
#include <iostream>
#include <fstream>
#include <cassert>
Index: src/celengine/astro.cpp
===================================================================
--- src/celengine/astro.cpp (revision 4534)
+++ src/celengine/astro.cpp (working copy)
@@ -7,6 +7,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <cstring>
#include <cmath>
#include <iomanip>
#include <cstdio>
Index: src/celutil/utf8.cpp
===================================================================
--- src/celutil/utf8.cpp (revision 4534)
+++ src/celutil/utf8.cpp (working copy)
@@ -9,6 +9,7 @@

#include "utf8.h"
#include <cctype>
+#include <cstring>
#include "util.h"

unsigned int WGL4_Normalization_00[256] = {
Index: src/celutil/formatnum.cpp
===================================================================
--- src/celutil/formatnum.cpp (revision 4534)
+++ src/celutil/formatnum.cpp (working copy)
@@ -9,7 +9,9 @@

#include <cmath>
#include <cstdio>
-#include <string>
+#include <climits>
+#include <cstring>
+
#include "formatnum.h"

// HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf
Index: src/celutil/util.cpp
===================================================================
--- src/celutil/util.cpp (revision 4534)
+++ src/celutil/util.cpp (working copy)
@@ -9,6 +9,7 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

+#include <libintl.h>
#include "util.h"
#include <sys/types.h>
#include <sys/stat.h>

I tried these instructions. However I can't get the configure script to run using --with-gnome:

configure: error: conditional "include_x11" was never defined.
Usually this means the macro was only invoked conditionally.

The diff list supplied doesn't work with the KDE version, looks like there is much more to patch there

On the other hand, I have got the Qt4 version to compile properly, and it does need those diffs.

ajtribick wrote:On the other hand, I have got the Qt4 version to compile properly, and it does need those diffs.

Andrew,

Could you commit these diffs? This has been on the 1.6.0 TODO list forever, and I haven't done it, because I don't have a Linux system to build on and verify that they work.

--Chris

ajtribick wrote:I tried these instructions. However I can't get the configure script to run using --with-gnome:

configure: error: conditional "include_x11" was never defined.
Usually this means the macro was only invoked conditionally.

The diff list supplied doesn't work with the KDE version, looks like there is much more to patch there

I don't think this had any thing to do with the patch. I got the same error before and after the patch with--gnome and --gtk. I think these error have something to do with a commit 3 weeks ago (r4508) and a change to admin/acinclude.m4.in on line 897. EDIT****** I removed lines 896 and 897 and that gets gtk and gnome to configure. I didn't include that in the patch below though.
After I got gnome and gtk to configure, gtk and gnome worked with and without the patch.

I am able to build kde without problems with or without the patch.
QT4 works with or without the patch too. GCC 4.1.2.
Here is the patch I used to make sure all was present. I couldn't get it to work by copying the text above so I changed each file manually and ran svn diff. So this is to make sure I didn't miss anything.



cartrite

--- edit ---

ajtribick wrote:On the other hand, I have got the Qt4 version to compile properly, and it does need those diffs.

Andrew,

I don't understand that statement. I am compiling the Qt4, KDE, Gnome, GTK celestia versions from SVN almost daily under Linux (OpenSuSE 10.3, gcc 4.2.1), whenever there has been a change. I never encountered a serious problem as you seem to indicate with Qt4.

Analogously, you have reported persistent problems compiling Celestia-Qt4 under Windows. Also here, using Qt-4.4.3 and BOTH Virtual Studio 2005 Express and Virtual Studio 2008 Express, the Qt version builds without complaints.

Fridger

t00fri wrote:Andrew,

I don't understand that statement. I am compiling the Qt4, KDE, Gnome, GTK celestia versions from SVN almost daily under Linux (OpenSuSE 10.3, gcc 4.2.1), whenever there has been a change. I never encountered a serious problem as you seem to indicate with Qt4.

Analogously, you have reported persistent problems compiling Celestia-Qt4 under Windows. Also here, using Qt-4.4.3 and BOTH Virtual Studio 2005 Express and Virtual Studio 2008 Express, the Qt version builds without complaints.

Fridger

Indeed, I had been compiling without any problems on (X)ubuntu Hardy. However in Intrepid the compiler and libraries are a different version and it throws a whole bunch of errors. The Windows compiling problems were to do with various incompatible versions of the DLL files floating around.

I verify that commenting out line 897 in admin/acinclude.m4.in fixes the GNOME configuration problem.

Note also that cartrite's patch appears to be incomplete: it doesn't include the change for nebula.cpp.

ajtribick wrote:

t00fri wrote:Andrew,

I don't understand that statement. I am compiling the Qt4, KDE, Gnome, GTK celestia versions from SVN almost daily under Linux (OpenSuSE 10.3, gcc 4.2.1), whenever there has been a change. I never encountered a serious problem as you seem to indicate with Qt4.

Analogously, you have reported persistent problems compiling Celestia-Qt4 under Windows. Also here, using Qt-4.4.3 and BOTH Virtual Studio 2005 Express and Virtual Studio 2008 Express, the Qt version builds without complaints.

Fridger

Indeed, I had been compiling without any problems on (X)ubuntu Hardy. However in Intrepid the compiler and libraries are a different version and it throws a whole bunch of errors. The Windows compiling problems were to do with various incompatible versions of the DLL files floating around.

I verify that commenting out line 897 in admin/acinclude.m4.in fixes the GNOME compilation problem.

Note also that cartrite's patch appears to be incomplete: it doesn't include the change for nebula.cpp.

But when I look at the above patch, it does NOT seem to be related to version upgrades.
Perhaps you could list some typical errors you are getting without the above patch. Anyway, as usual, with the latest SVN 4538, I get NO complaints whatsoever with kde, gtk and gnome versions.

I don't use internationalization, hence I can't make a statement about the necessity of libintl.h in so many new places.

What gcc version are you using now on Intrepid?

Fridger

Ok, I've managed to get both Gnome and KDE working: some of the KDE files require addition of libintl.h. The output of svn diff src/ is attached. To get the GNOME version to compile, the edits to admin/acinclude.m4.in mentioned upthread also need to be applied (this is not in the following diff)

t00fri wrote:Perhaps you could list some typical errors you are getting without the above patch. Anyway, as usual, with the latest SVN 4538, I get NO complaints whatsoever with kde, gtk and gnome versions.

Error: 'gettext' was not declared in this scope

I don't use internationalization, hence I can't make a statement about the necessity of libintl.h in so many new places.

What gcc version are you using now on Intrepid?

Synaptic reports 4:4.3.1-1ubuntu2 for gcc and g++

I might mention in addition that under Linux, my system has been automatically upgraded ('smart') to libtheora-1.0final and celestia-{kde,gnome,gtk} now run (SVN 4538) without problems under that finalized theora library. I checked out a 16:9 aspect ratio with the vlc player...no problems.

Fridger

I figured I might have missed one or 2. Since nebula.cpp only added a line and didn't subtract or changed any other lines, I think it is save to say the it works on my system the same as before. I did check it with gnome. and the complete patch worked.

I was worried about the changing <string> to <cstring> and the

In one place I had to change Std::time to just "time"

stuff.

Fridger, I'm not sure how you were able to build gtk or gnome. I had to take out line 897 in admin/acinclude.m4.in or I got the same error as Andrew.

configure: error: conditional "include_x11" was never defined.
Usually this means the macro was only invoked conditionally.
make: *** No targets specified and no makefile found. Stop.
make: *** No rule to make target `install'. Stop.

This may have something to do with autoconf (2.60) or automake (1.9.6) versions I have installed.

cartrite

Correction:
I build Celestia on Linux with simple build scripts and I only got the "include_x11" error when I ran scripts that started like this.

#!/bin/sh
cd celestia
make -f Makefile.cvs
./configure --prefix=/home/cartrite/share/celestia/test --with-gnome

When I ran a script that started with this, the "x11_include" error did not appear, configure ran and so did the rest of the build.

#!/bin/sh
cd celestia
autoreconf -iv
./configure --prefix=/home/cartrite/share/celestia/test --with-gnome

cartrite

Well you have to do it right, of course .
For curiosity, I reconfigured/rebuilt all three linux flavors of SVN 4538 about 2 hours ago. As I wrote: no complaints whatsoever.

I use:
automake-1.10-46
autoconf-2.61-47

Fridger

I was able to build with "make -f Makefile.cvs" for a long time now without any problems. I don't build gnome or gtk regularly, but occasionally I do.

Now I can't build with "make -f Makefile.cvs" when I build the gtk or gnome interfaces. I can still build with "make -f Makefile.cvs" when I build with kde. I stopped building with "autoreconf -iv" a while back because I get a ton of warnings when I do. But it still builds.

Since the code change on line 897 in admin/acinclude.m4.in breaks some build methods for some linux users, shouldn't that be fixed to "define include_x11" so it satisfies all the formally supported methods? Or maybe the file "Makefile.cvs" should be removed.
cartrite

I verify that using autoreconf -iv instead of make -f Makefile.cvs results in ./configure --with-gnome working.

Without applying the patches in my post upthread, this is the output after entering the "make" command... (I have removed the path to the directory where the SVN checkout is from the entering/leaving directory messages)

But this error is unrelated to <libintl.h> of which you said previously that it was the main cause for problems?? I am confused...

The above error rather seems to be associated with a replacement
of #include <string> by #include <cstring>

But the listed errors are so basic (e.g. strlen undeclared!!) that it seems hard to believe that myself and many others did not encounter any problems before in that routine without invoking #include <cstring>.

++++++++++++++++++
I think before implementing such massive mods, someone should thoroughly understand WHAT is going on here with your Intrepid distribution?
+++++++++++++++++++

I suppose this is all independent of "Intrepid" but a direct consequence of using gcc 4.4.x
and associated libs/headers, rather than gcc 4.2.x.

Andrew wrote:Synaptic reports 4:4.3.1-1ubuntu2 for gcc and g++

Actually the gcc version and more you get simply by typing
> gcc -v

Fridger

Further point, if I use autoreconf -iv instead of make -f Makefile.cvs, although ./configure --with-gnome runs ok, the compilation doesn't...

The only way I can get the GNOME version to build is by editing admin/acinclude.m4.in then running

make -f Makefile.cvs
./configure --with-gnome
make

t00fri wrote:But this error is unrelated to <libintl.h> of which you said previously that it was the main cause for problems?? I am confused...

The above error rather seems to be associated with a replacement
of #include <string> by #include <cstring>

See the first post in this thread... lesliev indicates that in several files, #include <string> had to be changed to #include <cstring>

t00fri wrote:++++++++++++++++++
I think before implementing such massive mods, someone should thoroughly understand WHAT is going on here with your Intrepid distribution?
+++++++++++++++++++

Indeed... that is precisely why I am not committing anything!!!

The patch that changes "#include <string>" to "#include <cstring>" or adds "#include <libintl.h>" has no affect on my build system. The builds proceed normally with or without those changes. If adding in this patch fixes problems with the Intrepid distribution, fine. It doesn't break my OpenSuse 10.2 distribution's build system. That is why I tested to see if it would.

My only concern is the change made to admin/acinclude.m4.in a few weeks ago. This does break a build method I used by invoking "make -f Makefile.cvs"
cartrite

ajtribick wrote:I verify that using autoreconf -iv instead of make -f Makefile.cvs results in ./configure --with-gnome working.

Without applying the patches in my post upthread, this is the output after entering the "make" command.

Did it work with the patch and not editing admin/acinclude.m4.in after running autoreconf -iv?
cartrite