* [bug#43654] [PATCH] Add perl-opengl
2020-09-27 19:06 [bug#43654] [PATCH] Add perl-opengl Malte Frank Gerdes
@ 2020-10-02 4:13 ` Kei Kebreau
2020-10-02 17:59 ` Malte Frank Gerdes
` (2 more replies)
2020-10-05 8:10 ` Malte Frank Gerdes
2020-10-07 18:20 ` Malte Frank Gerdes
2 siblings, 3 replies; 17+ messages in thread
From: Kei Kebreau @ 2020-10-02 4:13 UTC (permalink / raw)
To: Malte Frank Gerdes; +Cc: 43654
[-- Attachment #1: Type: text/plain, Size: 13191 bytes --]
Malte Frank Gerdes <malte.f.gerdes@gmail.com> writes:
> Hi,
>
Hi Malte!
> this patch adds perl-opengl to guix. The glversion.txt is taken straight
> from nixpkgs (i didn't see any copyright notices, so this is ok?).
>
I think we can assume that the same MIT license in the root directory of
the nixpkgs repository also applies to the unmarked files in the
repository.
> This is the first time for me sending a patch to this list, i hope i
> haven't forgotten anything :)
>
> Malte
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index f3b5b17e84..001b249e9e 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -37,6 +37,7 @@
> # Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
> # Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
> # Copyright © 2020 Martin Becze <mjbecze@riseup.net>
> +# Copyright © 2020 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
> #
> # This file is part of GNU Guix.
> #
> @@ -1406,6 +1407,7 @@ dist_patch_DATA = \
> %D%/packages/patches/pam-mount-luks2-support.patch \
> %D%/packages/patches/pango-skip-libthai-test.patch \
> %D%/packages/patches/pciutils-hurd-configure.patch \
> + %D%/packages/patches/perl-opengl-makefile.patch \
> %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
> %D%/packages/patches/samba-fix-fcntl-hint-detection.patch \
> %D%/packages/patches/sdl-pango-api_additions.patch \
> diff --git a/gnu/packages/aux-files/perl-opengl/glversion.txt b/gnu/packages/aux-files/perl-opengl/glversion.txt
> new file mode 100644
> index 0000000000..5b5a9a911f
> --- /dev/null
> +++ b/gnu/packages/aux-files/perl-opengl/glversion.txt
> @@ -0,0 +1,5 @@
> +GLUT=20801
> +VERSION=3.0 Mesa 10.2.6
> +VENDOR=Intel Open Source Technology Center
> +RENDERER=Mesa DRI Intel(R) Ivybridge Mobile
> +EXTENSIONS=GL_ARB_multisample GL_EXT_abgr GL_EXT_bgra GL_EXT_blend_color GL_EXT_blend_minmax GL_EXT_blend_subtract GL_EXT_copy_texture GL_EXT_polygon_offset GL_EXT_subtexture GL_EXT_texture_object GL_EXT_vertex_array GL_EXT_compiled_vertex_array GL_EXT_texture GL_EXT_texture3D GL_IBM_rasterpos_clip GL_ARB_point_parameters GL_EXT_draw_range_elements GL_EXT_packed_pixels GL_EXT_point_parameters GL_EXT_rescale_normal GL_EXT_separate_specular_color GL_EXT_texture_edge_clamp GL_SGIS_generate_mipmap GL_SGIS_texture_border_clamp GL_SGIS_texture_edge_clamp GL_SGIS_texture_lod GL_ARB_framebuffer_sRGB GL_ARB_multitexture GL_EXT_framebuffer_sRGB GL_IBM_multimode_draw_arrays GL_IBM_texture_mirrored_repeat GL_3DFX_texture_compression_FXT1 GL_ARB_texture_cube_map GL_ARB_texture_env_add GL_ARB_transpose_matrix GL_EXT_blend_func_separate GL_EXT_fog_coord GL_EXT_multi_draw_arrays GL_EXT_secondary_color GL_EXT_texture_env_add GL_EXT_texture_filter_anisotropic GL_EXT_texture_lod_bias GL_INGR_blend_func_separate GL_NV_blend_square GL_NV_light_max_exponent GL_NV_texgen_reflection GL_NV_texture_env_combine4 GL_S3_s3tc GL_SUN_multi_draw_arrays GL_ARB_texture_border_clamp GL_ARB_texture_compression GL_EXT_framebuffer_object GL_EXT_texture_compression_s3tc GL_EXT_texture_env_combine GL_EXT_texture_env_dot3 GL_MESA_window_pos GL_NV_packed_depth_stencil GL_NV_texture_rectangle GL_ARB_depth_texture GL_ARB_occlusion_query GL_ARB_shadow GL_ARB_texture_env_combine GL_ARB_texture_env_crossbar GL_ARB_texture_env_dot3 GL_ARB_texture_mirrored_repeat GL_ARB_window_pos GL_ATI_envmap_bumpmap GL_EXT_stencil_two_side GL_EXT_texture_cube_map GL_NV_depth_clamp GL_APPLE_packed_pixels GL_APPLE_vertex_array_object GL_ARB_draw_buffers GL_ARB_fragment_program GL_ARB_fragment_shader GL_ARB_shader_objects GL_ARB_vertex_program GL_ARB_vertex_shader GL_ATI_draw_buffers GL_ATI_texture_env_combine3 GL_ATI_texture_float GL_EXT_shadow_funcs GL_EXT_stencil_wrap GL_MESA_pack_invert GL_NV_primitive_restart GL_ARB_depth_clamp GL_ARB_fragment_program_shadow GL_ARB_half_float_pixel GL_ARB_occlusion_query2 GL_ARB_point_sprite GL_ARB_shading_language_100 GL_ARB_sync GL_ARB_texture_non_power_of_two GL_ARB_vertex_buffer_object GL_ATI_blend_equation_separate GL_EXT_blend_equation_separate GL_OES_read_format GL_ARB_color_buffer_float GL_ARB_pixel_buffer_object GL_ARB_texture_compression_rgtc GL_ARB_texture_float GL_ARB_texture_rectangle GL_EXT_packed_float GL_EXT_pixel_buffer_object GL_EXT_texture_compression_dxt1 GL_EXT_texture_compression_rgtc GL_EXT_texture_rectangle GL_EXT_texture_sRGB GL_EXT_texture_shared_exponent GL_ARB_framebuffer_object GL_EXT_framebuffer_blit GL_EXT_framebuffer_multisample GL_EXT_packed_depth_stencil GL_APPLE_object_purgeable GL_ARB_vertex_array_object GL_ATI_separate_stencil GL_EXT_draw_buffers2 GL_EXT_draw_instanced GL_EXT_gpu_program_parameters GL_EXT_texture_array GL_EXT_texture_integer GL_EXT_texture_sRGB_decode GL_EXT_timer_query GL_OES_EGL_image GL_AMD_performance_monitor GL_ARB_copy_buffer GL_ARB_depth_buffer_float GL_ARB_draw_instanced GL_ARB_half_float_vertex GL_ARB_instanced_arrays GL_ARB_map_buffer_range GL_ARB_texture_rg GL_ARB_texture_swizzle GL_ARB_vertex_array_bgra GL_EXT_texture_swizzle GL_EXT_vertex_array_bgra GL_NV_conditional_render GL_AMD_conservative_depth GL_AMD_draw_buffers_blend GL_AMD_seamless_cubemap_per_texture GL_ARB_ES2_compatibility GL_ARB_blend_func_extended GL_ARB_debug_output GL_ARB_draw_buffers_blend GL_ARB_draw_elements_base_vertex GL_ARB_explicit_attrib_location GL_ARB_fragment_coord_conventions GL_ARB_provoking_vertex GL_ARB_sample_shading GL_ARB_sampler_objects GL_ARB_seamless_cube_map GL_ARB_shader_texture_lod GL_ARB_texture_cube_map_array GL_ARB_texture_gather GL_ARB_texture_multisample GL_ARB_texture_query_lod GL_ARB_texture_rgb10_a2ui GL_ARB_uniform_buffer_object GL_ARB_vertex_type_2_10_10_10_rev GL_EXT_provoking_vertex GL_EXT_texture_snorm GL_MESA_texture_signed_rgba GL_ARB_get_program_binary GL_ARB_robustness GL_ARB_separate_shader_objects GL_ARB_shader_bit_encoding GL_ARB_timer_query GL_ARB_transform_feedback2 GL_ARB_transform_feedback3 GL_ANGLE_texture_compression_dxt3 GL_ANGLE_texture_compression_dxt5 GL_ARB_conservative_depth GL_ARB_internalformat_query GL_ARB_map_buffer_alignment GL_ARB_shader_atomic_counters GL_ARB_shading_language_420pack GL_ARB_shading_language_packing GL_ARB_texture_storage GL_ARB_transform_feedback_instanced GL_EXT_framebuffer_multisample_blit_scaled GL_EXT_transform_feedback GL_AMD_shader_trinary_minmax GL_ARB_ES3_compatibility GL_ARB_clear_buffer_object GL_ARB_invalidate_subdata GL_ARB_texture_query_levels GL_ARB_texture_storage_multisample GL_ARB_texture_view GL_ARB_vertex_attrib_binding GL_KHR_debug GL_ARB_buffer_storage GL_ARB_multi_bind GL_ARB_texture_mirror_clamp_to_edge GL_ARB_vertex_type_10f_11f_11f_rev GL_EXT_shader_integer_mix GL_INTEL_performance_query
I suppose the purpose of this glversion.txt is to avoid reproducibility
issues? I see it was added as a "pretty ugly hack" in the nixpkgs
repository [1]. (Interestingly enough, this text file doesn't seem to
cause me any issues, even though my computer doesn't support OpenGL 3.0,
so I guess it's fine.)
> diff --git a/gnu/packages/patches/perl-opengl-makefile.patch b/gnu/packages/patches/perl-opengl-makefile.patch
> new file mode 100644
> index 0000000000..e782113d8b
> --- /dev/null
> +++ b/gnu/packages/patches/perl-opengl-makefile.patch
> @@ -0,0 +1,37 @@
> +diff --git a/Makefile.PL b/Makefile.PL
> +index d32205d..3e8fa0a 100755
> +--- a/Makefile.PL
> ++++ b/Makefile.PL
> +@@ -124,14 +124,7 @@ if ($IS_MINGW)
> + # Look for available libs
> + our @libdirs = qw
> + {
> +- -L/usr/lib
> +- -L/usr/lib/i386-linux-gnu
> +- -L/usr/X11R6/lib
> +- -L/opt/X11/lib
> +- -L/usr/local/lib
> +- -L/usr/openwin/lib
> +- -L/opt/csw/lib
> +- -L/usr/local/freeglut/lib
> ++@@libdirs@@
> + };
> +
> + our @check_libs = qw
> +@@ -804,7 +797,6 @@ sub get_extensions
> + my $exc_file = 'gl_exclude.h';
> + unlink($exc_file) if (-e $exc_file);
> + my $glv_file = 'utils/glversion.txt';
> +- unlink($glv_file) if (-e $glv_file);
> +
> + # Only run the rest if GLUT is installed
> + print "Testing GLUT version\n" if ($verbose);
> +@@ -861,7 +853,7 @@ sub get_extensions
> + $make_ver = ";make -f Makefile " . (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : "");
> + print "glversion: '$make_ver'\n" if $verbose>1;
> + }
> +- my $exec = 'cd utils'."$make_ver clean".$make_ver;
> ++ my $exec = 'cd utils'.$make_ver;
> + print "glversion: $exec\n" if ($verbose);
> + my $stat = `$exec`;
> + print "\n$stat\n\n" if ($verbose);
At the top of the makefile patch, could you add a brief explanation of
the purpose of the patch and/or link to the source of the patch? It
makes the patch much more maintainable, and you can find examples of
this throughout the gnu/packages/patches subdirectory in the Guix
repository.
> diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
> index 1c3d999d79..093f60f9c9 100644
> --- a/gnu/packages/perl.scm
> +++ b/gnu/packages/perl.scm
> @@ -27,6 +27,7 @@
> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
> ;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
> +;;; Copyright © 2020 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -49,6 +50,7 @@
> #:use-module (gnu packages)
> #:use-module (guix packages)
> #:use-module (guix download)
> + #:use-module (guix gexp)
> #:use-module (guix git-download)
> #:use-module (guix utils)
> #:use-module (guix build-system gnu)
> @@ -75,6 +77,7 @@
> #:use-module (gnu packages textutils)
> #:use-module (gnu packages video)
> #:use-module (gnu packages web))
> + #:use-module (gnu packages xorg))
There's a minor parenthesis accounting mistake on the lines above. If
you delete the last right parenthesis, the indentation issue should be
fixed and the code should compile.
>
> ;;;
> ;;; Please: Try to add new module packages in alphabetic order.
I almost missed this note on my first review! Please place the package
definition somewhere in the file so that it leaves the file in some sort
of alphabetical order.
> @@ -11387,3 +11390,61 @@ regexp patterns in modules.")
> (description "Data::SExpression parses Lisp S-Expressions into Perl data
> structures.")
> (license license:perl-license)))
> +
> +(define-public perl-opengl
> + (package
> + (name "perl-opengl")
> + (version "0.70")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "mirror://cpan/authors/id/C/CH/CHM/OpenGL-"
> + version
> + ".tar.gz"))
> + (sha256
> + (base32
> + "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"))
> + (patches (search-patches "perl-opengl-makefile.patch"))))
> + (build-system perl-build-system)
> + (native-inputs
> + `(("xvfb" ,xorg-server-for-tests)
> + ("glversion-txt" ,(local-file "aux-files/perl-opengl/glversion.txt"))))
> + (inputs `(("mesa" ,mesa)
> + ("glu" ,glu)
> + ("freeglut" ,freeglut)
> + ("libxi" ,libxi)
> + ("libxmu" ,libxmu)
> + ("libice" ,libice)))
> + (arguments
> + '(#:phases
> + (modify-phases %standard-phases
> + (add-before 'configure 'patch-makefile
> + (lambda* (#:key inputs #:allow-other-keys)
> + (substitute* "Makefile.PL"
> + (("^@@libdirs@@")
> + (string-concatenate
> + (map (lambda (input)
> + (string-append "-L" (cdr input) "/lib\n"))
> + inputs))))
> + (substitute* "utils/Makefile"
> + (("^all: glversion.txt") "all:"))
> + #t))
I'd name the above phase "patch-makefiles" since you've patched multiple
files, but that's just me. ;-)
> + (add-before 'configure 'inject-glversion
> + (lambda* (#:key inputs #:allow-other-keys)
> + (copy-file (assoc-ref inputs "glversion-txt")
> + "utils/glversion.txt")
> + #t))
> + (add-before 'check 'pre-check
> + (lambda _
> + ;; Tests require a running X server.
> + (system "Xvfb :1 &")
> + (setenv "DISPLAY" ":1")
> + #t))
> + )))
> + (home-page "https://metacpan.org/release/OpenGL")
> + (synopsis
> + "Perl bindings to the OpenGL API, GLU, and GLUT/FreeGLUT")
> + (description "The package provides Perl bindings to OpenGL, GLU
> +and FreeGLUT.")
> + (license license:perl-license)))
Altogether, the code works when the small parenthesis accounting error
above is corrected. Please reply to this message with an updated patch,
and I'll be happy to review and approve it!
Thanks for your contribution,
Kei
[1]: https://github.com/NixOS/nixpkgs/commit/0fc8d92e53d294f35f63a1898e9b61f3651d0800#diff-7f99cf156dbc7368d6f642c1a72f316a
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* [bug#43654] [PATCH] Add perl-opengl
2020-10-02 4:13 ` Kei Kebreau
@ 2020-10-02 17:59 ` Malte Frank Gerdes
2020-10-02 18:29 ` Andreas Enge
2020-10-05 15:01 ` Malte Frank Gerdes
2 siblings, 0 replies; 17+ messages in thread
From: Malte Frank Gerdes @ 2020-10-02 17:59 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 43654
[-- Attachment #1: Type: text/plain, Size: 2053 bytes --]
Thanks for looking into the patch :)
>I think we can assume that the same MIT license in the root directory of
>the nixpkgs repository also applies to the unmarked files in the
>repository.
Ok.
>I suppose the purpose of this glversion.txt is to avoid reproducibility
>issues? I see it was added as a "pretty ugly hack" in the nixpkgs
>repository [1].
Yes, exactly. I also noticed, that it doesn't matter what the VENDOR and
RENDERER variables contain, it seems that it doesn't get used anyway.
>(Interestingly enough, this text file doesn't seem to
>cause me any issues, even though my computer doesn't support OpenGL 3.0,
>so I guess it's fine.)
I guess it would cause issues once a program tries to use OpenGL
extensions which are not supported on a given computer, otherwise it
shouldn't make any difference. As i understand it this file is supposed
to contain a minimum of OpenGL extensions which are widely available, so
that this (hopefully™) won't happen.
>At the top of the makefile patch, could you add a brief explanation of
>the purpose of the patch and/or link to the source of the patch? It
>makes the patch much more maintainable, and you can find examples of
>this throughout the gnu/packages/patches subdirectory in the Guix
>repository.
Done.
>There's a minor parenthesis accounting mistake on the lines above. If
>you delete the last right parenthesis, the indentation issue should be
>fixed and the code should compile.
snap, it seems i made a mistake in magit while adding this line...
>I almost missed this note on my first review! Please place the package
>definition somewhere in the file so that it leaves the file in some sort
>of alphabetical order.
Yes, after closer inspection of that file i found the order - everything
was mixed at the end so i didn't see it.
>I'd name the above phase "patch-makefiles" since you've patched multiple
>files, but that's just me. ;-)
Makes sense 😁.
So i hope i have addressed all things you mentioned.
Malte
[-- Attachment #2: perl-opengl-updated.patch --]
[-- Type: text/x-patch, Size: 11322 bytes --]
diff --git a/gnu/local.mk b/gnu/local.mk
index f3b5b17e84..001b249e9e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -37,6 +37,7 @@
# Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
# Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
# Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+# Copyright © 2020 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
#
# This file is part of GNU Guix.
#
@@ -1406,6 +1407,7 @@ dist_patch_DATA = \
%D%/packages/patches/pam-mount-luks2-support.patch \
%D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/pciutils-hurd-configure.patch \
+ %D%/packages/patches/perl-opengl-makefile.patch \
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
%D%/packages/patches/samba-fix-fcntl-hint-detection.patch \
%D%/packages/patches/sdl-pango-api_additions.patch \
diff --git a/gnu/packages/aux-files/perl-opengl/glversion.txt b/gnu/packages/aux-files/perl-opengl/glversion.txt
new file mode 100644
index 0000000000..5b5a9a911f
--- /dev/null
+++ b/gnu/packages/aux-files/perl-opengl/glversion.txt
@@ -0,0 +1,5 @@
+GLUT=20801
+VERSION=3.0 Mesa 10.2.6
+VENDOR=Intel Open Source Technology Center
+RENDERER=Mesa DRI Intel(R) Ivybridge Mobile
+EXTENSIONS=GL_ARB_multisample GL_EXT_abgr GL_EXT_bgra GL_EXT_blend_color GL_EXT_blend_minmax GL_EXT_blend_subtract GL_EXT_copy_texture GL_EXT_polygon_offset GL_EXT_subtexture GL_EXT_texture_object GL_EXT_vertex_array GL_EXT_compiled_vertex_array GL_EXT_texture GL_EXT_texture3D GL_IBM_rasterpos_clip GL_ARB_point_parameters GL_EXT_draw_range_elements GL_EXT_packed_pixels GL_EXT_point_parameters GL_EXT_rescale_normal GL_EXT_separate_specular_color GL_EXT_texture_edge_clamp GL_SGIS_generate_mipmap GL_SGIS_texture_border_clamp GL_SGIS_texture_edge_clamp GL_SGIS_texture_lod GL_ARB_framebuffer_sRGB GL_ARB_multitexture GL_EXT_framebuffer_sRGB GL_IBM_multimode_draw_arrays GL_IBM_texture_mirrored_repeat GL_3DFX_texture_compression_FXT1 GL_ARB_texture_cube_map GL_ARB_texture_env_add GL_ARB_transpose_matrix GL_EXT_blend_func_separate GL_EXT_fog_coord GL_EXT_multi_draw_arrays GL_EXT_secondary_color GL_EXT_texture_env_add GL_EXT_texture_filter_anisotropic GL_EXT_texture_lod_bias GL_INGR_blend_func_separate GL_NV_blend_square GL_NV_light_max_exponent GL_NV_texgen_reflection GL_NV_texture_env_combine4 GL_S3_s3tc GL_SUN_multi_draw_arrays GL_ARB_texture_border_clamp GL_ARB_texture_compression GL_EXT_framebuffer_object GL_EXT_texture_compression_s3tc GL_EXT_texture_env_combine GL_EXT_texture_env_dot3 GL_MESA_window_pos GL_NV_packed_depth_stencil GL_NV_texture_rectangle GL_ARB_depth_texture GL_ARB_occlusion_query GL_ARB_shadow GL_ARB_texture_env_combine GL_ARB_texture_env_crossbar GL_ARB_texture_env_dot3 GL_ARB_texture_mirrored_repeat GL_ARB_window_pos GL_ATI_envmap_bumpmap GL_EXT_stencil_two_side GL_EXT_texture_cube_map GL_NV_depth_clamp GL_APPLE_packed_pixels GL_APPLE_vertex_array_object GL_ARB_draw_buffers GL_ARB_fragment_program GL_ARB_fragment_shader GL_ARB_shader_objects GL_ARB_vertex_program GL_ARB_vertex_shader GL_ATI_draw_buffers GL_ATI_texture_env_combine3 GL_ATI_texture_float GL_EXT_shadow_funcs GL_EXT_stencil_wrap GL_MESA_pack_invert GL_NV_primitive_restart GL_ARB_depth_clamp GL_ARB_fragment_program_shadow GL_ARB_half_float_pixel GL_ARB_occlusion_query2 GL_ARB_point_sprite GL_ARB_shading_language_100 GL_ARB_sync GL_ARB_texture_non_power_of_two GL_ARB_vertex_buffer_object GL_ATI_blend_equation_separate GL_EXT_blend_equation_separate GL_OES_read_format GL_ARB_color_buffer_float GL_ARB_pixel_buffer_object GL_ARB_texture_compression_rgtc GL_ARB_texture_float GL_ARB_texture_rectangle GL_EXT_packed_float GL_EXT_pixel_buffer_object GL_EXT_texture_compression_dxt1 GL_EXT_texture_compression_rgtc GL_EXT_texture_rectangle GL_EXT_texture_sRGB GL_EXT_texture_shared_exponent GL_ARB_framebuffer_object GL_EXT_framebuffer_blit GL_EXT_framebuffer_multisample GL_EXT_packed_depth_stencil GL_APPLE_object_purgeable GL_ARB_vertex_array_object GL_ATI_separate_stencil GL_EXT_draw_buffers2 GL_EXT_draw_instanced GL_EXT_gpu_program_parameters GL_EXT_texture_array GL_EXT_texture_integer GL_EXT_texture_sRGB_decode GL_EXT_timer_query GL_OES_EGL_image GL_AMD_performance_monitor GL_ARB_copy_buffer GL_ARB_depth_buffer_float GL_ARB_draw_instanced GL_ARB_half_float_vertex GL_ARB_instanced_arrays GL_ARB_map_buffer_range GL_ARB_texture_rg GL_ARB_texture_swizzle GL_ARB_vertex_array_bgra GL_EXT_texture_swizzle GL_EXT_vertex_array_bgra GL_NV_conditional_render GL_AMD_conservative_depth GL_AMD_draw_buffers_blend GL_AMD_seamless_cubemap_per_texture GL_ARB_ES2_compatibility GL_ARB_blend_func_extended GL_ARB_debug_output GL_ARB_draw_buffers_blend GL_ARB_draw_elements_base_vertex GL_ARB_explicit_attrib_location GL_ARB_fragment_coord_conventions GL_ARB_provoking_vertex GL_ARB_sample_shading GL_ARB_sampler_objects GL_ARB_seamless_cube_map GL_ARB_shader_texture_lod GL_ARB_texture_cube_map_array GL_ARB_texture_gather GL_ARB_texture_multisample GL_ARB_texture_query_lod GL_ARB_texture_rgb10_a2ui GL_ARB_uniform_buffer_object GL_ARB_vertex_type_2_10_10_10_rev GL_EXT_provoking_vertex GL_EXT_texture_snorm GL_MESA_texture_signed_rgba GL_ARB_get_program_binary GL_ARB_robustness GL_ARB_separate_shader_objects GL_ARB_shader_bit_encoding GL_ARB_timer_query GL_ARB_transform_feedback2 GL_ARB_transform_feedback3 GL_ANGLE_texture_compression_dxt3 GL_ANGLE_texture_compression_dxt5 GL_ARB_conservative_depth GL_ARB_internalformat_query GL_ARB_map_buffer_alignment GL_ARB_shader_atomic_counters GL_ARB_shading_language_420pack GL_ARB_shading_language_packing GL_ARB_texture_storage GL_ARB_transform_feedback_instanced GL_EXT_framebuffer_multisample_blit_scaled GL_EXT_transform_feedback GL_AMD_shader_trinary_minmax GL_ARB_ES3_compatibility GL_ARB_clear_buffer_object GL_ARB_invalidate_subdata GL_ARB_texture_query_levels GL_ARB_texture_storage_multisample GL_ARB_texture_view GL_ARB_vertex_attrib_binding GL_KHR_debug GL_ARB_buffer_storage GL_ARB_multi_bind GL_ARB_texture_mirror_clamp_to_edge GL_ARB_vertex_type_10f_11f_11f_rev GL_EXT_shader_integer_mix GL_INTEL_performance_query
diff --git a/gnu/packages/patches/perl-opengl-makefile.patch b/gnu/packages/patches/perl-opengl-makefile.patch
new file mode 100644
index 0000000000..2f5afd95f8
--- /dev/null
+++ b/gnu/packages/patches/perl-opengl-makefile.patch
@@ -0,0 +1,41 @@
+This patch substitutes the harcoded library Paths from Makefile.PL to make it
+easier to insert the store paths.
+It also removes the generation of utils/glversion.txt , because it gets
+statically copied anyway to not rely on the build machines capabilities.
+diff --git a/Makefile.PL b/Makefile.PL
+index d32205d..3e8fa0a 100755
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -124,14 +124,7 @@ if ($IS_MINGW)
+ # Look for available libs
+ our @libdirs = qw
+ {
+- -L/usr/lib
+- -L/usr/lib/i386-linux-gnu
+- -L/usr/X11R6/lib
+- -L/opt/X11/lib
+- -L/usr/local/lib
+- -L/usr/openwin/lib
+- -L/opt/csw/lib
+- -L/usr/local/freeglut/lib
++@@libdirs@@
+ };
+
+ our @check_libs = qw
+@@ -804,7 +797,6 @@ sub get_extensions
+ my $exc_file = 'gl_exclude.h';
+ unlink($exc_file) if (-e $exc_file);
+ my $glv_file = 'utils/glversion.txt';
+- unlink($glv_file) if (-e $glv_file);
+
+ # Only run the rest if GLUT is installed
+ print "Testing GLUT version\n" if ($verbose);
+@@ -861,7 +853,7 @@ sub get_extensions
+ $make_ver = ";make -f Makefile " . (length($lib) ? "GLUT_LIB=$lib " : "") . (length($def) ? "GLUT_DEF=$def " : "");
+ print "glversion: '$make_ver'\n" if $verbose>1;
+ }
+- my $exec = 'cd utils'."$make_ver clean".$make_ver;
++ my $exec = 'cd utils'.$make_ver;
+ print "glversion: $exec\n" if ($verbose);
+ my $stat = `$exec`;
+ print "\n$stat\n\n" if ($verbose);
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 1c3d999d79..853968f5f1 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -27,6 +27,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -49,6 +50,7 @@
#:use-module (gnu packages)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
@@ -74,7 +76,8 @@
#:use-module (gnu packages sdl)
#:use-module (gnu packages textutils)
#:use-module (gnu packages video)
- #:use-module (gnu packages web))
+ #:use-module (gnu packages web)
+ #:use-module (gnu packages xorg))
;;;
;;; Please: Try to add new module packages in alphabetic order.
@@ -7870,6 +7873,64 @@ technology to store hierarchical information such as links to other
documents within a single file.")
(license (package-license perl))))
+(define-public perl-opengl
+ (package
+ (name "perl-opengl")
+ (version "0.70")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/C/CH/CHM/OpenGL-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"))
+ (patches (search-patches "perl-opengl-makefile.patch"))))
+ (build-system perl-build-system)
+ (native-inputs
+ `(("xvfb" ,xorg-server-for-tests)
+ ("glversion-txt" ,(local-file "aux-files/perl-opengl/glversion.txt"))))
+ (inputs `(("mesa" ,mesa)
+ ("glu" ,glu)
+ ("freeglut" ,freeglut)
+ ("libxi" ,libxi)
+ ("libxmu" ,libxmu)
+ ("libice" ,libice)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'patch-makefiles
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "Makefile.PL"
+ (("^@@libdirs@@")
+ (string-concatenate
+ (map (lambda (input)
+ (string-append "-L" (cdr input) "/lib\n"))
+ inputs))))
+ (substitute* "utils/Makefile"
+ (("^all: glversion.txt") "all:"))
+ #t))
+ (add-before 'configure 'inject-glversion
+ (lambda* (#:key inputs #:allow-other-keys)
+ (copy-file (assoc-ref inputs "glversion-txt")
+ "utils/glversion.txt")
+ #t))
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; Tests require a running X server.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1")
+ #t))
+ )))
+ (home-page "https://metacpan.org/release/OpenGL")
+ (synopsis
+ "Perl bindings to the OpenGL API, GLU, and GLUT/FreeGLUT")
+ (description "The package provides Perl bindings to OpenGL, GLU
+and FreeGLUT.")
+ (license (package-license perl))))
+
(define-public perl-package-anon
(package
(name "perl-package-anon")
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#43654] [PATCH] Add perl-opengl
2020-10-02 4:13 ` Kei Kebreau
2020-10-02 17:59 ` Malte Frank Gerdes
@ 2020-10-02 18:29 ` Andreas Enge
2020-10-02 19:33 ` Malte Frank Gerdes
2020-10-05 15:01 ` Malte Frank Gerdes
2 siblings, 1 reply; 17+ messages in thread
From: Andreas Enge @ 2020-10-02 18:29 UTC (permalink / raw)
To: Kei Kebreau; +Cc: Malte Frank Gerdes, 43654
Hello,
On Fri, Oct 02, 2020 at 12:13:43AM -0400, Kei Kebreau wrote:
> > @@ -0,0 +1,5 @@
> > +GLUT=20801
> > +VERSION=3.0 Mesa 10.2.6
> > +VENDOR=Intel Open Source Technology Center
> > +RENDERER=Mesa DRI Intel(R) Ivybridge Mobile
> I suppose the purpose of this glversion.txt is to avoid reproducibility
> issues? I see it was added as a "pretty ugly hack" in the nixpkgs
> repository [1]. (Interestingly enough, this text file doesn't seem to
> cause me any issues, even though my computer doesn't support OpenGL 3.0,
> so I guess it's fine.)
I also tried to package perl-opengl (as a prerequisite for slic3r); the
problem is that during the configure phase it wants to do this:
In order to test your GPU's capabilities, run this make under an X11 shell
freeglut (./glversion): failed to open display ''
make: *** [Makefile:24: glversion.txt] Error 1
to create the file, which will presumably depend on the GPU in the build
machine, a no-go. Nix works around this by providing a fixed file. I did not
investigate whether this will work everywhere; it clearly leaks information
on the machine where it was created. In my case, for instance, I got "Skylake"
instead of "Ivybridge". It all feels a bit brittle; for instance, we have
freeglut@2.8.1 and @3.2.1 in Guix; I suppose "GLUT=20801" refers to @2.8.1.
Will it work with a newer version? Our mesa is @20.0.8 and not 10.2.6.
But I also do not know if there is a better solution.
Andreas
PS: I spotted a frowned-upon "cdr" in the package ;-)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#43654] [PATCH] Add perl-opengl
2020-10-02 18:29 ` Andreas Enge
@ 2020-10-02 19:33 ` Malte Frank Gerdes
2020-10-04 8:26 ` Andreas Enge
2020-10-05 20:51 ` Andreas Enge
0 siblings, 2 replies; 17+ messages in thread
From: Malte Frank Gerdes @ 2020-10-02 19:33 UTC (permalink / raw)
To: Andreas Enge; +Cc: Kei Kebreau, 43654
> Hello,
>
> On Fri, Oct 02, 2020 at 12:13:43AM -0400, Kei Kebreau wrote:
>> > @@ -0,0 +1,5 @@
>> > +GLUT=20801
>> > +VERSION=3.0 Mesa 10.2.6
>> > +VENDOR=Intel Open Source Technology Center
>> > +RENDERER=Mesa DRI Intel(R) Ivybridge Mobile
>> I suppose the purpose of this glversion.txt is to avoid reproducibility
>> issues? I see it was added as a "pretty ugly hack" in the nixpkgs
>> repository [1]. (Interestingly enough, this text file doesn't seem to
>> cause me any issues, even though my computer doesn't support OpenGL 3.0,
>> so I guess it's fine.)
>
> I also tried to package perl-opengl (as a prerequisite for slic3r); the
> problem is that during the configure phase it wants to do this:
>
> In order to test your GPU's capabilities, run this make under an X11 shell
> freeglut (./glversion): failed to open display ''
> make: *** [Makefile:24: glversion.txt] Error 1
>
> to create the file, which will presumably depend on the GPU in the build
> machine, a no-go. Nix works around this by providing a fixed file. I did not
> investigate whether this will work everywhere; it clearly leaks information
> on the machine where it was created. In my case, for instance, I got "Skylake"
> instead of "Ivybridge". It all feels a bit brittle; for instance, we have
> freeglut@2.8.1 and @3.2.1 in Guix; I suppose "GLUT=20801" refers to @2.8.1.
> Will it work with a newer version? Our mesa is @20.0.8 and not 10.2.6.
I just tried to build with those variables set to arbitrary values:
--8<---------------cut here---------------start------------->8---
GLUT=99999
VERSION=3.0 Mesa 99.99.99
VENDOR=NoVendor
RENDERER=MesaRenderer
--8<---------------cut here---------------end--------------->8---
the package builds and no tests fail, so those might even be irrelevant,
but i cannot test it properly, because no program using perl-opengl is
packaged (and i can't manage to get slic3r packaged...).
Malte
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#43654] [PATCH] Add perl-opengl
2020-10-02 19:33 ` Malte Frank Gerdes
@ 2020-10-04 8:26 ` Andreas Enge
2020-10-04 12:28 ` Malte Frank Gerdes
2020-10-04 12:32 ` Malte Frank Gerdes
2020-10-05 20:51 ` Andreas Enge
1 sibling, 2 replies; 17+ messages in thread
From: Andreas Enge @ 2020-10-04 8:26 UTC (permalink / raw)
To: Malte Frank Gerdes; +Cc: Kei Kebreau, 43654
On Fri, Oct 02, 2020 at 09:33:04PM +0200, Malte Frank Gerdes wrote:
> I just tried to build with those variables set to arbitrary values:
>
> --8<---------------cut here---------------start------------->8---
> GLUT=99999
> VERSION=3.0 Mesa 99.99.99
> VENDOR=NoVendor
> RENDERER=MesaRenderer
> --8<---------------cut here---------------end--------------->8---
>
> the package builds and no tests fail, so those might even be irrelevant,
> but i cannot test it properly, because no program using perl-opengl is
> packaged (and i can't manage to get slic3r packaged...).
These are good news! Maybe we should keep these dummy values in then.
Do you happen to know any other (easier to package) software using
perl-opengl? I would feel more at ease if we could test the package
before pushing it.
Andreas
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#43654] [PATCH] Add perl-opengl
2020-10-04 8:26 ` Andreas Enge
@ 2020-10-04 12:28 ` Malte Frank Gerdes
2020-10-04 12:32 ` Malte Frank Gerdes
1 sibling, 0 replies; 17+ messages in thread
From: Malte Frank Gerdes @ 2020-10-04 12:28 UTC (permalink / raw)
To: Andreas Enge; +Cc: Kei Kebreau, 43654
Andreas Enge <andreas@enge.fr> writes:
> On Fri, Oct 02, 2020 at 09:33:04PM +0200, Malte Frank Gerdes wrote:
>> I just tried to build with those variables set to arbitrary values:
>>
>> --8<---------------cut here---------------start------------->8---
>> GLUT=99999
>> VERSION=3.0 Mesa 99.99.99
>> VENDOR=NoVendor
>> RENDERER=MesaRenderer
>> --8<---------------cut here---------------end--------------->8---
>>
>> the package builds and no tests fail, so those might even be irrelevant,
>> but i cannot test it properly, because no program using perl-opengl is
>> packaged (and i can't manage to get slic3r packaged...).
>
> These are good news! Maybe we should keep these dummy values in then.
> Do you happen to know any other (easier to package) software using
> perl-opengl? I would feel more at ease if we could test the package
> before pushing it.
>
> Andreas
>
The official repo (git clone https://git.code.sf.net/p/pogl/code
pogl-code) seems to contain a test.pl file which should showcase some
things if i read that correctly. I will try it out later.
Malte
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#43654] [PATCH] Add perl-opengl
2020-10-04 8:26 ` Andreas Enge
2020-10-04 12:28 ` Malte Frank Gerdes
@ 2020-10-04 12:32 ` Malte Frank Gerdes
1 sibling, 0 replies; 17+ messages in thread
From: Malte Frank Gerdes @ 2020-10-04 12:32 UTC (permalink / raw)
To: Andreas Enge; +Cc: Kei Kebreau, 43654
I also totally forgot to ask: What should be used instead of a cdr - if
it's bad practice?
Malte
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#43654] [PATCH] Add perl-opengl
2020-10-02 19:33 ` Malte Frank Gerdes
2020-10-04 8:26 ` Andreas Enge
@ 2020-10-05 20:51 ` Andreas Enge
2020-10-05 22:35 ` Andreas Enge
1 sibling, 1 reply; 17+ messages in thread
From: Andreas Enge @ 2020-10-05 20:51 UTC (permalink / raw)
To: Malte Frank Gerdes; +Cc: Kei Kebreau, 43654
On Fri, Oct 02, 2020 at 09:33:04PM +0200, Malte Frank Gerdes wrote:
> I just tried to build with those variables set to arbitrary values:
>
> --8<---------------cut here---------------start------------->8---
> GLUT=99999
> VERSION=3.0 Mesa 99.99.99
> VENDOR=NoVendor
> RENDERER=MesaRenderer
> --8<---------------cut here---------------end--------------->8---
Actually I just went further:
FREEGLUT=
GLUT=
VERSION=
VENDOR=
RENDERER=
EXTENSIONS=
The package compiles, but running test.pl (which showed just a blank square
before) now fails with this message:
Goto undefined subroutine &AutoLoader::AUTOLOAD at /home/andreas/.guix-profile/lib/perl5/site_perl/5.30.2/x86_64-linux-thread-multi/OpenGL.pm line 6178.
However, I tried several of the examples, and they work.
So one option would be to disable the test ("#:tests? #f") and create the
essentially empty glversion.txt file above inside a phase. There would not
even be a need to store it as a an auxiliary file; see the use of
"call-with-output-file" in guix/tests.scm, for instance.
What do you think?
Andreas
^ permalink raw reply [flat|nested] 17+ messages in thread* [bug#43654] [PATCH] Add perl-opengl
2020-10-05 20:51 ` Andreas Enge
@ 2020-10-05 22:35 ` Andreas Enge
2020-10-05 22:47 ` Andreas Enge
0 siblings, 1 reply; 17+ messages in thread
From: Andreas Enge @ 2020-10-05 22:35 UTC (permalink / raw)
To: Malte Frank Gerdes; +Cc: Kei Kebreau, 43654
On Mon, Oct 05, 2020 at 10:51:29PM +0200, Andreas Enge wrote:
> So one option would be to disable the test ("#:tests? #f") and create the
> essentially empty glversion.txt file above inside a phase. There would not
> even be a need to store it as a an auxiliary file; see the use of
> "call-with-output-file" in guix/tests.scm, for instance.
Something like this:
(add-before 'configure 'glversion
;; Building utils/glversion.txt fails, and is probably
;; dependent on the graphics card in the build system.
;; Replace it by a content-free file; while this breaks
;; the test, the examples in the examples/ subdirectory
;; can be run.
(lambda _
(substitute* "Makefile.PL"
(("unlink") "# unlink") ; prevent utils/glversion.txt
; from being deleted once...
(("\\.\"\\$make_ver clean\"") "")) ; ...and twice...
(substitute* "utils/Makefile"
(("all: glversion.txt") "all: ")) ; ...and thrice.
(call-with-output-file "utils/glversion.txt"
(lambda (port)
(display (string-append "FREEGLUT=\nGLUT=\nVERSION=\n"
"VENDOR=\nRENDERER=\n"
"EXTENSIONS=\n")
port)))
#t))
I tried to add the following instead of patching Makefile.PL:
(add-before 'configure 'fix-interface
;; Libraries are not found in default locations, so force
;; an interface.
(lambda _
(substitute* "Makefile.PL"
(("die \"FreeGLUT or GLUT libraries")
"$interface_lib = 'FREEGLUT'; #"))
#t))
But it fails during compilation with error messages such as this one:
/gnu/store/1qmd9achfkm1njzxf8hi86q53pmy9sxk-mesa-20.0.7/include/GL/glxext.h:530:169: error: unknown type name ‘GLintptr’; did you mean ‘GLint’?
From some search engine results, I surmise that I am missing the
$DEFS .= " -DGL_GLEXT_LEGACY";
from line 525 of Makefile.PL.
So maybe we will have to replace the "-L/what/ever" as you do it in your
cdr/match phase; but instead of adding a patch that drops the "-L" in
favour of some "@@libpaths@@" text, only to replace the new text again
in a phase, I would use just a phase. For instance, instead of replacing
"^@@libdirs@@", just replace "-L/usr/local/freeglut/lib".
But it is already tomorrow, time to stop.
Andreas
^ permalink raw reply [flat|nested] 17+ messages in thread* [bug#43654] [PATCH] Add perl-opengl
2020-10-05 22:35 ` Andreas Enge
@ 2020-10-05 22:47 ` Andreas Enge
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Enge @ 2020-10-05 22:47 UTC (permalink / raw)
To: Malte Frank Gerdes; +Cc: Kei Kebreau, 43654
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
On Tue, Oct 06, 2020 at 12:35:43AM +0200, Andreas Enge wrote:
> But it is already tomorrow, time to stop.
Did I mention that Guix is addictive?
Here is a patch that compiles and can run the examples in the subdirectory
of the same name.
If you feel like it, you could replace "cdr" by "match", and maybe test
if all of the inputs are actually needed.
Andreas
[-- Attachment #2: 0001-gnu-Add-perl-opengl.patch --]
[-- Type: text/plain, Size: 4548 bytes --]
From c6e00eac49ce859a53c1b00a6165c009f778885d Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Tue, 6 Oct 2020 00:43:45 +0200
Subject: [PATCH] gnu: Add perl-opengl.
* gnu/packages/perl.scm (perl-opengl): New variable.
Co-authored-by: Malte Frank Gerdes <malte.f.gerdes@gmail.com>
---
gnu/packages/perl.scm | 67 +++++++++++++++++++++++++++++++++++++++++--
1 file changed, 65 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index e093a63770..24de203741 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2013, 2019 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2019, 2020 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
@@ -27,6 +27,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -74,7 +75,8 @@
#:use-module (gnu packages sdl)
#:use-module (gnu packages textutils)
#:use-module (gnu packages video)
- #:use-module (gnu packages web))
+ #:use-module (gnu packages web)
+ #:use-module (gnu packages xorg))
;;;
;;; Please: Try to add new module packages in alphabetic order.
@@ -7870,6 +7872,67 @@ technology to store hierarchical information such as links to other
documents within a single file.")
(license (package-license perl))))
+(define-public perl-opengl
+ (package
+ (name "perl-opengl")
+ (version "0.70")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/C/CH/CHM/OpenGL-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"))))
+ (build-system perl-build-system)
+ (inputs `(("mesa" ,mesa) ; TODO: needed?
+ ("glu" ,glu) ; TODO: needed?
+ ("freeglut" ,freeglut) ; TODO: needed?
+ ("libxi" ,libxi)
+ ("libxmu" ,libxmu)))
+ (arguments
+ '(#:tests? #f ; test.pl fails with our empty glversion.txt, while
+ ; the package still seems to work on the examples
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'glversion
+ ;; Building utils/glversion.txt fails, and is probably
+ ;; dependent on the graphics card in the build system.
+ ;; Replace it by a content-free file; while this breaks
+ ;; the tests, the examples in the examples/ subdirectory
+ ;; can be run.
+ (lambda _
+ (substitute* "Makefile.PL"
+ (("unlink") "# unlink") ; prevent utils/glversion.txt
+ ; from being deleted once...
+ (("\\.\"\\$make_ver clean\"") "")) ; ...and twice...
+ (substitute* "utils/Makefile"
+ (("all: glversion.txt") "all: ")) ; ...and thrice.
+ (call-with-output-file "utils/glversion.txt"
+ (lambda (port)
+ (display (string-append "FREEGLUT=\nGLUT=\nVERSION=\n"
+ "VENDOR=\nRENDERER=\n"
+ "EXTENSIONS=\n")
+ port)))
+ #t))
+ (add-before 'configure 'fix-library-flags
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "Makefile.PL"
+ (("-L/usr/local/freeglut/lib")
+ (string-concatenate
+ (map (lambda (input)
+ (string-append "-L" (cdr input) "/lib\n"))
+ inputs))))
+ #t)))))
+ (home-page "https://metacpan.org/release/OpenGL")
+ (synopsis
+ "Perl bindings to the OpenGL API, GLU, and GLUT/FreeGLUT")
+ (description "The package provides Perl bindings to OpenGL, GLU
+and FreeGLUT.")
+ (license (package-license perl))))
+
(define-public perl-package-anon
(package
(name "perl-package-anon")
--
2.28.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [bug#43654] [PATCH] Add perl-opengl
2020-10-02 4:13 ` Kei Kebreau
2020-10-02 17:59 ` Malte Frank Gerdes
2020-10-02 18:29 ` Andreas Enge
@ 2020-10-05 15:01 ` Malte Frank Gerdes
2020-10-05 20:05 ` Andreas Enge
2020-10-05 20:11 ` Andreas Enge
2 siblings, 2 replies; 17+ messages in thread
From: Malte Frank Gerdes @ 2020-10-05 15:01 UTC (permalink / raw)
To: 43654; +Cc: kkebreau, andreas
So i now managed to test if it works :) (spoiler: it does - at least on
my machine).
The patch attached to my previous mail which just adds
perl-opengl-shader and perl-opengl-image are not necessary (and also not
complete).
I did the following:
1. ./pre-inst-env guix environment perl-opengl --ad-hoc perl-opengl
2. git clone git://git.code.sf.net/p/pogl/code pogl-code
3. cd pogl-code/examples
4. for p in *.pl; do timeout 5 perl $p; done
and this should result in all examples running successfully. This isn't
something that can be added to the test phase, isn't it?
The black screen of test.pl is a mystery (to me) though :/
Malte
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#43654] [PATCH] Add perl-opengl
2020-10-05 15:01 ` Malte Frank Gerdes
@ 2020-10-05 20:05 ` Andreas Enge
2020-10-05 20:11 ` Andreas Enge
1 sibling, 0 replies; 17+ messages in thread
From: Andreas Enge @ 2020-10-05 20:05 UTC (permalink / raw)
To: Malte Frank Gerdes; +Cc: kkebreau, 43654
Hello Malte,
On Mon, Oct 05, 2020 at 05:01:29PM +0200, Malte Frank Gerdes wrote:
> The patch attached to my previous mail which just adds
> perl-opengl-shader and perl-opengl-image are not necessary (and also not
> complete).
>
> I did the following:
> 1. ./pre-inst-env guix environment perl-opengl --ad-hoc perl-opengl
> 2. git clone git://git.code.sf.net/p/pogl/code pogl-code
> 3. cd pogl-code/examples
> 4. for p in *.pl; do timeout 5 perl $p; done
>
> and this should result in all examples running successfully. This isn't
> something that can be added to the test phase, isn't it?
that is good news and reassuring, so we can go forward with the patch.
The test.pl file you mention also appears in the packaged source from CPAN,
so it should be possible to run tests.
Concerning the replacement of "cdr", you might want to have a look at "match":
https://www.gnu.org/software/guile/manual/html_node/Pattern-Matching.html
I will probably not be able to get back to Guix before the weekend, so
please do not hesitate to update your patch.
And to send more of the perl packages - when I suggested you submit your
perl package patches, I did not imagine you would start with the most
difficult one ;-)
Andreas
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#43654] [PATCH] Add perl-opengl
2020-10-05 15:01 ` Malte Frank Gerdes
2020-10-05 20:05 ` Andreas Enge
@ 2020-10-05 20:11 ` Andreas Enge
1 sibling, 0 replies; 17+ messages in thread
From: Andreas Enge @ 2020-10-05 20:11 UTC (permalink / raw)
To: Malte Frank Gerdes; +Cc: kkebreau, 43654
PS: And I would suggest to create a git commit complete with commit message
in the usual style, and to use "git format-patch", see
https://guix.gnu.org/manual/en/guix.html#Submitting-Patches
Then it is easy to apply the patch with "git am", and your name is
already attached to the contribution.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#43654] [PATCH] Add perl-opengl
2020-09-27 19:06 [bug#43654] [PATCH] Add perl-opengl Malte Frank Gerdes
2020-10-02 4:13 ` Kei Kebreau
@ 2020-10-05 8:10 ` Malte Frank Gerdes
2020-10-07 18:20 ` Malte Frank Gerdes
2 siblings, 0 replies; 17+ messages in thread
From: Malte Frank Gerdes @ 2020-10-05 8:10 UTC (permalink / raw)
To: 43654
[-- Attachment #1: Type: text/plain, Size: 399 bytes --]
In order to run the test.pl file from the official repo those packages
are also needed. Unfortunately i only get a black screen... I'm using
sway so that might make a difference even though xwayland is enabled.
It's also interesting that this app dynamically determines which OpenGL
features and which driver is installed. And juding from the output this
also gets run when perl-opengl is built.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: needed-for-perl-opengl-test.patch --]
[-- Type: text/x-patch, Size: 1969 bytes --]
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 853968f5f1..31ddbb1e54 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -7931,6 +7931,66 @@ documents within a single file.")
and FreeGLUT.")
(license (package-license perl))))
+(define-public perl-opengl-shader
+ (package
+ (name "perl-opengl-shader")
+ (version "1.01")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/B/BF/BFREE/OpenGL-Shader-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0wmd76smyd9qzr3ga86vjhkzjj9ga6prqhyvdi41l1jfk0x82pcz"))))
+ (build-system perl-build-system)
+ (native-inputs
+ `(("xvfb" ,xorg-server-for-tests)))
+ (propagated-inputs
+ `(("perl-opengl" ,perl-opengl)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; Tests require a running X server.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1")
+ #t))
+ )))
+ (home-page
+ "https://metacpan.org/release/OpenGL-Shader")
+ (synopsis
+ "empty")
+ (description "empty")
+ (license #f)))
+
+(define-public perl-opengl-image
+ (package
+ (name "perl-opengl-image")
+ (version "1.03")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/B/BF/BFREE/OpenGL-Image-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1cf7c0fgba7g3r09y5hbj6ljs6dyjbzaqf9mv3qz807np3msqqa6"))))
+ (build-system perl-build-system)
+ (propagated-inputs
+ `(("perl-opengl" ,perl-opengl)))
+ (home-page
+ "https://metacpan.org/release/OpenGL-Image")
+ (synopsis
+ "empty")
+ (description "empty")
+ (license #f)))
+
(define-public perl-package-anon
(package
(name "perl-package-anon")
[-- Attachment #3: Type: text/plain, Size: 7 bytes --]
Malte
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#43654] [PATCH] Add perl-opengl
2020-09-27 19:06 [bug#43654] [PATCH] Add perl-opengl Malte Frank Gerdes
2020-10-02 4:13 ` Kei Kebreau
2020-10-05 8:10 ` Malte Frank Gerdes
@ 2020-10-07 18:20 ` Malte Frank Gerdes
2020-10-10 13:09 ` bug#43654: " Andreas Enge
2 siblings, 1 reply; 17+ messages in thread
From: Malte Frank Gerdes @ 2020-10-07 18:20 UTC (permalink / raw)
To: 43654
Forgot to Cc the list...
Andreas Enge <andreas@enge.fr> writes:
> On Fri, Oct 02, 2020 at 09:33:04PM +0200, Malte Frank Gerdes wrote:
>> I just tried to build with those variables set to arbitrary values:
>>
>> --8<---------------cut here---------------start------------->8---
>> GLUT=99999
>> VERSION=3.0 Mesa 99.99.99
>> VENDOR=NoVendor
>> RENDERER=MesaRenderer
>> --8<---------------cut here---------------end--------------->8---
>
> Actually I just went further:
> FREEGLUT=
> GLUT=
> VERSION=
> VENDOR=
> RENDERER=
> EXTENSIONS=
Nice! (I didn't even think of leaving them empty ...)
> The package compiles, but running test.pl (which showed just a blank square
> before) now fails with this message:
> Goto undefined subroutine &AutoLoader::AUTOLOAD at
> /home/andreas/.guix-profile/lib/perl5/site_perl/5.30.2/x86_64-linux-thread-multi/OpenGL.pm
> line 6178.
>
> However, I tried several of the examples, and they work.
>
> So one option would be to disable the test ("#:tests? #f") and create the
> essentially empty glversion.txt file above inside a phase. There would not
> even be a need to store it as a an auxiliary file; see the use of
> "call-with-output-file" in guix/tests.scm, for instance.
>
> What do you think?
>
> Andreas
>
IMHO disabling the tests is the best solution then - it didn't /really/
test the libraries functionality it seems, because the examples do much
more different things.
> Something like this:
> (add-before 'configure 'glversion
> ;; Building utils/glversion.txt fails, and is probably
> ;; dependent on the graphics card in the build system.
> ;; Replace it by a content-free file; while this breaks
> ;; the test, the examples in the examples/ subdirectory
> ;; can be run.
> (lambda _
> (substitute* "Makefile.PL"
> (("unlink") "# unlink") ; prevent utils/glversion.txt
> ; from being deleted once...
> (("\\.\"\\$make_ver clean\"") "")) ; ...and twice...
> (substitute* "utils/Makefile"
> (("all: glversion.txt") "all: ")) ; ...and thrice.
> (call-with-output-file "utils/glversion.txt"
> (lambda (port)
> (display (string-append "FREEGLUT=\nGLUT=\nVERSION=\n"
> "VENDOR=\nRENDERER=\n"
> "EXTENSIONS=\n")
> port)))
> #t))
>
> I tried to add the following instead of patching Makefile.PL:
> (add-before 'configure 'fix-interface
> ;; Libraries are not found in default locations, so force
> ;; an interface.
> (lambda _
> (substitute* "Makefile.PL"
> (("die \"FreeGLUT or GLUT libraries")
> "$interface_lib = 'FREEGLUT'; #"))
> #t))
>
> But it fails during compilation with error messages such as this one:
> /gnu/store/1qmd9achfkm1njzxf8hi86q53pmy9sxk-mesa-20.0.7/include/GL/glxext.h:530:169: error: unknown type name ‘GLintptr’; did you mean ‘GLint’?
> From some search engine results, I surmise that I am missing the
> $DEFS .= " -DGL_GLEXT_LEGACY";
> from line 525 of Makefile.PL.
>
> So maybe we will have to replace the "-L/what/ever" as you do it in your
> cdr/match phase; but instead of adding a patch that drops the "-L" in
> favour of some "@@libpaths@@" text, only to replace the new text again
> in a phase, I would use just a phase. For instance, instead of replacing
> "^@@libdirs@@", just replace "-L/usr/local/freeglut/lib".
Makes sense that it's pointless to replace the text twice.
> On Tue, Oct 06, 2020 at 12:35:43AM +0200, Andreas Enge wrote:
> > But it is already tomorrow, time to stop.
>
> Did I mention that Guix is addictive?
I feel you 😂. It just makes fun to do things in Guix.
> If you feel like it, you could replace "cdr" by "match", and maybe test
> if all of the inputs are actually needed.
After all it seems glu and mesa are not necessary as inputs because
freeglut propagates them anyway. Is it ok to rely on propagated inputs?
They still need to be added to the library search dir though.
Attached is a updated version of your patch :)
Malte
> From 1fdc8885e04bdad9fee886c58dea9c8c712b5848 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Tue, 6 Oct 2020 00:43:45 +0200
Subject: [PATCH] gnu: Add perl-opengl.
* gnu/packages/perl.scm (perl-opengl): New variable.
Co-authored-by: Malte Frank Gerdes <malte.f.gerdes@gmail.com>
---
gnu/packages/perl.scm | 64 +++++++++++++++++++++++++++++++++++++++++--
1 file changed, 62 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 1c3d999d79..9916c579e4 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2013, 2019 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2019, 2020 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
@@ -27,6 +27,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -74,7 +75,8 @@
#:use-module (gnu packages sdl)
#:use-module (gnu packages textutils)
#:use-module (gnu packages video)
- #:use-module (gnu packages web))
+ #:use-module (gnu packages web)
+ #:use-module (gnu packages xorg))
;;;
;;; Please: Try to add new module packages in alphabetic order.
@@ -7870,6 +7872,64 @@ technology to store hierarchical information such as links to other
documents within a single file.")
(license (package-license perl))))
+(define-public perl-opengl
+ (package
+ (name "perl-opengl")
+ (version "0.70")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://cpan/authors/id/C/CH/CHM/OpenGL-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"))))
+ (build-system perl-build-system)
+ (inputs `(("freeglut" ,freeglut)
+ ("libxi" ,libxi)
+ ("libxmu" ,libxmu)))
+ (arguments
+ '(#:tests? #f ; test.pl fails with our empty glversion.txt, while
+ ; the package still seems to work on the examples
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'glversion
+ ;; Building utils/glversion.txt fails, and is probably
+ ;; dependent on the graphics card in the build system.
+ ;; Replace it by a content-free file; while this breaks
+ ;; the tests, the examples in the examples/ subdirectory
+ ;; can be run.
+ (lambda _
+ (substitute* "Makefile.PL"
+ (("unlink") "# unlink") ; prevent utils/glversion.txt
+ ; from being deleted once...
+ (("\\.\"\\$make_ver clean\"") "")) ; ...and twice...
+ (substitute* "utils/Makefile"
+ (("all: glversion.txt") "all: ")) ; ...and thrice.
+ (call-with-output-file "utils/glversion.txt"
+ (lambda (port)
+ (display (string-append "FREEGLUT=\nGLUT=\nVERSION=\n"
+ "VENDOR=\nRENDERER=\n"
+ "EXTENSIONS=\n")
+ port)))
+ #t))
+ (add-before 'configure 'fix-library-flags
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "Makefile.PL"
+ (("-L/usr/local/freeglut/lib")
+ (string-append "-L" (assoc-ref inputs "freeglut") "/lib\n"
+ "-L" (assoc-ref inputs "glu") "/lib\n"
+ "-L" (assoc-ref inputs "mesa") "/lib\n")))
+ #t)))))
+ (home-page "https://metacpan.org/release/OpenGL")
+ (synopsis
+ "Perl bindings to the OpenGL API, GLU, and GLUT/FreeGLUT")
+ (description "The package provides Perl bindings to OpenGL, GLU
+and FreeGLUT.")
+ (license (package-license perl))))
+
(define-public perl-package-anon
(package
(name "perl-package-anon")
--
2.28.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* bug#43654: [PATCH] Add perl-opengl
2020-10-07 18:20 ` Malte Frank Gerdes
@ 2020-10-10 13:09 ` Andreas Enge
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Enge @ 2020-10-10 13:09 UTC (permalink / raw)
To: Malte Frank Gerdes; +Cc: 43654-done
On Wed, Oct 07, 2020 at 08:20:51PM +0200, Malte Frank Gerdes wrote:
> After all it seems glu and mesa are not necessary as inputs because
> freeglut propagates them anyway. Is it ok to rely on propagated inputs?
> They still need to be added to the library search dir though.
That is weird, I did not realise they would be added to the "inputs"
variable; I would have added them a second time to be sure they are
available in the build recipe. Anyway, it is working, and I just pushed
the patch. Thanks a lot! I will give slic3r another quick try then.
Closing this bug.
Andreas
^ permalink raw reply [flat|nested] 17+ messages in thread