End of NixOS container era

2 files changed, 63 insertions, 0 deletions

diff --git a/hosts/iroha/gentoo/patches/games-util/xone/3bc363c48ec38c4a08c4294ca111ed9f75e3e026.diff b/hosts/iroha/gentoo/patches/games-util/xone/3bc363c48ec38c4a08c4294ca111ed9f75e3e026.diff
new file mode 100644
index 0000000..f133faf
--- /dev/null
+++ b/hosts/iroha/gentoo/patches/games-util/xone/3bc363c48ec38c4a08c4294ca111ed9f75e3e026.diff
@@ -0,0 +1,26 @@
+diff --git a/driver/headset.c b/driver/headset.c
+index 5eada22..4c6e73e 100644
+--- a/driver/headset.c
++++ b/driver/headset.c
+@@ -6,6 +6,7 @@
+ #include <linux/module.h>
+ #include <linux/hrtimer.h>
+ #include <linux/vmalloc.h>
++#include <linux/version.h>
+ #include <sound/core.h>
+ #include <sound/initval.h>
+ #include <sound/pcm.h>
+@@ -499,8 +500,13 @@ static int gip_headset_probe(struct gip_client *client)
+ 	INIT_DELAYED_WORK(&headset->work_power_on, gip_headset_power_on);
+ 	INIT_WORK(&headset->work_register, gip_headset_register);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0)
++	hrtimer_setup(&headset->timer, gip_headset_send_samples,
++		      CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++#else
+ 	hrtimer_init(&headset->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+ 	headset->timer.function = gip_headset_send_samples;
++#endif
+ 
+ 	err = gip_enable_audio(client);
+ 	if (err)
diff --git a/hosts/iroha/gentoo/patches/games-util/xone/b18d6d5b51c308bca665e6dfe63f31aecb98cce5.diff b/hosts/iroha/gentoo/patches/games-util/xone/b18d6d5b51c308bca665e6dfe63f31aecb98cce5.diff
new file mode 100644
index 0000000..7b23358
--- /dev/null
+++ b/hosts/iroha/gentoo/patches/games-util/xone/b18d6d5b51c308bca665e6dfe63f31aecb98cce5.diff
@@ -0,0 +1,37 @@
+diff --git a/driver/gamepad.c b/driver/gamepad.c
+index eec2aeaa..d424774b 100644
+--- a/driver/gamepad.c
++++ b/driver/gamepad.c
+@@ -6,6 +6,7 @@
+ #include <linux/module.h>
+ #include <linux/uuid.h>
+ #include <linux/timer.h>
++#include <linux/version.h>
+ 
+ #include "common.h"
+ #include "../auth/auth.h"
+@@ -207,8 +208,11 @@ static int gip_gamepad_init_input(struct gip_gamepad *gamepad)
+ 	return 0;
+ 
+ err_delete_timer:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0)
++	timer_delete_sync(&gamepad->rumble.timer);
++#else
+ 	del_timer_sync(&gamepad->rumble.timer);
+-
++#endif
+ 	return err;
+ }
+ 
+@@ -335,7 +339,11 @@ static void gip_gamepad_remove(struct gip_client *client)
+ {
+ 	struct gip_gamepad *gamepad = dev_get_drvdata(&client->dev);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0)
++	timer_delete_sync(&gamepad->rumble.timer);
++#else
+ 	del_timer_sync(&gamepad->rumble.timer);
++#endif
+ }
+ 
+ static struct gip_driver gip_gamepad_driver = {