commit 0d2230e8ea4fe6286dc158e9c4dd37c37da6fba7 · pyrox.dev/nixpkgs

-20

pkgs/by-name/li/libfishsound/fix-callbacks.patch

···

       1
       1
       -
       --- a/src/libfishsound/flac.c

     

       2
       2
       -
       +++ b/src/libfishsound/flac.c

     

       3
       3
       -
       @@ -106,7 +106,7 @@ fs_flac_command (FishSound * fsound, int command, void * data, int datasize)

     

       4
       4
       -
        #if FS_DECODE

     

       5
       5
       -
        static FLAC__StreamDecoderReadStatus

     

       6
       6
       -
        fs_flac_read_callback(const FLAC__StreamDecoder *decoder,

     

       7
       7
       -
       -                      FLAC__byte buffer[], unsigned int *bytes,

     

       8
       8
       -
       +                      FLAC__byte buffer[], size_t *bytes,

     

       9
       9
       -
                              void *client_data)

     

       10
       10
       -
        {

     

       11
       11
       -
          FishSound* fsound = (FishSound*)client_data;

     

       12
       12
       -
       @@ -346,7 +346,7 @@ dec_err:

     

       13
       13
       -
        #if FS_ENCODE

     

       14
       14
       -
        static FLAC__StreamEncoderWriteStatus

     

       15
       15
       -
        fs_flac_enc_write_callback(const FLAC__StreamEncoder *encoder,

     

       16
       16
       -
       -                           const FLAC__byte buffer[], unsigned bytes,

     

       17
       17
       -
       +                           const FLAC__byte buffer[], size_t bytes,

     

       18
       18
       -
                                   unsigned samples, unsigned current_frame,

     

       19
       19
       -
                                   void *client_data)

     

       20
       20
       -
        {

+29 -4

pkgs/by-name/li/libfishsound/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
       +
         fetchpatch,

     

       6
       6
       +
         autoreconfHook,

     

       5
       7
        
         libvorbis,

     

       6
       8
        
         speex,

     

       7
       9
        
         flac,

     
···

       17
       19
        
           sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf";

     

       18
       20
        
         };

     

       19
       21
        
       

     

       20
       20
       -
         patches = [

     

       21
       21
       -
           ./fix-callbacks.patch

     

       22
       22
       -
         ];

     

       22
       22
       +
         patches =

     

       23
       23
       +
           let

     

       24
       24
       +
             fetchDebPatch =

     

       25
       25
       +
               { name, hash }:

     

       26
       26
       +
               fetchpatch {

     

       27
       27
       +
                 inherit name hash;

     

       28
       28
       +
                 url = "https://salsa.debian.org/multimedia-team/libfishsound/-/raw/f25f31a13dd2ce008614427889b08e6f2222898f/debian/patches/${name}";

     

       29
       29
       +
               };

     

       30
       30
       +
           in

     

       31
       31
       +
           map fetchDebPatch [

     

       32
       32
       +
             {

     

       33
       33
       +
               name = "0001-Patch-configure.ac-to-specify-config-macro-dir.patch";

     

       34
       34
       +
               hash = "sha256-3cijMhgxqwFisc5nt8826QUwOqPI7H425QkDcjnD4iM=";

     

       35
       35
       +
             }

     

       36
       36
       +
             {

     

       37
       37
       +
               name = "0002-flac-set-vendor_string.length-0.patch";

     

       38
       38
       +
               hash = "sha256-8195rU9IAhFL3MgB4jLwtJv6BWgz22A38+RmIymIQoo=";

     

       39
       39
       +
             }

     

       40
       40
       +
             {

     

       41
       41
       +
               name = "0003-Fix-incompatible-flac-callback-types.patch";

     

       42
       42
       +
               hash = "sha256-BxG1hlThzhJ6VeGcsNpDEtVyKSJTLGFKeHFpFoXW54A=";

     

       43
       43
       +
             }

     

       44
       44
       +
           ];

     

       23
       45
        
       

     

       24
       46
        
         propagatedBuildInputs = [

     

       25
       47
        
           libvorbis

     
···

       27
       49
        
           flac

     

       28
       50
        
         ];

     

       29
       51
        
       

     

       30
       30
       -
         nativeBuildInputs = [ pkg-config ];

     

       52
       52
       +
         nativeBuildInputs = [

     

       53
       53
       +
           pkg-config

     

       54
       54
       +
           autoreconfHook

     

       55
       55
       +
         ];

     

       31
       56
        
       

     

       32
       57
        
         meta = with lib; {

     

       33
       58
        
           homepage = "https://xiph.org/fishsound/";