Patch to build 1.5.1 with gcc 4.4.0

[boyarsh]

Hi!
I've made a patch to build celestia 1.5.1 with gcc 4.4.0. It isn't perfect, but it works.

With best regards and thanks to all celestia developers
--
Anton Boyarshinov, ALTLinux

[NIGHTCAST2000]

Hi Anton Boyarshinov and everybody else,

I stumbled upon this patch and tried it with the SVN version of Celestia in linux (Fedora 11 stable).After the program patch complained a bit,Celestia compiles successfully! I would like to thank Anton very,very,much!

Here is the opengl info:

Code: Select all

Vendor: Mesa Project
Renderer: Software Rasterizer
Version: 2.1 Mesa 7.6-devel
Max simultaneous textures: 8
Max texture size: 4096

Point size range: 1.000000 - 60.000000
Supported Extensions:
    GL_ARB_copy_buffer
    GL_ARB_depth_texture
    GL_ARB_draw_buffers
    GL_ARB_fragment_program
    GL_ARB_fragment_program_shadow
    GL_ARB_fragment_shader
    GL_ARB_framebuffer_object
    GL_ARB_half_float_pixel
    GL_ARB_imaging
    GL_ARB_multisample
    GL_ARB_multitexture
    GL_ARB_occlusion_query
    GL_ARB_pixel_buffer_object
    GL_ARB_point_parameters
    GL_ARB_point_sprite
    GL_ARB_shader_objects
    GL_ARB_shading_language_100
    GL_ARB_shading_language_120
    GL_ARB_shadow
    GL_ARB_shadow_ambient
    GL_ARB_texture_border_clamp
    GL_ARB_texture_compression
    GL_ARB_texture_cube_map
    GL_ARB_texture_env_add
    GL_ARB_texture_env_combine
    GL_ARB_texture_env_crossbar
    GL_ARB_texture_env_dot3
    GL_ARB_texture_mirrored_repeat
    GL_ARB_texture_non_power_of_two
    GL_ARB_texture_rectangle
    GL_ARB_transpose_matrix
    GL_ARB_vertex_buffer_object
    GL_ARB_vertex_program
    GL_ARB_vertex_shader
    GL_ARB_window_pos
    GL_EXT_abgr
    GL_EXT_bgra
    GL_EXT_blend_color
    GL_EXT_blend_equation_separate
    GL_EXT_blend_func_separate
    GL_EXT_blend_logic_op
    GL_EXT_blend_minmax
    GL_EXT_blend_subtract
    GL_EXT_compiled_vertex_array
    GL_EXT_convolution
    GL_EXT_copy_texture
    GL_EXT_depth_bounds_test
    GL_EXT_draw_range_elements
    GL_EXT_framebuffer_object
    GL_EXT_framebuffer_blit
    GL_EXT_fog_coord
    GL_EXT_gpu_program_parameters
    GL_EXT_histogram
    GL_EXT_multi_draw_arrays
    GL_EXT_packed_depth_stencil
    GL_EXT_packed_pixels
    GL_EXT_paletted_texture
    GL_EXT_pixel_buffer_object
    GL_EXT_point_parameters
    GL_EXT_polygon_offset
    GL_EXT_rescale_normal
    GL_EXT_secondary_color
    GL_EXT_separate_specular_color
    GL_EXT_shadow_funcs
    GL_EXT_shared_texture_palette
    GL_EXT_stencil_two_side
    GL_EXT_stencil_wrap
    GL_EXT_subtexture
    GL_EXT_texture
    GL_EXT_texture3D
    GL_EXT_texture_edge_clamp
    GL_EXT_texture_env_add
    GL_EXT_texture_env_combine
    GL_EXT_texture_env_dot3
    GL_EXT_texture_lod_bias
    GL_EXT_texture_mirror_clamp
    GL_EXT_texture_object
    GL_EXT_texture_rectangle
    GL_EXT_texture_sRGB
    GL_EXT_texture_swizzle
    GL_EXT_vertex_array
    GL_EXT_vertex_array_bgra
    GL_3DFX_texture_compression_FXT1
    GL_APPLE_packed_pixels
    GL_APPLE_vertex_array_object
    GL_ATI_blend_equation_separate
    GL_ATI_envmap_bumpmap
    GL_ATI_texture_env_combine3
    GL_ATI_texture_mirror_once
    GL_ATI_fragment_shader
    GL_ATI_separate_stencil
    GL_IBM_multimode_draw_arrays
    GL_IBM_rasterpos_clip
    GL_IBM_texture_mirrored_repeat
    GL_INGR_blend_func_separate
    GL_MESA_pack_invert
    GL_MESA_resize_buffers
    GL_MESA_texture_array
    GL_MESA_ycbcr_texture
    GL_MESA_window_pos
    GL_NV_blend_square
    GL_NV_fragment_program
    GL_NV_light_max_exponent
    GL_NV_point_sprite
    GL_NV_texture_env_combine4
    GL_NV_texture_rectangle
    GL_NV_texgen_reflection
    GL_NV_vertex_program
    GL_NV_vertex_program1_1
    GL_OES_read_format
    GL_SGI_color_matrix
    GL_SGI_color_table
    GL_SGI_texture_color_table
    GL_SGIS_generate_mipmap
    GL_SGIS_texture_border_clamp
    GL_SGIS_texture_edge_clamp
    GL_SGIS_texture_lod
    GL_SUN_multi_draw_arrays

I would like to point out that using Celestia with the Nouveau/Gallium 3d drivers is very sluggish at the moment.I am aware it's not celesias' fault and I'm just waiting for the source code(D.R.M to be sorted out and Mesa to compile completley)because it's not compiling with the lastet commits at the moment.

But all in all,I'm sure things can only get better after this

Regards,
NIGHTCAST2000

[John Van Vliet]

--- edit ---

[NIGHTCAST2000]

Hi John,
After I did a fresh install of Fedora 11,I tried to copy over my trunk/celestia folder from my windows side of my hardrive back into my newly created /opt folder,but unfortunately that didn't work.So I did a fresh pull from S.V.N.
After I did that,I ran

Code: Select all

autoreconf -iv

but I was still getting that pesky E.O.F error! I'll try and attach the build log in a .zip file before I applied the patch with this post.

I've already applied the patch to my S.V.N copy of celestia,I've tried to do a patch --dry-run(I'm not re-running the patch as normal,as I know that can lead to problems) I wished I had saved the output when I ran patch,but oh well...
I think the output and result from running the patch hasn't done any real harm.

Regards,
NIGHTCAST2000

[John Van Vliet]

--- edit ---