[SCM] Debian packaging of libopengl-perl branch, master, updated. upstream/0.66+dfsg-132-g386201d

Florian Schlichting fschlich at zedat.fu-berlin.de
Wed Jan 25 21:51:40 UTC 2012


The following commit has been merged in the master branch:
commit 180db0ec8d817c0a08d45ff64b8c97d0edbe9bab
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Wed Jan 25 22:32:29 2012 +0100

    debian/patches/add-gl_exclude.h: add back removed gl_exclude.h
    
    gl_exclude.h was removed from the upstream tarball in version 0.66,
    presumably because it is regenerated anyway during build.  This doesn't
    work in a build chroot, however, as xvfb does not support any OpenGL
    GLX extensions, and has been disabled in Debian for some time by
    disable-glversion.  In addition, generation of this file seems highly
    machine specific.
    
    Since the exclusions previously shipped by upstream likely define a
    least common denominator (and they are what we've been running with
    for years), simply add them back in.

diff --git a/debian/changelog b/debian/changelog
index 660823e..a87bdb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,8 @@ libopengl-perl (0.66+dfsg-1) UNRELEASED; urgency=low
 
   [ Florian Schlichting ]
   * Make rewriting Perl path in examples actually work.
+  * debian/patches/add-gl_exclude.h: re-add file removed upstream,
+    because it's impossible to generate in a build chroot.
 
  -- Fabrizio Regalli <fabreg at fabreg.it>  Fri, 05 Aug 2011 11:50:28 +0200
 
diff --git a/debian/patches/add-gl_exclude.h b/debian/patches/add-gl_exclude.h
new file mode 100644
index 0000000..8511161
--- /dev/null
+++ b/debian/patches/add-gl_exclude.h
@@ -0,0 +1,211 @@
+Description: add back removed gl_exclude.h
+ gl_exclude.h was removed from the upstream tarball, presumably because
+ it is regenerated anyway during build. This doesn't work in a build
+ chroot, however, as xvfb does not support any OpenGL GLX extensions,
+ and has been disabled in Debian for some time by disable-glversion.
+ In addition, generation of this file seems highly machine specific.
+ .
+ Since the exclusions previously shipped by upstream likely define a
+ least common denominator (and they are what we've been running with
+ for years), simply add them back in.
+Origin: upstream tarball, pre-0.66
+Forwarded: not-needed
+
+diff --git a/gl_exclude.h b/gl_exclude.h
+new file mode 100644
+index 0000000..b5d7426
+--- /dev/null
++++ b/gl_exclude.h
+@@ -0,0 +1,192 @@
++// OpenGL Extension Exclusions - may be modified before building.
++//
++// Generated for Mesa project: www.mesa3d.org, Mesa GLX Indirect
++// OpenGL v1.2 (1.5 Mesa 6.4), using FreeGLUT v20400
++
++#define NO_GL_VERSION_2_0
++#define NO_GL_VERSION_1_5
++#define NO_GL_VERSION_1_4
++#define NO_GL_VERSION_1_3
++#define NO_GL_3DFX_multisample
++#define NO_GL_3DFX_tbuffer
++#define NO_GL_3DFX_texture_compression_FXT1
++#define NO_GL_APPLE_client_storage
++#define NO_GL_APPLE_element_array
++#define NO_GL_APPLE_fence
++#define NO_GL_APPLE_specular_vector
++#define NO_GL_APPLE_transform_hint
++#define NO_GL_APPLE_vertex_array_object
++#define NO_GL_APPLE_vertex_array_range
++#define NO_GL_APPLE_ycbcr_422
++#define NO_GL_ARB_color_buffer_float
++#define NO_GL_ARB_draw_buffers
++#define NO_GL_ARB_fragment_program
++#define NO_GL_ARB_fragment_program_shadow
++#define NO_GL_ARB_fragment_shader
++#define NO_GL_ARB_half_float_pixel
++#define NO_GL_ARB_matrix_palette
++#define NO_GL_ARB_multisample
++#define NO_GL_ARB_occlusion_query
++#define NO_GL_ARB_pixel_buffer_object
++#define NO_GL_ARB_shader_objects
++#define NO_GL_ARB_shading_language_100
++#define NO_GL_ARB_texture_compression
++#define NO_GL_ARB_texture_float
++#define NO_GL_ARB_texture_non_power_of_two
++#define NO_GL_ARB_vertex_blend
++#define NO_GL_ARB_vertex_buffer_object
++#define NO_GL_ARB_vertex_program
++#define NO_GL_ARB_vertex_shader
++#define NO_GL_ATI_draw_buffers
++#define NO_GL_ATI_element_array
++#define NO_GL_ATI_envmap_bumpmap
++#define NO_GL_ATI_fragment_shader
++#define NO_GL_ATI_map_object_buffer
++#define NO_GL_ATI_pixel_format_float
++#define NO_GL_ATI_pn_triangles
++#define NO_GL_ATI_separate_stencil
++#define NO_GL_ATI_text_fragment_shader
++#define NO_GL_ATI_texture_float
++#define NO_GL_ATI_vertex_array_object
++#define NO_GL_ATI_vertex_attrib_array_object
++#define NO_GL_ATI_vertex_streams
++#define NO_GL_EXT_422_pixels
++#define NO_GL_EXT_blend_equation_separate
++#define NO_GL_EXT_cmyka
++#define NO_GL_EXT_color_matrix
++#define NO_GL_EXT_color_subtable
++#define NO_GL_EXT_compiled_vertex_array
++#define NO_GL_EXT_convolution
++#define NO_GL_EXT_coordinate_frame
++#define NO_GL_EXT_cull_vertex
++#define NO_GL_EXT_depth_bounds_test
++#define NO_GL_EXT_framebuffer_object
++#define NO_GL_EXT_histogram
++#define NO_GL_EXT_index_array_formats
++#define NO_GL_EXT_index_func
++#define NO_GL_EXT_index_material
++#define NO_GL_EXT_index_texture
++#define NO_GL_EXT_light_texture
++#define NO_GL_EXT_misc_attribute
++#define NO_GL_EXT_multisample
++#define NO_GL_EXT_paletted_texture
++#define NO_GL_EXT_pixel_buffer_object
++#define NO_GL_EXT_pixel_transform
++#define NO_GL_EXT_pixel_transform_color_table
++#define NO_GL_EXT_shared_texture_palette
++#define NO_GL_EXT_texture_filter_anisotropic
++#define NO_GL_EXT_texture_mirror_clamp
++#define NO_GL_EXT_texture_perturb_normal
++#define NO_GL_EXT_vertex_shader
++#define NO_GL_EXT_vertex_weighting
++#define NO_GL_GREMEDY_string_marker
++#define NO_GL_HP_convolution_border_modes
++#define NO_GL_HP_image_transform
++#define NO_GL_HP_texture_lighting
++#define NO_GL_IBM_cull_vertex
++#define NO_GL_IBM_multimode_draw_arrays
++#define NO_GL_IBM_rasterpos_clip
++#define NO_GL_IBM_vertex_array_lists
++#define NO_GL_INGR_color_clamp
++#define NO_GL_INGR_interlace_read
++#define NO_GL_INTEL_parallel_arrays
++#define NO_GL_MESA_resize_buffers
++#define NO_GL_MESA_window_pos
++#define NO_GL_NV_copy_depth_to_color
++#define NO_GL_NV_depth_clamp
++#define NO_GL_NV_evaluators
++#define NO_GL_NV_fence
++#define NO_GL_NV_float_buffer
++#define NO_GL_NV_fog_distance
++#define NO_GL_NV_fragment_program
++#define NO_GL_NV_fragment_program2
++#define NO_GL_NV_fragment_program_option
++#define NO_GL_NV_half_float
++#define NO_GL_NV_light_max_exponent
++#define NO_GL_NV_multisample_filter_hint
++#define NO_GL_NV_occlusion_query
++#define NO_GL_NV_packed_depth_stencil
++#define NO_GL_NV_pixel_data_range
++#define NO_GL_NV_primitive_restart
++#define NO_GL_NV_register_combiners
++#define NO_GL_NV_register_combiners2
++#define NO_GL_NV_texgen_emboss
++#define NO_GL_NV_texture_compression_vtc
++#define NO_GL_NV_texture_env_combine4
++#define NO_GL_NV_texture_expand_normal
++#define NO_GL_NV_texture_shader
++#define NO_GL_NV_texture_shader2
++#define NO_GL_NV_texture_shader3
++#define NO_GL_NV_vertex_array_range
++#define NO_GL_NV_vertex_array_range2
++#define NO_GL_NV_vertex_program
++#define NO_GL_NV_vertex_program1_1
++#define NO_GL_NV_vertex_program2
++#define NO_GL_NV_vertex_program2_option
++#define NO_GL_NV_vertex_program3
++#define NO_GL_OES_read_format
++#define NO_GL_OML_interlace
++#define NO_GL_OML_resample
++#define NO_GL_OML_subsample
++#define NO_GL_PGI_misc_hints
++#define NO_GL_PGI_vertex_hints
++#define NO_GL_REND_screen_coordinates
++#define NO_GL_S3_s3tc
++#define NO_GL_SGIS_detail_texture
++#define NO_GL_SGIS_fog_function
++#define NO_GL_SGIS_multisample
++#define NO_GL_SGIS_pixel_texture
++#define NO_GL_SGIS_point_line_texgen
++#define NO_GL_SGIS_point_parameters
++#define NO_GL_SGIS_sharpen_texture
++#define NO_GL_SGIS_texture4D
++#define NO_GL_SGIS_texture_color_mask
++#define NO_GL_SGIS_texture_filter4
++#define NO_GL_SGIX_async
++#define NO_GL_SGIX_async_histogram
++#define NO_GL_SGIX_async_pixel
++#define NO_GL_SGIX_blend_alpha_minmax
++#define NO_GL_SGIX_calligraphic_fragment
++#define NO_GL_SGIX_clipmap
++#define NO_GL_SGIX_convolution_accuracy
++#define NO_GL_SGIX_depth_pass_instrument
++#define NO_GL_SGIX_flush_raster
++#define NO_GL_SGIX_fog_offset
++#define NO_GL_SGIX_fog_scale
++#define NO_GL_SGIX_fragment_lighting
++#define NO_GL_SGIX_framezoom
++#define NO_GL_SGIX_igloo_interface
++#define NO_GL_SGIX_instruments
++#define NO_GL_SGIX_interlace
++#define NO_GL_SGIX_ir_instrument1
++#define NO_GL_SGIX_list_priority
++#define NO_GL_SGIX_pixel_texture
++#define NO_GL_SGIX_pixel_tiles
++#define NO_GL_SGIX_polynomial_ffd
++#define NO_GL_SGIX_reference_plane
++#define NO_GL_SGIX_resample
++#define NO_GL_SGIX_scalebias_hint
++#define NO_GL_SGIX_sprite
++#define NO_GL_SGIX_subsample
++#define NO_GL_SGIX_tag_sample_buffer
++#define NO_GL_SGIX_texture_add_env
++#define NO_GL_SGIX_texture_coordinate_clamp
++#define NO_GL_SGIX_texture_lod_bias
++#define NO_GL_SGIX_texture_multi_buffer
++#define NO_GL_SGIX_texture_scale_bias
++#define NO_GL_SGIX_texture_select
++#define NO_GL_SGIX_vertex_preclip
++#define NO_GL_SGIX_ycrcb
++#define NO_GL_SGIX_ycrcb_subsample
++#define NO_GL_SGIX_ycrcba
++#define NO_GL_SGI_color_table
++#define NO_GL_SGI_texture_color_table
++#define NO_GL_SUNX_constant_data
++#define NO_GL_SUN_convolution_border_modes
++#define NO_GL_SUN_global_alpha
++#define NO_GL_SUN_mesh_array
++#define NO_GL_SUN_slice_accum
++#define NO_GL_SUN_triangle_list
++#define NO_GL_SUN_vertex
++#define NO_GL_WIN_phong_shading
++#define NO_GL_WIN_specular_fog
diff --git a/debian/patches/series b/debian/patches/series
index 05b13a0..6ba8a61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 disable-glversion
+add-gl_exclude.h
 glext_procs-replacement
 use-systems-gl

-- 
Debian packaging of libopengl-perl



More information about the Pkg-perl-cvs-commits mailing list