feat(termux): MC 启动接线——Linux arm64 natives + softpipe 子进程环境
- Library::native_classifier：Linux/aarch64 上把 LWJGL3 的 natives-linux 改写成 natives-linux-arm64（Mojang 清单只有 x86_64） - install::libraries：arm64 分类器在清单里没有下载信息时，按 Maven 相对路径 兜底到阿里云镜像（实测 Mojang libraries 404、Aliyun 200）； 单测覆盖 arm64 兜底与 x86_64 不变 - launch::defaults：Termux glibc 构建启动 MC 时默认带 MESA_LOADER_DRIVER_OVERRIDE=swrast / LIBGL_ALWAYS_SOFTWARE=1（用户可覆盖） - 文档：JRE patchelf 一次性步骤与接线现状；README 同步 - 验证：patched Temurin java 直接执行；LWJGL arm64+GLFW 探针 gl-ok
This commit is contained in:
AskaEth committed
1 parent
29e49dd7a4
commit
147280d12a
5 files changed
+179
-26
No files matched your search
@@ -79,31 +79,42 @@ pub fn plan(
|
||||
let Some(classifier) = library.native_classifier(environment) else {
|
||||
continue;
|
||||
};
|
||||
let Some(artifact) = library.native_artifact(&classifier) else {
|
||||
warnings.push(format!(
|
||||
"{} 的 natives 分类器 {classifier} 没有下载信息，已跳过",
|
||||
library.name
|
||||
));
|
||||
continue;
|
||||
};
|
||||
let Ok(native_relative) = library.native_relative_path(&classifier) else {
|
||||
warnings.push(format!("{} 的 natives 路径推导失败，已跳过", library.name));
|
||||
continue;
|
||||
};
|
||||
if !artifact.has_url() {
|
||||
warnings.push(format!(
|
||||
"{} 的 natives 构件 {classifier} 没有下载地址，已跳过",
|
||||
library.name
|
||||
));
|
||||
continue;
|
||||
}
|
||||
let dest = layout.libraries_dir().join(&native_relative);
|
||||
// Linux arm64：Mojang 清单没有 arm64 分类器，兜底到 Maven 镜像（见常量注释）。
|
||||
let arm64_fallback = classifier == LINUX_ARM64_CLASSIFIER;
|
||||
let (url, sha1, size) = match library.native_artifact(&classifier) {
|
||||
Some(artifact) if artifact.has_url() => (
|
||||
artifact.url.clone().unwrap_or_default(),
|
||||
artifact.sha1.clone(),
|
||||
artifact.size,
|
||||
),
|
||||
_ if arm64_fallback => (arm64_native_url(&native_relative), None, None),
|
||||
Some(_) => {
|
||||
warnings.push(format!(
|
||||
"{} 的 natives 构件 {classifier} 没有下载地址，已跳过",
|
||||
library.name
|
||||
));
|
||||
continue;
|
||||
}
|
||||
None => {
|
||||
warnings.push(format!(
|
||||
"{} 的 natives 分类器 {classifier} 没有下载信息，已跳过",
|
||||
library.name
|
||||
));
|
||||
continue;
|
||||
}
|
||||
};
|
||||
files.push(PlanFile {
|
||||
role: FileRole::Native,
|
||||
name: format!("{}:{classifier}", library.name),
|
||||
url: artifact.url.clone().unwrap_or_default(),
|
||||
sha1: artifact.sha1.clone(),
|
||||
size: artifact.size,
|
||||
dest: layout.libraries_dir().join(native_relative),
|
||||
url,
|
||||
sha1,
|
||||
size,
|
||||
dest,
|
||||
resource: ResourceKind::Library,
|
||||
});
|
||||
}
|
||||
@@ -141,6 +152,22 @@ fn maven_url(library: &Library, relative: &Path) -> String {
|
||||
}
|
||||
}
|
||||
|
||||
/// Linux arm64 的 natives 兜底仓库：Mojang 的 `libraries.minecraft.net` 对
|
||||
/// `natives-linux-arm64` 一律 404（实测 3.3.2 的 lwjgl/glfw/opengl/stb/tinyfd/openal），
|
||||
/// 同一坐标在 Maven Central / 阿里云镜像有。
|
||||
pub const LINUX_ARM64_NATIVES_BASE: &str = "https://maven.aliyun.com/repository/public/";
|
||||
|
||||
/// Linux arm64 的 natives 分类器（见 `Library::native_classifier`）。
|
||||
pub const LINUX_ARM64_CLASSIFIER: &str = "natives-linux-arm64";
|
||||
|
||||
/// arm64 natives 的兜底 URL（按相对路径拼镜像基址）。
|
||||
fn arm64_native_url(relative: &Path) -> String {
|
||||
format!(
|
||||
"{LINUX_ARM64_NATIVES_BASE}{}",
|
||||
relative.to_string_lossy().replace('\\', "/")
|
||||
)
|
||||
}
|
||||
|
||||
/// 供上层判错用：库展开不产生硬失败，缺地址一律降级成告警。
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
@@ -255,4 +282,52 @@ mod tests {
|
||||
.dest
|
||||
.ends_with("versions/inst/libraries/net/minecraftforge/forge/1.20.1-47.2.0.jar"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn linux_arm64_lwjgl3_natives_fall_back_to_maven_mirror() {
|
||||
// Mojang 的清单只有 `natives-linux`（x86_64）且没有 arm64 分类器下载信息；
|
||||
// Linux arm64 要改写成 `natives-linux-arm64` 并兜底到 Maven 镜像。
|
||||
let library = library_with_artifact(
|
||||
r#"{"name":"org.lwjgl:lwjgl:3.3.2","natives":{"linux":"natives-linux"}}"#,
|
||||
);
|
||||
let env = Environment {
|
||||
os: "linux".to_string(),
|
||||
os_version: String::new(),
|
||||
arch: "arm64".to_string(),
|
||||
..environment()
|
||||
};
|
||||
let layout = GameLayout::new("/g/.minecraft");
|
||||
let (files, warnings) = plan(&layout, "1.20.4", &[library], &env);
|
||||
assert!(warnings.is_empty(), "不该有告警：{warnings:?}");
|
||||
assert_eq!(files.len(), 1);
|
||||
assert_eq!(files[0].name, "org.lwjgl:lwjgl:3.3.2:natives-linux-arm64");
|
||||
assert_eq!(
|
||||
files[0].url,
|
||||
"https://maven.aliyun.com/repository/public/org/lwjgl/lwjgl/3.3.2/lwjgl-3.3.2-natives-linux-arm64.jar"
|
||||
);
|
||||
assert!(
|
||||
files[0].sha1.is_none(),
|
||||
"镜像兜底没有 sha1，只能靠大小/存在性"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn linux_x86_64_keeps_the_manifest_classifier() {
|
||||
let library = library_with_artifact(
|
||||
r#"{"name":"org.lwjgl:lwjgl:3.3.2","natives":{"linux":"natives-linux"}}"#,
|
||||
);
|
||||
let env = Environment {
|
||||
os: "linux".to_string(),
|
||||
os_version: String::new(),
|
||||
arch: "x86_64".to_string(),
|
||||
..environment()
|
||||
};
|
||||
let layout = GameLayout::new("/g/.minecraft");
|
||||
let (files, warnings) = plan(&layout, "1.20.4", &[library], &env);
|
||||
assert!(files.is_empty(), "x86_64 没有清单下载信息，不该凭空拼 URL");
|
||||
assert!(
|
||||
warnings.iter().any(|w| w.contains("natives-linux")),
|
||||
"{warnings:?}"
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -172,6 +172,11 @@ impl Library {
|
||||
}
|
||||
|
||||
/// natives 分类器名：按 OS 查 `natives` 表并展开 `${arch}`（64 位为 `64`）。
|
||||
///
|
||||
/// **Linux arm64 特例**：Mojang 的 LWJGL3 条目只写 `natives-linux`（x86_64），
|
||||
/// 但同一个 Maven 坐标有 `natives-linux-arm64`。原样用 `natives-linux` 会下到 x86_64
|
||||
/// 的 `.so`，在 aarch64 JVM 里加载失败；这里改成 arm64 分类器（下载地址的兜底见
|
||||
/// `install::libraries`）。
|
||||
pub fn native_classifier(&self, env: &Environment) -> Option<String> {
|
||||
let raw = self.natives.as_ref()?.get(&env.os)?;
|
||||
let arch = if matches!(env.arch.as_str(), "x86_64" | "arm64") {
|
||||
@@ -179,7 +184,20 @@ impl Library {
|
||||
} else {
|
||||
""
|
||||
};
|
||||
Some(raw.replace("${arch}", arch))
|
||||
let classifier = raw.replace("${arch}", arch);
|
||||
if env.os == "linux"
|
||||
&& env.arch == "arm64"
|
||||
&& classifier == "natives-linux"
|
||||
&& self.is_lwjgl3()
|
||||
{
|
||||
return Some("natives-linux-arm64".to_owned());
|
||||
}
|
||||
Some(classifier)
|
||||
}
|
||||
|
||||
/// 是否是 LWJGL 3（`org.lwjgl:<module>`；LWJGL 2 的 group 是 `org.lwjgl.lwjgl`）。
|
||||
fn is_lwjgl3(&self) -> bool {
|
||||
self.name.starts_with("org.lwjgl:")
|
||||
}
|
||||
|
||||
/// natives 构件下载信息（按分类器查 `downloads.classifiers`）。
|
||||
|
||||
Reference in new issue
Block a user