games/fishfight: update to 0.4.2

Joystick support requires hgame(4) on FreeBSD >= 13.0, sysutils/iichid
or multimedia/webcamd.

Changes:	https://github.com/fishfight/FishFight/releases/tag/v0.4.2
Reported by:	GitHub (watch releases)

3 files changed, 113 insertions, 42 deletions

diff --git a/games/fishfight/Makefile b/games/fishfight/Makefile
index a4529229dd36..0cc101e5ac05 100644
--- a/games/fishfight/Makefile
+++ b/games/fishfight/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fishfight
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.1
+DISTVERSION=	0.4.2
 CATEGORIES=	games
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -10,13 +10,13 @@ LICENSE=	CC-BY-NC-4.0 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_MIT=	${WRKSRC}/licenses/LICENSE-MIT
 
-LIB_DEPENDS=	libasound.so:audio/alsa-lib
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libudev.so:devel/libudev-devd
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 
-USES=		cargo gl sdl xorg
+USES=		cargo gl localbase:ldflags xorg
 USE_GITHUB=	yes
 USE_GL=		gl
-USE_SDL=	sdl2
 USE_XORG=	x11 xi
 GH_PROJECT=	FishFight
 PLIST_FILES=	bin/${PORTNAME}
@@ -28,24 +28,23 @@ CARGO_CRATES=	adler32-1.2.0 \
 		async-trait-0.1.52 \
 		audir-sles-0.1.0 \
 		audrey-0.3.0 \
-		autocfg-1.0.1 \
+		autocfg-1.1.0 \
 		base-x-0.2.8 \
 		bitflags-1.3.2 \
 		bumpalo-3.9.1 \
 		bytemuck-1.7.3 \
 		byteorder-1.4.3 \
-		cc-1.0.72 \
+		cc-1.0.73 \
 		cfg-if-1.0.0 \
 		color_quant-1.1.0 \
 		core-foundation-0.6.4 \
 		core-foundation-sys-0.6.2 \
-		crc32fast-1.3.1 \
+		crc32fast-1.3.2 \
 		dasp_frame-0.11.0 \
 		dasp_sample-0.11.0 \
 		deflate-0.8.6 \
 		discard-1.0.4 \
 		ff-particles-0.1.2 \
-		fishsticks-0.2.0 \
 		fnv-1.0.7 \
 		fontdue-0.5.2 \
 		getrandom-0.2.4 \
@@ -54,7 +53,7 @@ CARGO_CRATES=	adler32-1.2.0 \
 		glam-0.14.0 \
 		hashbrown-0.9.1 \
 		hashbrown-0.12.0 \
-		hecs-0.7.5 \
+		hecs-0.7.6 \
 		hound-3.4.0 \
 		image-0.23.14 \
 		io-kit-sys-0.1.0 \
@@ -62,7 +61,7 @@ CARGO_CRATES=	adler32-1.2.0 \
 		js-sys-0.3.56 \
 		lazy_static-1.4.0 \
 		lewton-0.9.4 \
-		libc-0.2.116 \
+		libc-0.2.118 \
 		libudev-sys-0.1.4 \
 		log-0.4.14 \
 		mach-0.2.3 \
@@ -98,13 +97,11 @@ CARGO_CRATES=	adler32-1.2.0 \
 		sapp-linux-0.1.13 \
 		sapp-wasm-0.1.26 \
 		sapp-windows-0.2.19 \
-		sdl2-0.35.1 \
-		sdl2-sys-0.35.1 \
 		semver-0.9.0 \
 		semver-parser-0.7.0 \
 		serde-1.0.136 \
 		serde_derive-1.0.136 \
-		serde_json-1.0.78 \
+		serde_json-1.0.79 \
 		sha1-0.6.1 \
 		sha1_smol-1.0.0 \
 		smallvec-0.6.14 \
@@ -114,11 +111,11 @@ CARGO_CRATES=	adler32-1.2.0 \
 		stdweb-internal-macros-0.2.9 \
 		stdweb-internal-runtime-0.1.5 \
 		syn-1.0.86 \
+		toml-0.5.8 \
 		ttf-parser-0.12.3 \
 		unicode-xid-0.2.2 \
 		uuid-0.8.2 \
 		vec_map-0.8.2 \
-		version-compare-0.1.0 \
 		version_check-0.9.4 \
 		wasi-0.10.2+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.79 \
@@ -129,13 +126,10 @@ CARGO_CRATES=	adler32-1.2.0 \
 		web-sys-0.3.56 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-x86_64-pc-windows-gnu-0.4.0
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		fishsticks@git+https://github.com/fishfight/fishsticks\#95b45b717e427fb5fa1671f3bdf686d7270ad8a1
 
 post-patch:
-# Disable bundled SDL2 in favor of system
-	@${REINPLACE_CMD} 's,"bundled-sdl2",,' \
-			${WRKSRC}/core/Cargo.toml \
-			${WRKSRC}/Cargo.toml
 # Search assets under PREFIX instead of current directory
 	@${REINPLACE_CMD} '/_dir/s,"\.,"${DATADIR},' ${WRKSRC}/src/main.rs
 
diff --git a/games/fishfight/distinfo b/games/fishfight/distinfo
index f2fe19f60d00..01842062aab0 100644
--- a/games/fishfight/distinfo
+++ b/games/fishfight/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1645227666
+TIMESTAMP = 1646395819
 SHA256 (rust/crates/adler32-1.2.0.crate) = aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234
 SIZE (rust/crates/adler32-1.2.0.crate) = 6411
 SHA256 (rust/crates/ahash-0.4.7.crate) = 739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e
@@ -11,8 +11,8 @@ SHA256 (rust/crates/audir-sles-0.1.0.crate) = ea47348666a8edb7ad80cbee3940eb2bcc
 SIZE (rust/crates/audir-sles-0.1.0.crate) = 19230
 SHA256 (rust/crates/audrey-0.3.0.crate) = 58b92a84e89497e3cd25d3672cd5d1c288abaac02c18ff21283f17d118b889b8
 SIZE (rust/crates/audrey-0.3.0.crate) = 80961
-SHA256 (rust/crates/autocfg-1.0.1.crate) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
-SIZE (rust/crates/autocfg-1.0.1.crate) = 12908
+SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
+SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
 SHA256 (rust/crates/base-x-0.2.8.crate) = a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b
 SIZE (rust/crates/base-x-0.2.8.crate) = 10614
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
@@ -23,8 +23,8 @@ SHA256 (rust/crates/bytemuck-1.7.3.crate) = 439989e6b8c38d1b6570a384ef1e49c88481
 SIZE (rust/crates/bytemuck-1.7.3.crate) = 27879
 SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
 SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
-SHA256 (rust/crates/cc-1.0.72.crate) = 22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee
-SIZE (rust/crates/cc-1.0.72.crate) = 57495
+SHA256 (rust/crates/cc-1.0.73.crate) = 2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11
+SIZE (rust/crates/cc-1.0.73.crate) = 57880
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/color_quant-1.1.0.crate) = 3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b
@@ -33,8 +33,8 @@ SHA256 (rust/crates/core-foundation-0.6.4.crate) = 25b9e03f145fd4f2bf705e07b900c
 SIZE (rust/crates/core-foundation-0.6.4.crate) = 25233
 SHA256 (rust/crates/core-foundation-sys-0.6.2.crate) = e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b
 SIZE (rust/crates/core-foundation-sys-0.6.2.crate) = 16204
-SHA256 (rust/crates/crc32fast-1.3.1.crate) = a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3
-SIZE (rust/crates/crc32fast-1.3.1.crate) = 38655
+SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
+SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
 SHA256 (rust/crates/dasp_frame-0.11.0.crate) = b2a3937f5fe2135702897535c8d4a5553f8b116f76c1529088797f2eee7c5cd6
 SIZE (rust/crates/dasp_frame-0.11.0.crate) = 4910
 SHA256 (rust/crates/dasp_sample-0.11.0.crate) = 0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f
@@ -45,8 +45,6 @@ SHA256 (rust/crates/discard-1.0.4.crate) = 212d0f5754cb6769937f4501cc0e67f4f4483
 SIZE (rust/crates/discard-1.0.4.crate) = 4700
 SHA256 (rust/crates/ff-particles-0.1.2.crate) = 456005c433b73c5268369b27894cd5fa94a0abb3e0489540152383849f1045c0
 SIZE (rust/crates/ff-particles-0.1.2.crate) = 15120
-SHA256 (rust/crates/fishsticks-0.2.0.crate) = b58c0572ea130de4f1734217e364d885237134ab934c4a6aec35f9b6d9a7613b
-SIZE (rust/crates/fishsticks-0.2.0.crate) = 9531
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
 SHA256 (rust/crates/fontdue-0.5.2.crate) = c75712fff1702bac51b7eaa5a5ca9f9853b8055ef5906088a32f4fe196595a1d
@@ -63,8 +61,8 @@ SHA256 (rust/crates/hashbrown-0.9.1.crate) = d7afe4a420e3fe79967a00898cc1f4db7c8
 SIZE (rust/crates/hashbrown-0.9.1.crate) = 77734
 SHA256 (rust/crates/hashbrown-0.12.0.crate) = 8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758
 SIZE (rust/crates/hashbrown-0.12.0.crate) = 90663
-SHA256 (rust/crates/hecs-0.7.5.crate) = 6c0eac587c883895f32067e69a2e241c57b6248eccee80e684033d4e2e1e43c3
-SIZE (rust/crates/hecs-0.7.5.crate) = 71823
+SHA256 (rust/crates/hecs-0.7.6.crate) = 8d4e8eb4d5dd2ea100ffbb4eb6814f4294a7362fcafbc5c1c4c015b41d16f424
+SIZE (rust/crates/hecs-0.7.6.crate) = 72947
 SHA256 (rust/crates/hound-3.4.0.crate) = 8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549
 SIZE (rust/crates/hound-3.4.0.crate) = 35390
 SHA256 (rust/crates/image-0.23.14.crate) = 24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1
@@ -79,8 +77,8 @@ SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832a
 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
 SHA256 (rust/crates/lewton-0.9.4.crate) = 8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0
 SIZE (rust/crates/lewton-0.9.4.crate) = 63667
-SHA256 (rust/crates/libc-0.2.116.crate) = 565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74
-SIZE (rust/crates/libc-0.2.116.crate) = 566648
+SHA256 (rust/crates/libc-0.2.118.crate) = 06e509672465a0504304aa87f9f176f2b2b716ed8fb105ebe5c02dc6dce96a94
+SIZE (rust/crates/libc-0.2.118.crate) = 575669
 SHA256 (rust/crates/libudev-sys-0.1.4.crate) = 3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324
 SIZE (rust/crates/libudev-sys-0.1.4.crate) = 6177
 SHA256 (rust/crates/log-0.4.14.crate) = 51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710
@@ -151,10 +149,6 @@ SHA256 (rust/crates/sapp-wasm-0.1.26.crate) = 00e859e8645a3bcb85aecd40bab883438e
 SIZE (rust/crates/sapp-wasm-0.1.26.crate) = 26747
 SHA256 (rust/crates/sapp-windows-0.2.19.crate) = f3e9a4ab4682752ffcbbacf87b44c75373479331dfe408432280d305e0563c9c
 SIZE (rust/crates/sapp-windows-0.2.19.crate) = 25538
-SHA256 (rust/crates/sdl2-0.35.1.crate) = f035f8e87735fa3a8437292be49fe6056450f7cbb13c230b4bcd1bdd7279421f
-SIZE (rust/crates/sdl2-0.35.1.crate) = 175240
-SHA256 (rust/crates/sdl2-sys-0.35.1.crate) = 94cb479353c0603785c834e2307440d83d196bf255f204f7f6741358de8d6a2f
-SIZE (rust/crates/sdl2-sys-0.35.1.crate) = 7459715
 SHA256 (rust/crates/semver-0.9.0.crate) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403
 SIZE (rust/crates/semver-0.9.0.crate) = 17344
 SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3
@@ -163,8 +157,8 @@ SHA256 (rust/crates/serde-1.0.136.crate) = ce31e24b01e1e524df96f1c2fdd054405f8d7
 SIZE (rust/crates/serde-1.0.136.crate) = 76158
 SHA256 (rust/crates/serde_derive-1.0.136.crate) = 08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9
 SIZE (rust/crates/serde_derive-1.0.136.crate) = 54776
-SHA256 (rust/crates/serde_json-1.0.78.crate) = d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085
-SIZE (rust/crates/serde_json-1.0.78.crate) = 144364
+SHA256 (rust/crates/serde_json-1.0.79.crate) = 8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95
+SIZE (rust/crates/serde_json-1.0.79.crate) = 144451
 SHA256 (rust/crates/sha1-0.6.1.crate) = c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770
 SIZE (rust/crates/sha1-0.6.1.crate) = 2931
 SHA256 (rust/crates/sha1_smol-1.0.0.crate) = ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012
@@ -183,6 +177,8 @@ SHA256 (rust/crates/stdweb-internal-runtime-0.1.5.crate) = 213701ba3370744dcd1a1
 SIZE (rust/crates/stdweb-internal-runtime-0.1.5.crate) = 5445
 SHA256 (rust/crates/syn-1.0.86.crate) = 8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b
 SIZE (rust/crates/syn-1.0.86.crate) = 235126
+SHA256 (rust/crates/toml-0.5.8.crate) = a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa
+SIZE (rust/crates/toml-0.5.8.crate) = 54219
 SHA256 (rust/crates/ttf-parser-0.12.3.crate) = 7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6
 SIZE (rust/crates/ttf-parser-0.12.3.crate) = 105969
 SHA256 (rust/crates/unicode-xid-0.2.2.crate) = 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3
@@ -191,8 +187,6 @@ SHA256 (rust/crates/uuid-0.8.2.crate) = bc5cf98d8186244414c848017f0e2676b3fcb468
 SIZE (rust/crates/uuid-0.8.2.crate) = 37909
 SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
 SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
-SHA256 (rust/crates/version-compare-0.1.0.crate) = fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73
-SIZE (rust/crates/version-compare-0.1.0.crate) = 14169
 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
 SIZE (rust/crates/version_check-0.9.4.crate) = 14895
 SHA256 (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6
@@ -215,5 +209,7 @@ SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (fishfight-FishFight-v0.4.1_GH0.tar.gz) = 58c59c6ea24c2af327b59a50685cb7ddd790dd1eab2804b670af25fa89435a03
-SIZE (fishfight-FishFight-v0.4.1_GH0.tar.gz) = 36926301
+SHA256 (fishfight-fishsticks-95b45b717e427fb5fa1671f3bdf686d7270ad8a1_GH0.tar.gz) = 1ddea5417e7f8aa753545ff66edb2229e7ab33401b59d69c133c4de5988f476d
+SIZE (fishfight-fishsticks-95b45b717e427fb5fa1671f3bdf686d7270ad8a1_GH0.tar.gz) = 10170
+SHA256 (fishfight-FishFight-v0.4.2_GH0.tar.gz) = 517a3ab6cad42c528e27c5268d1b3b7f4f3a2029c7e3aea11d46c4ea874ff268
+SIZE (fishfight-FishFight-v0.4.2_GH0.tar.gz) = 37001979
diff --git a/games/fishfight/files/patch-gilrs-evdev b/games/fishfight/files/patch-gilrs-evdev
new file mode 100644
index 000000000000..d80c9802b7a2
--- /dev/null
+++ b/games/fishfight/files/patch-gilrs-evdev
@@ -0,0 +1,81 @@
+https://gitlab.com/gilrs-project/gilrs/-/merge_requests/56
+
+--- cargo-crates/gilrs-0.8.2/src/mapping/mod.rs.orig	1970-01-01 00:00:00 UTC
++++ cargo-crates/gilrs-0.8.2/src/mapping/mod.rs
+@@ -24,14 +24,14 @@ use vec_map::VecMap;
+ use self::parser::{Error as ParserError, ErrorKind as ParserErrorKind, Parser, Token};
+ 
+ /// Platform name used by SDL mappings
+-#[cfg(target_os = "linux")]
++#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))]
+ const SDL_PLATFORM_NAME: &str = "Linux";
+ #[cfg(target_os = "macos")]
+ const SDL_PLATFORM_NAME: &'static str = "Mac OS X";
+ #[cfg(target_os = "windows")]
+ const SDL_PLATFORM_NAME: &'static str = "Windows";
+ #[cfg(all(
+-    not(target_os = "linux"),
++    not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd")),
+     not(target_os = "macos"),
+     not(target_os = "windows")
+ ))]
+--- cargo-crates/gilrs-core-0.3.2/Cargo.toml.orig	1970-01-01 00:00:00 UTC
++++ cargo-crates/gilrs-core-0.3.2/Cargo.toml
+@@ -54,16 +54,16 @@ optional = true
+ [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-rs]
+ version = "0.2"
+ package = "wasm-bindgen"
+-[target."cfg(target_os = \"linux\")".dependencies.libc]
++[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\"))".dependencies.libc]
+ version = "0.2"
+ 
+-[target."cfg(target_os = \"linux\")".dependencies.libudev-sys]
++[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\"))".dependencies.libudev-sys]
+ version = "0.1"
+ 
+-[target."cfg(target_os = \"linux\")".dependencies.nix]
++[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\"))".dependencies.nix]
+ version = "0.23.1"
+ 
+-[target."cfg(target_os = \"linux\")".dependencies.vec_map]
++[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\"))".dependencies.vec_map]
+ version = "0.8"
+ [target."cfg(target_os = \"macos\")".dependencies.core-foundation]
+ version = "0.6"
+--- cargo-crates/gilrs-core-0.3.2/src/platform/linux/ff.rs.orig	1970-01-01 00:00:00 UTC
++++ cargo-crates/gilrs-core-0.3.2/src/platform/linux/ff.rs
+@@ -104,10 +104,10 @@ impl Device {
+ 
+ impl Drop for Device {
+     fn drop(&mut self) {
+-        #[cfg(target_pointer_width = "64")]
+-        let effect = self.effect as u64;
+-        #[cfg(target_pointer_width = "32")]
+-        let effect = self.effect as u32;
++        #[cfg(target_os = "linux")]
++        let effect = self.effect as ::libc::c_ulong;
++        #[cfg(not(target_os = "linux"))]
++        let effect = self.effect as ::libc::c_int;
+ 
+         if let Err(err) = unsafe { ioctl::eviocrmff(self.file.as_raw_fd(), effect) } {
+             error!(
+--- cargo-crates/gilrs-core-0.3.2/src/platform/mod.rs.orig	1970-01-01 00:00:00 UTC
++++ cargo-crates/gilrs-core-0.3.2/src/platform/mod.rs
+@@ -21,7 +21,7 @@
+ 
+ pub use self::platform::*;
+ 
+-#[cfg(target_os = "linux")]
++#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))]
+ #[path = "linux/mod.rs"]
+ mod platform;
+ 
+@@ -38,7 +38,7 @@ mod platform;
+ mod platform;
+ 
+ #[cfg(all(
+-    not(target_os = "linux"),
++    not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd")),
+     not(target_os = "macos"),
+     not(target_os = "windows"),
+     not(target_arch = "wasm32")