From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0M83FOL+cF+QDQAA0tVLHw (envelope-from ) for ; Sun, 27 Sep 2020 21:06:42 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id jULvD+L+cF+6RwAAB5/wlQ (envelope-from ) for ; Sun, 27 Sep 2020 21:06:42 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6EF0D940308 for ; Sun, 27 Sep 2020 21:06:41 +0000 (UTC) Received: from localhost ([::1]:33574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMdsV-0002po-3v for larch@yhetil.org; Sun, 27 Sep 2020 17:06:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMc1j-0006FB-H2 for guix-patches@gnu.org; Sun, 27 Sep 2020 15:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kMc1j-0004n6-6w for guix-patches@gnu.org; Sun, 27 Sep 2020 15:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kMc1j-0001bb-2P for guix-patches@gnu.org; Sun, 27 Sep 2020 15:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43654] [PATCH] Add perl-opengl Resent-From: Malte Frank Gerdes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Sep 2020 19:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43654 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43654@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16012336366101 (code B ref -1); Sun, 27 Sep 2020 19:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Sep 2020 19:07:16 +0000 Received: from localhost ([127.0.0.1]:50464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMc0s-0001aG-8P for submit@debbugs.gnu.org; Sun, 27 Sep 2020 15:07:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:51058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMc0n-0001a4-Db for submit@debbugs.gnu.org; Sun, 27 Sep 2020 15:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMc0n-0005tn-9I for guix-patches@gnu.org; Sun, 27 Sep 2020 15:07:05 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:40804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kMc0i-0004hz-GX for guix-patches@gnu.org; Sun, 27 Sep 2020 15:07:04 -0400 Received: by mail-ed1-x543.google.com with SMTP id t16so7656761edw.7 for ; Sun, 27 Sep 2020 12:06:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:user-agent:mime-version; bh=Xe0//zdLUlBeXN50UjyWZAhYnAA1/Pk0vbhKiQBJ6SQ=; b=fGF/tp7HfysFVlUlPOZ4vAVkqWguHQuxfmZzDjWh+dkIUX8ynaCAAAd3QqCS/08xEp xGm/9Vd3oVcwaeNpWq+uuzQY1aEfRDg9QKLafm4915pQS1fAtWC9fxbBfgHksQmLqGTR Xw4kbU/QdW+xTvg+UVxu8F4srKauJ4oewsCB3whb6E0/6i/rEzKWIjK1NYltOX8yuGZ6 wcTlOgHvGn9uDJvFfo4KGTFqet72ogyZcli5sTlJbdzZN/0o8RVWKedBTzlR/UWoKGPW f8oQD7PmDVpO4EsPZNxIkBI9HgLltXVrvaHBEEdV3d4WGvbqT+qIN7dZdU6wWU245YJR Z5Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version; bh=Xe0//zdLUlBeXN50UjyWZAhYnAA1/Pk0vbhKiQBJ6SQ=; b=BKDprkSyaQ3eToYewhhN2VzEbyrBeYYfq6YSILVFPhePtatLRvRrBYHAsvwHjQWbli Btqedc6WrY8rLhZrtMUPYiWEa/PyQMaCvLqElPNwU1UOHvFozHsKCn2OR8mgiIk889ww FXNdQHE8ElTc/aCoz5VRQPFhsfTd2vBeRIh1D1MkVrUdYZRJcOGZP783KLLwQfS+kc4Q 5475QuWItBsdaMRsOD0w9YTZVJ4GhQaXcNogu1swqMk3im5QtPz/6U8xFiLfMI3h5r9J mw/Fr8XPepN0FcMFS74F7I2YobqB+6G5JQrQsbfimE5ImjXpb1SVsW4ZBkBKCUvvPycR G+ww== X-Gm-Message-State: AOAM532evzMWNoMtGROoNZ8/jDAj92lbldcLT5vAHPnAK4CxytP6UdAk bXZ4pUAbd6i6kCdBVtkVHBt9NODf6a0= X-Google-Smtp-Source: ABdhPJwQLc19+FZgeZ8qfBYZZNJK1VTItZHfOI/YZjb0vy82ax/w0eBjKDPRyxYpLaU4qF2eubvuDw== X-Received: by 2002:a05:6402:1656:: with SMTP id s22mr12680034edx.160.1601233618284; Sun, 27 Sep 2020 12:06:58 -0700 (PDT) Received: from Morphium (ip-84-118-73-55.unity-media.net. [84.118.73.55]) by smtp.gmail.com with ESMTPSA id bv8sm7316280ejb.3.2020.09.27.12.06.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Sep 2020 12:06:57 -0700 (PDT) From: Malte Frank Gerdes Date: Sun, 27 Sep 2020 21:06:56 +0200 Message-ID: <86pn67xcmn.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2a00:1450:4864:20::543; envelope-from=malte.f.gerdes@gmail.com; helo=mail-ed1-x543.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.0 (/) X-Mailman-Approved-At: Sun, 27 Sep 2020 17:06:27 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=fGF/tp7H; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: aUDFR2ggse2t --=-=-= Content-Type: text/plain Hi, 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?). This is the first time for me sending a patch to this list, i hope i haven't forgotten anything :) Malte --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=perl-opengl.patch Content-Transfer-Encoding: quoted-printable 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 =C2=A9 2020 Brice Waegeneire # Copyright =C2=A9 2020 Tanguy Le Carrour # Copyright =C2=A9 2020 Martin Becze +# Copyright =C2=A9 2020 Malte Frank Gerdes # # This file is part of GNU Guix. # @@ -1406,6 +1407,7 @@ dist_patch_DATA =3D \ %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/package= s/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=3D20801 +VERSION=3D3.0 Mesa 10.2.6 +VENDOR=3DIntel Open Source Technology Center +RENDERER=3DMesa DRI Intel(R) Ivybridge Mobile +EXTENSIONS=3DGL_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_polyg= on_offset GL_EXT_subtexture GL_EXT_texture_object GL_EXT_vertex_array GL_EX= T_compiled_vertex_array GL_EXT_texture GL_EXT_texture3D GL_IBM_rasterpos_cl= ip 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_colo= r 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_sRG= B GL_ARB_multitexture GL_EXT_framebuffer_sRGB GL_IBM_multimode_draw_arrays = GL_IBM_texture_mirrored_repeat GL_3DFX_texture_compression_FXT1 GL_ARB_text= ure_cube_map GL_ARB_texture_env_add GL_ARB_transpose_matrix GL_EXT_blend_fu= nc_separate GL_EXT_fog_coord GL_EXT_multi_draw_arrays GL_EXT_secondary_colo= r GL_EXT_texture_env_add GL_EXT_texture_filter_anisotropic GL_EXT_texture_l= od_bias GL_INGR_blend_func_separate GL_NV_blend_square GL_NV_light_max_expo= nent GL_NV_texgen_reflection GL_NV_texture_env_combine4 GL_S3_s3tc GL_SUN_m= ulti_draw_arrays GL_ARB_texture_border_clamp GL_ARB_texture_compression GL_= EXT_framebuffer_object GL_EXT_texture_compression_s3tc GL_EXT_texture_env_c= ombine GL_EXT_texture_env_dot3 GL_MESA_window_pos GL_NV_packed_depth_stenci= l GL_NV_texture_rectangle GL_ARB_depth_texture GL_ARB_occlusion_query GL_AR= B_shadow GL_ARB_texture_env_combine GL_ARB_texture_env_crossbar GL_ARB_text= ure_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_ve= rtex_program GL_ARB_vertex_shader GL_ATI_draw_buffers GL_ATI_texture_env_co= mbine3 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_pro= gram_shadow GL_ARB_half_float_pixel GL_ARB_occlusion_query2 GL_ARB_point_sp= rite GL_ARB_shading_language_100 GL_ARB_sync GL_ARB_texture_non_power_of_tw= o GL_ARB_vertex_buffer_object GL_ATI_blend_equation_separate GL_EXT_blend_e= quation_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_t= exture_rectangle GL_EXT_packed_float GL_EXT_pixel_buffer_object GL_EXT_text= ure_compression_dxt1 GL_EXT_texture_compression_rgtc GL_EXT_texture_rectang= le GL_EXT_texture_sRGB GL_EXT_texture_shared_exponent GL_ARB_framebuffer_ob= ject GL_EXT_framebuffer_blit GL_EXT_framebuffer_multisample GL_EXT_packed_d= epth_stencil GL_APPLE_object_purgeable GL_ARB_vertex_array_object GL_ATI_se= parate_stencil GL_EXT_draw_buffers2 GL_EXT_draw_instanced GL_EXT_gpu_progra= m_parameters GL_EXT_texture_array GL_EXT_texture_integer GL_EXT_texture_sRG= B_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_textur= e_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_dept= h 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_bu= ffers_blend GL_ARB_draw_elements_base_vertex GL_ARB_explicit_attrib_locatio= n GL_ARB_fragment_coord_conventions GL_ARB_provoking_vertex GL_ARB_sample_s= hading GL_ARB_sampler_objects GL_ARB_seamless_cube_map GL_ARB_shader_textur= e_lod GL_ARB_texture_cube_map_array GL_ARB_texture_gather GL_ARB_texture_mu= ltisample 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 G= L_ARB_timer_query GL_ARB_transform_feedback2 GL_ARB_transform_feedback3 GL_= ANGLE_texture_compression_dxt3 GL_ANGLE_texture_compression_dxt5 GL_ARB_con= servative_depth GL_ARB_internalformat_query GL_ARB_map_buffer_alignment GL_= ARB_shader_atomic_counters GL_ARB_shading_language_420pack GL_ARB_shading_l= anguage_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_storag= e_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_edg= e GL_ARB_vertex_type_10f_11f_11f_rev GL_EXT_shader_integer_mix GL_INTEL_per= formance_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..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 =3D 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 =3D qw +@@ -804,7 +797,6 @@ sub get_extensions + my $exc_file =3D 'gl_exclude.h'; + unlink($exc_file) if (-e $exc_file); + my $glv_file =3D '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 =3D ";make -f Makefile " . (length($lib) ? "GLUT_LIB=3D$li= b " : "") . (length($def) ? "GLUT_DEF=3D$def " : ""); + print "glversion: '$make_ver'\n" if $verbose>1; + } +- my $exec =3D 'cd utils'."$make_ver clean".$make_ver; ++ my $exec =3D 'cd utils'.$make_ver; + print "glversion: $exec\n" if ($verbose); + my $stat =3D `$exec`; + print "\n$stat\n\n" if ($verbose); 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 =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2020 Paul Garlick ;;; Copyright =C2=A9 2020 Nicolas Goaziou +;;; Copyright =C2=A9 2020 Malte Frank Gerdes ;;; ;;; 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)) ;;; ;;; Please: Try to add new module packages in alphabetic order. @@ -11387,3 +11390,61 @@ regexp patterns in modules.") (description "Data::SExpression parses Lisp S-Expressions into Perl da= ta 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)) + (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))) --=-=-=--