From 491b59d078857cf91be6150cbd0ab8f345309fc2 Mon Sep 17 00:00:00 2001 From: sunrisepeak Date: Wed, 22 Jul 2026 20:57:38 +0800 Subject: [PATCH] =?UTF-8?q?feat(pkgs):=20opencv=200.0.10=20=E2=80=94=20per?= =?UTF-8?q?-glob=20flags=20=E8=BF=81=E5=85=A5=20OS=20=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=8C=96=20cfg=20=E8=A1=A8(mcpp#258),=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E7=AB=AF=E6=AD=BB=20glob=20=E8=AD=A6=E5=91=8A=E5=BD=92?= =?UTF-8?q?=E9=9B=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit opencv-m#16(v0.0.10):51 条 base [[build.flags]] 按文件实际编译的 OS 迁入 [target.'cfg(...)'.build.flags](cfg(unix)/cfg(linux)/cfg(macos)/ cfg(windows)),条目正文逐字不变。谓词不匹配的条目不进 glob 表, 消费端构建不再刷 ~26 条结构性死 glob 警告(linux 上为 windows stub glob + neon TU,其它平台对称)。floor 不变(mcpp >= 0.0.102)。 包侧验证:五腿 CI 全绿;linux 上 compile_commands.json 迁移前后全部 2861 TU token 多重集一致(仅 -msse3 位置移动)。 同步 tests/examples/opencv-module{,-dnn} 至 0.0.10。 桩层(703 个 windows stub)保留,移除跟踪于 opencv-m#17。 --- pkgs/o/opencv.lua | 27 ++++++++++++++++++++++ tests/examples/opencv-module-dnn/mcpp.toml | 6 ++--- tests/examples/opencv-module/mcpp.toml | 6 ++--- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/pkgs/o/opencv.lua b/pkgs/o/opencv.lua index aceec65..76d85cf 100644 --- a/pkgs/o/opencv.lua +++ b/pkgs/o/opencv.lua @@ -30,6 +30,12 @@ -- command past cmd.exe's 8191-char ceiling under 0.0.101; 0.0.102 drops the -- `cmd /c` redirect wrapper (clang-scan-deps -o) and restores the 32767 limit. -- +-- 0.0.10: the per-glob flag tables moved into OS-conditional +-- [target.'cfg(...)'.build.flags] sections (mcpp#258, same 0.0.102 floor) — +-- entries whose predicate does not match the resolved target never enter the +-- glob table, so consumer builds no longer emit the ~26 structural dead-glob +-- warnings (windows stub globs + neon TUs on linux, symmetric elsewhere). +-- package = { spec = "1", name = "opencv", @@ -41,6 +47,13 @@ package = { xpm = { linux = { + ["0.0.10"] = { + url = { + GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.10.tar.gz", + CN = "https://gitcode.com/mcpp-res/opencv/releases/download/v0.0.10/opencv-m-0.0.10.tar.gz", + }, + sha256 = "4a8cb551e6a9a1f39c2a70fc1fdd2719200a94fbb5b8d50f7e99e3e88c9ab801", + }, ["0.0.9"] = { url = { GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.9.tar.gz", @@ -50,6 +63,13 @@ package = { }, }, macosx = { + ["0.0.10"] = { + url = { + GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.10.tar.gz", + CN = "https://gitcode.com/mcpp-res/opencv/releases/download/v0.0.10/opencv-m-0.0.10.tar.gz", + }, + sha256 = "4a8cb551e6a9a1f39c2a70fc1fdd2719200a94fbb5b8d50f7e99e3e88c9ab801", + }, ["0.0.9"] = { url = { GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.9.tar.gz", @@ -59,6 +79,13 @@ package = { }, }, windows = { + ["0.0.10"] = { + url = { + GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.10.tar.gz", + CN = "https://gitcode.com/mcpp-res/opencv/releases/download/v0.0.10/opencv-m-0.0.10.tar.gz", + }, + sha256 = "4a8cb551e6a9a1f39c2a70fc1fdd2719200a94fbb5b8d50f7e99e3e88c9ab801", + }, ["0.0.9"] = { url = { GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.9.tar.gz", diff --git a/tests/examples/opencv-module-dnn/mcpp.toml b/tests/examples/opencv-module-dnn/mcpp.toml index f26590b..b6c6d88 100644 --- a/tests/examples/opencv-module-dnn/mcpp.toml +++ b/tests/examples/opencv-module-dnn/mcpp.toml @@ -10,14 +10,14 @@ version = "0.1.0" default = { path = "../../.." } [target.'cfg(linux)'.dependencies] -opencv = { version = "0.0.9", features = ["dnn"] } +opencv = { version = "0.0.10", features = ["dnn"] } # macOS: `import opencv.dnn;` on macOS-arm64 (per-OS NEON dnn payload). [target.'cfg(macos)'.dependencies] -opencv = { version = "0.0.9", features = ["dnn"] } +opencv = { version = "0.0.10", features = ["dnn"] } # windows: `import opencv.dnn;` on windows-x86_64 (fast_gemm backend). [target.'cfg(windows)'.dependencies] -opencv = { version = "0.0.9", features = ["dnn"] } +opencv = { version = "0.0.10", features = ["dnn"] } diff --git a/tests/examples/opencv-module/mcpp.toml b/tests/examples/opencv-module/mcpp.toml index f4c575e..c04ab5f 100644 --- a/tests/examples/opencv-module/mcpp.toml +++ b/tests/examples/opencv-module/mcpp.toml @@ -16,11 +16,11 @@ version = "0.1.0" default = { path = "../../.." } [target.'cfg(linux)'.dependencies] -opencv = "0.0.9" +opencv = "0.0.10" [target.'cfg(macos)'.dependencies] -opencv = "0.0.9" +opencv = "0.0.10" # windows: import opencv.cv on windows-x86_64 (clang-cl; module tarball OS-neutral). [target.'cfg(windows)'.dependencies] -opencv = "0.0.9" +opencv = "0.0.10"