diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/pdl-2.019-glut-bitmap-fonts.patch | 43 | ||||
| -rw-r--r-- | gnu/packages/perl-maths.scm | 5 |
3 files changed, 48 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index ffb8eb6d29..a177e0d2c0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1924,6 +1924,7 @@ dist_patch_DATA = \ %D%/packages/patches/password-store-tree-compat.patch \ %D%/packages/patches/pciutils-hurd64.patch \ %D%/packages/patches/pdfpc-build-with-vala-0.56.patch \ + %D%/packages/patches/pdl-2.019-glut-bitmap-fonts.patch \ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ %D%/packages/patches/plasp-fix-normalization.patch \ diff --git a/gnu/packages/patches/pdl-2.019-glut-bitmap-fonts.patch b/gnu/packages/patches/pdl-2.019-glut-bitmap-fonts.patch new file mode 100644 index 0000000000..a374aae96b --- /dev/null +++ b/gnu/packages/patches/pdl-2.019-glut-bitmap-fonts.patch @@ -0,0 +1,43 @@ +Author: Danny Milosavljevic <dannym@friendly-machines.com> +Date: 2024-12-17 21:00:00 CET +Subject: Make bitmap fonts work even in glut +License: Same as Perl. + +--- orig/PDL-2.019/Graphics/TriD/POGL/OpenGL.pm 2018-05-05 19:56:29.000000000 +0200 ++++ PDL-2.019/Graphics/TriD/POGL/OpenGL.pm 2024-12-17 22:56:30.043984134 +0100 +@@ -358,9 +358,34 @@ + + =cut + ++use OpenGL qw(GL_COMPILE GLUT_BITMAP_9_BY_15 GLUT_BITMAP_8_BY_13); ++use constant GLUT_FONTS => { ++ '9x15' => GLUT_BITMAP_9_BY_15, ++ '8x13' => GLUT_BITMAP_8_BY_13, ++}; ++ + sub glpRasterFont{ + my($this,@args) = @_; +- OpenGL::glpRasterFont($args[0],$args[1],$args[2],$this->{Display}); ++ # see also OpenGL::glpPrintString($::lb,$header); ++ if ( $this->{window_type} eq 'glut' ) { ++ my $font_name = $args[0] || '8x13'; ++ my $font = GLUT_FONTS->{$font_name} || GLUT_FONTS->{'8x13'}; ++ my $start_char = $args[1] || 0; ++ my $num_chars = $args[2] || 128; ++ my $cache_key = "${font_name};${start_char};${num_chars}"; ++ unless (exists $this->{font_cache}{$cache_key}) { ++ my $base = OpenGL::glGenLists($num_chars); ++ for my $i (0..($num_chars - 1)) { ++ OpenGL::glNewList($base + $i, GL_COMPILE); ++ OpenGL::glutBitmapCharacter($font, $start_char + $i); ++ OpenGL::glEndList(); ++ } ++ $this->{font_cache}{$cache_key} = $base; ++ } ++ return $this->{font_cache}{$cache_key}; ++ } else { ++ OpenGL::glpRasterFont($args[0],$args[1],$args[2],$this->{Display}); ++ } + } + + diff --git a/gnu/packages/perl-maths.scm b/gnu/packages/perl-maths.scm index 91164d1f27..53e0a03361 100644 --- a/gnu/packages/perl-maths.scm +++ b/gnu/packages/perl-maths.scm @@ -21,6 +21,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system perl) + #:use-module (gnu packages) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) #:use-module (gnu packages gl) @@ -85,7 +86,9 @@ It implements the data type \"matrix of real numbers\" (and consequently also (uri (string-append "https://www.cpan.org/modules/by-module/PDL/PDL-" version ".tar.gz")) (sha256 - (base32 "1zkp5pm351qjr6sb3xivpxy5vjfl72ns0hb4dx5vpm8xvgp7p92i")))) + (base32 "1zkp5pm351qjr6sb3xivpxy5vjfl72ns0hb4dx5vpm8xvgp7p92i")) + (patches + (search-patches "pdl-2.019-glut-bitmap-fonts.patch")))) (build-system perl-build-system) (arguments `(#:phases |