diff --git a/games/veloren-weekly/files/patch-unix b/games/veloren-weekly/files/patch-unix index 89f0f2dffd96..39f63c68b19c 100644 --- a/games/veloren-weekly/files/patch-unix +++ b/games/veloren-weekly/files/patch-unix @@ -1,124 +1,74 @@ Relax Linux checks for the code works on any non-Windows platform. ---- cargo-crates/wgpu-27.0.1/build.rs.orig 2006-07-24 01:21:28 UTC -+++ cargo-crates/wgpu-27.0.1/build.rs -@@ -16,7 +16,7 @@ fn main() { - metal: { all(target_vendor = "apple", feature = "metal") }, - vulkan: { any( - // The `vulkan` feature enables the Vulkan backend only on "native Vulkan" platforms, i.e. Windows/Linux/Android -- all(any(windows, target_os = "linux", target_os = "android", target_os = "freebsd"), feature = "vulkan"), -+ all(any(windows, unix), not(target_vendor = "apple"), feature = "vulkan"), - // On Apple platforms, however, we require the `vulkan-portability` feature - // to explicitly opt-in to Vulkan since it's meant to be used with MoltenVK. - all(target_vendor = "apple", feature = "vulkan-portability") -@@ -24,7 +24,7 @@ fn main() { - gles: { any( - // The `gles` feature enables the OpenGL/GLES backend only on "native OpenGL" platforms, i.e. Windows, Linux, Android, and Emscripten. - // (Note that WebGL is also not included here!) -- all(any(windows, target_os = "linux", target_os = "android", target_os = "freebsd", Emscripten), feature = "gles"), -+ all(any(windows, unix, Emscripten), not(target_vendor = "apple"), feature = "gles"), - // On Apple platforms, however, we require the `angle` feature to explicitly opt-in to OpenGL - // since its meant to be used with ANGLE. - all(target_vendor = "apple", feature = "angle") ---- cargo-crates/wgpu-core-27.0.3/Cargo.toml.orig 1970-01-01 00:00:01 UTC -+++ cargo-crates/wgpu-core-27.0.3/Cargo.toml -@@ -201,7 +201,7 @@ optional = true - version = "27.0.0" - optional = true - --[target.'cfg(any(windows, target_os = "linux", target_os = "android", target_os = "freebsd"))'.dependencies.wgpu-core-deps-windows-linux-android] -+[target.'cfg(all(any(windows, unix), not(target_vendor = "apple")))'.dependencies.wgpu-core-deps-windows-linux-android] - version = "27.0.0" - optional = true - ---- cargo-crates/wgpu-core-27.0.3/build.rs.orig 2006-07-24 01:21:28 UTC -+++ cargo-crates/wgpu-core-27.0.3/build.rs -@@ -1,6 +1,6 @@ fn main() { - fn main() { - cfg_aliases::cfg_aliases! { -- windows_linux_android: { any(windows, target_os = "linux", target_os = "android", target_os = "freebsd") }, -+ windows_linux_android: { all(any(windows, unix), not(target_vendor = "apple")) }, - send_sync: { all( - feature = "std", - any( ---- cargo-crates/wgpu-core-deps-windows-linux-android-27.0.0/Cargo.toml.orig 1970-01-01 00:00:01 UTC -+++ cargo-crates/wgpu-core-deps-windows-linux-android-27.0.0/Cargo.toml -@@ -38,5 +38,5 @@ path = "src/lib.rs" - name = "wgpu_core_deps_windows_linux_android" - path = "src/lib.rs" - --[target.'cfg(any(windows, target_os = "linux", target_os = "android", target_os = "freebsd"))'.dependencies.wgpu-hal] -+[target.'cfg(all(any(windows, unix), not(target_vendor = "apple")))'.dependencies.wgpu-hal] - version = "27.0.0" --- cargo-crates/wgpu-hal-27.0.4/src/vulkan/adapter.rs.orig 2006-07-24 01:21:28 UTC +++ cargo-crates/wgpu-hal-27.0.4/src/vulkan/adapter.rs @@ -1207,7 +1207,7 @@ impl PhysicalDeviceProperties { // don't risk confusing JS by exceeding the range of a double. let is_nvidia = self.properties.vendor_id == crate::auxil::db::nvidia::VENDOR; let max_buffer_size = - if (cfg!(target_os = "linux") || cfg!(target_os = "android")) && !is_nvidia { + if (cfg!(all(unix, not(target_vendor = "apple")))) && !is_nvidia { i32::MAX as u64 } else { 1u64 << 52 --- cargo-crates/wgpu-hal-27.0.4/src/vulkan/instance.rs.orig 2006-07-24 01:21:28 UTC +++ cargo-crates/wgpu-hal-27.0.4/src/vulkan/instance.rs @@ -988,7 +988,7 @@ impl crate::Instance for super::Instance { exposed.info.device_type == wgt::DeviceType::DiscreteGpu && exposed.info.vendor == db::nvidia::VENDOR }); - if cfg!(target_os = "linux") && has_nvidia_dgpu && self.shared.has_nv_optimus { + if cfg!(unix) && has_nvidia_dgpu && self.shared.has_nv_optimus { for exposed in exposed_adapters.iter_mut() { if exposed.info.device_type == wgt::DeviceType::IntegratedGpu && exposed.info.vendor == db::intel::VENDOR --- server-cli/src/main.rs.orig 2025-12-17 17:31:20 UTC +++ server-cli/src/main.rs @@ -74,14 +74,14 @@ fn main() -> io::Result<()> { // Load settings let settings = settings::Settings::load().ok_or(io::ErrorKind::Other)?; - #[cfg(any(target_os = "linux", target_os = "macos"))] + #[cfg(not(target_os = "windows"))] { for signal in &settings.shutdown_signals { let _ = signal_hook::flag::register(signal.to_signal(), Arc::clone(&shutdown_signal)); } } - #[cfg(not(any(target_os = "linux", target_os = "macos")))] + #[cfg(target_os = "windows")] if !settings.shutdown_signals.is_empty() { tracing::warn!( "Server configuration contains shutdown signals, but your platform does not support \ --- server-cli/src/settings.rs.orig 2025-12-17 17:31:20 UTC +++ server-cli/src/settings.rs @@ -15,7 +15,7 @@ impl ShutdownSignal { } impl ShutdownSignal { - #[cfg(any(target_os = "linux", target_os = "macos"))] + #[cfg(not(target_os = "windows"))] pub fn to_signal(self) -> core::ffi::c_int { match self { Self::SIGUSR1 => signal_hook::consts::SIGUSR1, @@ -48,7 +48,7 @@ impl Default for Settings { web_address: SocketAddr::from((Ipv4Addr::LOCALHOST, 14005)), web_chat_secret: None, ui_api_secret: None, - shutdown_signals: if cfg!(any(target_os = "linux", target_os = "macos")) { + shutdown_signals: if cfg!(not(target_os = "windows")) { vec![ShutdownSignal::SIGUSR1] } else { Vec::new() --- voxygen/src/main.rs.orig 2025-12-17 17:31:20 UTC +++ voxygen/src/main.rs @@ -47,7 +47,7 @@ fn main() { cli::Commands::ListWgpuBackends => { #[cfg(target_os = "windows")] let backends = &["opengl", "dx12", "vulkan"]; - #[cfg(target_os = "linux")] + #[cfg(not(any(target_os = "windows", target_os = "macos")))] let backends = &["opengl", "vulkan"]; #[cfg(target_os = "macos")] let backends = &["metal"];