libfishsound: fix build with gcc14 (#370288)

2025-01-03 01:24:06 +00:00
parent 34b2f25dc9 fdd1a8c1e0
commit 23922275ec
2 changed files with 24 additions and 0 deletions
@@ -0,0 +1,20 @@
+--- 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)
+ {
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
    sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf";
  };

+  patches = [
+    ./fix-callbacks.patch
+  ];
+
  propagatedBuildInputs = [
    libvorbis
    speex