From 99fb9ad51b928003bebf836e47ab63e1ad4b3183 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 29 Dec 2025 18:02:34 +0100
Subject: [PATCH 1/2] libsidplayfp: 2.15.2 -> 2.16.0

---
 pkgs/by-name/li/libsidplayfp/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index e4d6d581d0b6..30088314bf95 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -11,6 +11,7 @@
   graphviz,
   libexsid,
   libgcrypt,
+  libusb1,
   perl,
   pkg-config,
   xa,
@@ -18,14 +19,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libsidplayfp";
-  version = "2.15.2";
+  version = "2.16.0";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libsidplayfp";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-/GXRqLt2wPCUiOKlaEq52APOOYWgbaejzJcppZgMgfA=";
+    hash = "sha256-0eupR9HNhF8TERCtNTH8qx7mohLI7im8btJtByWHoY8=";
   };
 
   outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
@@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libexsid
     libgcrypt
+    libusb1
   ];
 
   enableParallelBuilding = true;
@@ -58,6 +60,13 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.strings.enableFeature true "hardsid")
     (lib.strings.withFeature true "gcrypt")
     (lib.strings.withFeature true "exsid")
+    (lib.strings.withFeature true "usbsid")
+    # Supposedly runtime detection only supported on GCC
+    # https://github.com/libsidplayfp/libsidplayfp/commit/65874166b14d44467782d2996f7b644fbde0ee87
+    # __builtin_cpu_supports on GCC's list of x86 built-in functions
+    (lib.strings.withFeatureAs true "simd" (
+      if (stdenv.cc.isGNU && stdenv.hostPlatform.isx86) then "runtime" else "none"
+    ))
     (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests")
   ];
 

From 5ae0ee01fcd41c53678fc15d8720e40c02659b9d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 29 Dec 2025 18:05:46 +0100
Subject: [PATCH 2/2] libsidplayfp: Ignore rc versions in passthru.updateScript

---
 pkgs/by-name/li/libsidplayfp/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index 30088314bf95..b5baf81afc5e 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -93,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
     updateScript = gitUpdater {
       rev-prefix = "v";
+      ignoredVersions = "rc$";
     };
   };