From dd0ae16be1c94f442507af0f1de699c100a15b5b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 28 Dec 2023 12:48:06 +0100 Subject: [PATCH 1/3] libvgm: unstable-2023-08-14 -> unstable-2024-01-03 --- pkgs/development/libraries/libvgm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 31508b01fbd0..0d7c098255f2 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -40,15 +40,15 @@ let inherit (lib) optional optionals; onOff = val: if val then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libvgm"; - version = "unstable-2023-08-14"; + version = "unstable-2024-01-03"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "079c4e737e6a73b38ae20125521d7d9eafda28e9"; - sha256 = "hmaGIf9AQOYqrpnmKAB9I2vO+EXrzvoRaQ6Epdygy4o="; + rev = "223b6f9d629feda1982dc4bbeebd19fa63b987fb"; + hash = "sha256-CrqgDuOsY+Hpp41De6oWJduj8d8ftMUanMEWJKh79rw="; }; outputs = [ From 3cabe5375d0815e8c00fa201a2fd49f2f8841e5d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 28 Dec 2023 12:49:45 +0100 Subject: [PATCH 2/3] vgmplay-libvgm: unstable-2023-04-12 -> unstable-2024-01-03 --- pkgs/applications/audio/vgmplay-libvgm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/vgmplay-libvgm/default.nix b/pkgs/applications/audio/vgmplay-libvgm/default.nix index 199f75ff2027..75701682e128 100644 --- a/pkgs/applications/audio/vgmplay-libvgm/default.nix +++ b/pkgs/applications/audio/vgmplay-libvgm/default.nix @@ -9,15 +9,15 @@ , inih }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vgmplay-libvgm"; - version = "unstable-2023-04-12"; + version = "unstable-2024-01-03"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "vgmplay-libvgm"; - rev = "813abab549e99bb7e936acbfa1199cf435c237c6"; - sha256 = "sdQO+xk3a7AFXo3jpbcuNBkd19PjKoBMRhr4IK06oHg="; + rev = "7db1c63c056d79a8f9f533aa7eb82b7fdf7d456c"; + hash = "sha256-GjBwu8Y/lOI8SLO4SrAWcntQIwKe/hXuh9tKbOPHQiA="; }; nativeBuildInputs = [ cmake pkg-config ]; From ea74cbe410e4919022fbf546bba1ac51cccb5d22 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 1 Jan 2024 15:12:47 +0100 Subject: [PATCH 3/3] mmlgui: Fix compatibility with newer libvgm --- pkgs/applications/audio/mmlgui/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index d31ece0187d3..98be95b3bf12 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { # Don't force building tests substituteInPlace Makefile \ --replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)' + + # Breaking change in libvgm + substituteInPlace src/emu_player.cpp \ + --replace 'Resmpl_SetVals(&resmpl, 0xff' 'Resmpl_SetVals(&resmpl, RSMODE_LINEAR' ''; strictDeps = true;