Skip to content

Commit 491b59d

Browse files
committed
feat(pkgs): opencv 0.0.10 — per-glob flags 迁入 OS 条件化 cfg 表(mcpp#258),消费端死 glob 警告归零
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。
1 parent 2e23e20 commit 491b59d

3 files changed

Lines changed: 33 additions & 6 deletions

File tree

pkgs/o/opencv.lua

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
-- command past cmd.exe's 8191-char ceiling under 0.0.101; 0.0.102 drops the
3131
-- `cmd /c` redirect wrapper (clang-scan-deps -o) and restores the 32767 limit.
3232
--
33+
-- 0.0.10: the per-glob flag tables moved into OS-conditional
34+
-- [target.'cfg(...)'.build.flags] sections (mcpp#258, same 0.0.102 floor) —
35+
-- entries whose predicate does not match the resolved target never enter the
36+
-- glob table, so consumer builds no longer emit the ~26 structural dead-glob
37+
-- warnings (windows stub globs + neon TUs on linux, symmetric elsewhere).
38+
--
3339
package = {
3440
spec = "1",
3541
name = "opencv",
@@ -41,6 +47,13 @@ package = {
4147

4248
xpm = {
4349
linux = {
50+
["0.0.10"] = {
51+
url = {
52+
GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.10.tar.gz",
53+
CN = "https://gitcode.com/mcpp-res/opencv/releases/download/v0.0.10/opencv-m-0.0.10.tar.gz",
54+
},
55+
sha256 = "4a8cb551e6a9a1f39c2a70fc1fdd2719200a94fbb5b8d50f7e99e3e88c9ab801",
56+
},
4457
["0.0.9"] = {
4558
url = {
4659
GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.9.tar.gz",
@@ -50,6 +63,13 @@ package = {
5063
},
5164
},
5265
macosx = {
66+
["0.0.10"] = {
67+
url = {
68+
GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.10.tar.gz",
69+
CN = "https://gitcode.com/mcpp-res/opencv/releases/download/v0.0.10/opencv-m-0.0.10.tar.gz",
70+
},
71+
sha256 = "4a8cb551e6a9a1f39c2a70fc1fdd2719200a94fbb5b8d50f7e99e3e88c9ab801",
72+
},
5373
["0.0.9"] = {
5474
url = {
5575
GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.9.tar.gz",
@@ -59,6 +79,13 @@ package = {
5979
},
6080
},
6181
windows = {
82+
["0.0.10"] = {
83+
url = {
84+
GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.10.tar.gz",
85+
CN = "https://gitcode.com/mcpp-res/opencv/releases/download/v0.0.10/opencv-m-0.0.10.tar.gz",
86+
},
87+
sha256 = "4a8cb551e6a9a1f39c2a70fc1fdd2719200a94fbb5b8d50f7e99e3e88c9ab801",
88+
},
6289
["0.0.9"] = {
6390
url = {
6491
GLOBAL = "https://github.com/Sunrisepeak/opencv-m/archive/refs/tags/v0.0.9.tar.gz",

tests/examples/opencv-module-dnn/mcpp.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ version = "0.1.0"
1010
default = { path = "../../.." }
1111

1212
[target.'cfg(linux)'.dependencies]
13-
opencv = { version = "0.0.9", features = ["dnn"] }
13+
opencv = { version = "0.0.10", features = ["dnn"] }
1414

1515
# macOS: `import opencv.dnn;` on macOS-arm64 (per-OS NEON dnn payload).
1616
[target.'cfg(macos)'.dependencies]
17-
opencv = { version = "0.0.9", features = ["dnn"] }
17+
opencv = { version = "0.0.10", features = ["dnn"] }
1818

1919
# windows: `import opencv.dnn;` on windows-x86_64 (fast_gemm backend).
2020
[target.'cfg(windows)'.dependencies]
21-
opencv = { version = "0.0.9", features = ["dnn"] }
21+
opencv = { version = "0.0.10", features = ["dnn"] }
2222

2323

tests/examples/opencv-module/mcpp.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ version = "0.1.0"
1616
default = { path = "../../.." }
1717

1818
[target.'cfg(linux)'.dependencies]
19-
opencv = "0.0.9"
19+
opencv = "0.0.10"
2020

2121
[target.'cfg(macos)'.dependencies]
22-
opencv = "0.0.9"
22+
opencv = "0.0.10"
2323

2424
# windows: import opencv.cv on windows-x86_64 (clang-cl; module tarball OS-neutral).
2525
[target.'cfg(windows)'.dependencies]
26-
opencv = "0.0.9"
26+
opencv = "0.0.10"

0 commit comments

Comments
 (0)