summaryrefslogtreecommitdiff
path: root/games/veloren-weekly/files/patch-unix
diff options
context:
space:
mode:
Diffstat (limited to 'games/veloren-weekly/files/patch-unix')
-rw-r--r--games/veloren-weekly/files/patch-unix68
1 files changed, 34 insertions, 34 deletions
diff --git a/games/veloren-weekly/files/patch-unix b/games/veloren-weekly/files/patch-unix
index 2369920616b9..89f0f2dffd96 100644
--- a/games/veloren-weekly/files/patch-unix
+++ b/games/veloren-weekly/files/patch-unix
@@ -1,12 +1,12 @@
Relax Linux checks for the code works on any non-Windows platform.
---- cargo-crates/wgpu-26.0.1/build.rs.orig 2006-07-24 01:21:28 UTC
-+++ cargo-crates/wgpu-26.0.1/build.rs
+--- 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"), feature = "vulkan"),
+- 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.
@@ -15,55 +15,55 @@ Relax Linux checks for the code works on any non-Windows platform.
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", Emscripten), feature = "gles"),
+- 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-26.0.1/Cargo.toml.orig 1970-01-01 00:00:01 UTC
-+++ cargo-crates/wgpu-core-26.0.1/Cargo.toml
-@@ -206,7 +206,7 @@ optional = true
- version = "26.0.0"
+--- 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"))'.dependencies.wgpu-core-deps-windows-linux-android]
+-[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 = "26.0.0"
+ version = "27.0.0"
optional = true
---- cargo-crates/wgpu-core-26.0.1/build.rs.orig 2006-07-24 01:21:28 UTC
-+++ cargo-crates/wgpu-core-26.0.1/build.rs
+--- 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") },
+- 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-26.0.0/Cargo.toml.orig 1970-01-01 00:00:01 UTC
-+++ cargo-crates/wgpu-core-deps-windows-linux-android-26.0.0/Cargo.toml
-@@ -38,5 +38,5 @@ vulkan = ["wgpu-hal/vulkan"]
- renderdoc = ["wgpu-hal/renderdoc"]
- vulkan = ["wgpu-hal/vulkan"]
+--- 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"))'.dependencies.wgpu-hal]
+-[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 = "26.0.0"
---- cargo-crates/wgpu-hal-26.0.4/src/vulkan/adapter.rs.orig 2006-07-24 01:21:28 UTC
-+++ cargo-crates/wgpu-hal-26.0.4/src/vulkan/adapter.rs
-@@ -1170,7 +1170,7 @@ impl PhysicalDeviceProperties {
- // Prevent very large buffers on mesa and most android devices.
+ 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 {
- u64::MAX
---- cargo-crates/wgpu-hal-26.0.4/src/vulkan/instance.rs.orig 2006-07-24 01:21:28 UTC
-+++ cargo-crates/wgpu-hal-26.0.4/src/vulkan/instance.rs
-@@ -986,7 +986,7 @@ impl crate::Instance for super::Instance {
+ 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
});
@@ -72,11 +72,11 @@ Relax Linux checks for the code works on any non-Windows platform.
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 2024-02-14 21:58:23 UTC
+--- server-cli/src/main.rs.orig 2025-12-17 17:31:20 UTC
+++ server-cli/src/main.rs
-@@ -66,14 +66,14 @@ fn main() -> io::Result<()> {
+@@ -74,14 +74,14 @@ fn main() -> io::Result<()> {
// Load settings
- let settings = settings::Settings::load();
+ let settings = settings::Settings::load().ok_or(io::ErrorKind::Other)?;
- #[cfg(any(target_os = "linux", target_os = "macos"))]
+ #[cfg(not(target_os = "windows"))]
@@ -91,7 +91,7 @@ Relax Linux checks for the code works on any non-Windows platform.
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 2024-03-20 22:12:47 UTC
+--- server-cli/src/settings.rs.orig 2025-12-17 17:31:20 UTC
+++ server-cli/src/settings.rs
@@ -15,7 +15,7 @@ impl ShutdownSignal {
}
@@ -111,9 +111,9 @@ Relax Linux checks for the code works on any non-Windows platform.
vec![ShutdownSignal::SIGUSR1]
} else {
Vec::new()
---- voxygen/src/main.rs.orig 2024-02-07 19:13:27 UTC
+--- voxygen/src/main.rs.orig 2025-12-17 17:31:20 UTC
+++ voxygen/src/main.rs
-@@ -51,7 +51,7 @@ fn main() {
+@@ -47,7 +47,7 @@ fn main() {
cli::Commands::ListWgpuBackends => {
#[cfg(target_os = "windows")]
let backends = &["opengl", "dx12", "vulkan"];
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-19 13:53:36 +0000