From 7ea90cf178a3e22a7a7a2556de4694ab68f30c2d Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 14 May 2025 18:32:44 +0200 Subject: [PATCH] Revert "SDL2{,_classic}_mixer_2_0: drop" --- .../sd/SDL2_classic_mixer_2_0/package.nix | 8 ++++ ...-incompatible-pointer-comparison-fix.patch | 26 +++++++++++++ pkgs/by-name/sd/SDL2_mixer_2_0/package.nix | 37 +++++++++++++++++++ pkgs/top-level/aliases.nix | 2 - 4 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/sd/SDL2_classic_mixer_2_0/package.nix create mode 100644 pkgs/by-name/sd/SDL2_mixer_2_0/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch create mode 100644 pkgs/by-name/sd/SDL2_mixer_2_0/package.nix diff --git a/pkgs/by-name/sd/SDL2_classic_mixer_2_0/package.nix b/pkgs/by-name/sd/SDL2_classic_mixer_2_0/package.nix new file mode 100644 index 0000000000000..ba06648eebf6c --- /dev/null +++ b/pkgs/by-name/sd/SDL2_classic_mixer_2_0/package.nix @@ -0,0 +1,8 @@ +{ + SDL2_mixer_2_0, + SDL2_classic_mixer, +}: + +SDL2_mixer_2_0.override { + SDL2_mixer = SDL2_classic_mixer; +} diff --git a/pkgs/by-name/sd/SDL2_mixer_2_0/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch b/pkgs/by-name/sd/SDL2_mixer_2_0/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch new file mode 100644 index 0000000000000..76fff3fa63e25 --- /dev/null +++ b/pkgs/by-name/sd/SDL2_mixer_2_0/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch @@ -0,0 +1,26 @@ +--- a/music_mpg123.c 2018-10-31 10:59:00.000000000 -0400 ++++ b/music_mpg123.c 2023-09-05 21:31:51.529191521 -0400 +@@ -48,7 +48,11 @@ + int (*mpg123_open_handle)(mpg123_handle *mh, void *iohandle); + const char* (*mpg123_plain_strerror)(int errcode); + void (*mpg123_rates)(const long **list, size_t *number); ++#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */ ++ int (*mpg123_read)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done ); ++#else + int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ); ++#endif + int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); + off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence ); + const char* (*mpg123_strerror)(mpg123_handle *mh); +@@ -95,7 +99,11 @@ + FUNCTION_LOADER(mpg123_open_handle, int (*)(mpg123_handle *mh, void *iohandle)) + FUNCTION_LOADER(mpg123_plain_strerror, const char* (*)(int errcode)) + FUNCTION_LOADER(mpg123_rates, void (*)(const long **list, size_t *number)); ++#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */ ++ FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done )) ++#else + FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done )) ++#endif + FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) + FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence )) + FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh)) diff --git a/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix b/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix new file mode 100644 index 0000000000000..96b3d40f10fbe --- /dev/null +++ b/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix @@ -0,0 +1,37 @@ +{ + SDL2_mixer, + fetchFromGitHub, + fetchpatch, + timidity, +}: + +let + attrset = { + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "SDL_mixer"; + rev = "release-${attrset.version}"; + hash = "sha256-vo9twUGeK2emDiGd9kSGuA/X8TxVmQrRFFm71zawWYM="; + }; + + patches = [ + # These patches fix incompatible function pointer conversion errors with clang 16. + (fetchpatch { + url = "https://github.com/libsdl-org/SDL_mixer/commit/4119ec3fe838d38d2433f4432cd18926bda5d093.patch"; + stripLen = 2; + hash = "sha256-Ug1EEZIRcV8+e1MeMsGHuTW7Zn6j4szqujP8IkIq2VM="; + }) + # Based on https://github.com/libsdl-org/SDL_mixer/commit/64ab759111ddb1b033bcce64e1a04e0cba6e498f + ./SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch + ]; + + # fix default path to timidity.cfg so MIDI files could be played + postPatch = '' + substituteInPlace timidity/options.h \ + --replace "/usr/share/timidity" "${timidity}/share/timidity" + ''; + }; +in +SDL2_mixer.overrideAttrs (_: attrset) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d5eda7a297330..3308f524d5438 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1655,8 +1655,6 @@ mapAliases { SDL1 = throw "'SDL1' has been removed as development ended long ago with SDL 2.0 replacing it, use SDL_compat instead"; # Added 2025-03-27 SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15 SDL_image_2_0 = throw "'SDL_image_2_0' has been removed in favor of the latest version"; # Added 2025-04-20 - SDL2_mixer_2_0 = throw "'SDL2_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27 - SDL2_classic_mixer_2_0 = throw "'SDL2_classic_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27 s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2024-10-17 sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06 sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2024-10-17