commit c9a667043fdd65c3511d9b61481240dd56c56f2d · pyrox.dev/nixpkgs

+64

pkgs/development/perl-modules/sdl-modern-perl.patch

···

       1
       +
       From d734d03862d7dcc776bd2fa3ba662cdd5879b32e Mon Sep 17 00:00:00 2001

     

       2
       +
       From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>

     

       3
       +
       Date: Wed, 12 Jul 2023 17:55:27 +0200

     

       4
       +
       Subject: [PATCH] Adapt to perl 5.37.1

     

       5
       +
       

     

       6
       +
       Perl 5.37.1 removed a deprecated sv_nv() macro and SDL fails to build

     

       7
       +
       with Perl 5.38.0:

     

       8
       +
       

     

       9
       +
       lib/SDLx/Controller/Interface.xs:60:26: error: implicit declaration of function 'sv_nv'

     

       10
       +
          60 |         out->dv_x      = sv_nv(temp);

     

       11
       +
             |                          ^~~~~

     

       12
       +
       

     

       13
       +
       Users are advised to use SvNVx() macro instead. SvNVx() seems to have been

     

       14
       +
       available all the time (it predates a commit from 1993-10-07).

     

       15
       +
       

     

       16
       +
       This patch does that.

     

       17
       +
       

     

       18
       +
       https://github.com/PerlGameDev/SDL/issues/303

     

       19
       +
       ---

     

       20
       +
        src/SDLx/Controller/Interface.xs | 12 ++++++------

     

       21
       +
        1 file changed, 6 insertions(+), 6 deletions(-)

     

       22
       +
       

     

       23
       +
       diff --git a/src/SDLx/Controller/Interface.xs b/src/SDLx/Controller/Interface.xs

     

       24
       +
       index 3dc202b7..d326c885 100644

     

       25
       +
       --- a/src/SDLx/Controller/Interface.xs

     

       26
       +
       +++ b/src/SDLx/Controller/Interface.xs

     

       27
       +
       @@ -57,15 +57,15 @@ void evaluate(SDLx_Interface *obj, SDLx_Derivative *out, SDLx_State *initial, fl

     

       28
       +
        

     

       29
       +
        	SV *temp;

     

       30
       +
        	temp           = av_pop(accel);

     

       31
       +
       -	out->dv_x      = sv_nv(temp);

     

       32
       +
       +	out->dv_x      = SvNVx(temp);

     

       33
       +
        	SvREFCNT_dec(temp);

     

       34
       +
        

     

       35
       +
        	temp           = av_pop(accel);

     

       36
       +
       -	out->dv_y      = sv_nv(temp);

     

       37
       +
       +	out->dv_y      = SvNVx(temp);

     

       38
       +
        	SvREFCNT_dec(temp);

     

       39
       +
        

     

       40
       +
        	temp           = av_pop(accel);

     

       41
       +
       -	out->dang_v    = sv_nv(temp);

     

       42
       +
       +	out->dang_v    = SvNVx(temp);

     

       43
       +
        	SvREFCNT_dec(temp);

     

       44
       +
        

     

       45
       +
        	SvREFCNT_dec((SV *)accel);

     

       46
       +
       @@ -90,15 +90,15 @@ void evaluate_dt(SDLx_Interface *obj, SDLx_Derivative *out, SDLx_State *initial,

     

       47
       +
        

     

       48
       +
        	SV *temp;

     

       49
       +
        	temp           = av_pop(accel);

     

       50
       +
       -	out->dv_x      = sv_nv(temp);

     

       51
       +
       +	out->dv_x      = SvNVx(temp);

     

       52
       +
        	SvREFCNT_dec(temp);

     

       53
       +
        

     

       54
       +
        	temp           = av_pop(accel);

     

       55
       +
       -	out->dv_y      = sv_nv(temp);

     

       56
       +
       +	out->dv_y      = SvNVx(temp);

     

       57
       +
        	SvREFCNT_dec(temp);

     

       58
       +
        

     

       59
       +
        	temp           = av_pop(accel);

     

       60
       +
       -	out->dang_v    = sv_nv(temp);

     

       61
       +
       +	out->dang_v    = SvNVx(temp);

     

       62
       +
        	SvREFCNT_dec(temp);

     

       63
       +
        

     

       64
       +
        	SvREFCNT_dec((SV *)accel);

pkgs/top-level/perl-packages.nix

···

       21501
        
             url = "mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.548.tar.gz";

     

       21502
        
             hash = "sha256-JSoZK/qcIHCkiDcH0TnDpF2cRRjM1moeaZtbeVm9T7U=";

     

       21503
        
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21504
        
           perlPreHook = "export LD=$CC";

     

       21505
        
           preCheck = "rm t/core_audiospec.t";

     

       21506
        
           buildInputs = [ pkgs.SDL pkgs.SDL_gfx pkgs.SDL_mixer pkgs.SDL_image pkgs.SDL_ttf pkgs.SDL_Pango pkgs.SDL_net AlienSDL CaptureTiny TestDeep TestDifferences TestException TestMost TestWarn ];

···

       21501
        
             url = "mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.548.tar.gz";

     

       21502
        
             hash = "sha256-JSoZK/qcIHCkiDcH0TnDpF2cRRjM1moeaZtbeVm9T7U=";

     

       21503
        
           };

     

       21504
       +
           patches = [

     

       21505
       +
             # https://github.com/PerlGameDev/SDL/pull/304

     

       21506
       +
             ../development/perl-modules/sdl-modern-perl.patch

     

       21507
       +
           ];

     

       21508
        
           perlPreHook = "export LD=$CC";

     

       21509
        
           preCheck = "rm t/core_audiospec.t";

     

       21510
        
           buildInputs = [ pkgs.SDL pkgs.SDL_gfx pkgs.SDL_mixer pkgs.SDL_image pkgs.SDL_ttf pkgs.SDL_Pango pkgs.SDL_net AlienSDL CaptureTiny TestDeep TestDifferences TestException TestMost TestWarn ];