Unverified Commit a5f897d4 authored by Reno Dakota's avatar Reno Dakota
Browse files

Revert "libfishsound: fix build with gcc14" 

This reverts commit fdd1a8c1.

reverting in to apply a more comprehensive fix
parent 4200b91b

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

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
--- a/src/libfishsound/flac.c

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

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

 #if FS_DECODE

 static FLAC__StreamDecoderReadStatus

 fs_flac_read_callback(const FLAC__StreamDecoder *decoder,

-                      FLAC__byte buffer[], unsigned int *bytes,

+                      FLAC__byte buffer[], size_t *bytes,

                       void *client_data)

 {

   FishSound* fsound = (FishSound*)client_data;

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

 #if FS_ENCODE

 static FLAC__StreamEncoderWriteStatus

 fs_flac_enc_write_callback(const FLAC__StreamEncoder *encoder,

-                           const FLAC__byte buffer[], unsigned bytes,

+                           const FLAC__byte buffer[], size_t bytes,

                            unsigned samples, unsigned current_frame,

                            void *client_data)

 {

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

+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ stdenv.mkDerivation rec { 
    sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf";

  };



  patches = [

    ./fix-callbacks.patch

  ];



  propagatedBuildInputs = [

    libvorbis

    speex