Skip to content

Commit aee240d

Browse files
authored
mwrap opencv 5.0.0.1 (#816)
* mwrap opencv 5.0.0.1 * The opencv members write the dependency key unquoted, as --strict requires * The WebP deployment check states where the compile database is written * The installed-template check uses opencv 5.0.0.1, whose template writes the key unquoted
1 parent 58a9f28 commit aee240d

6 files changed

Lines changed: 28 additions & 5 deletions

File tree

‎.github/workflows/validate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1644,7 +1644,7 @@ jobs:
16441644
- name: Installed OpenCV archive, image template and relocated deployment
16451645
if: contains(format(' {0} ', env.MEMBERS), ' opencv-cpu ') && matrix.toolchain == 'default'
16461646
shell: bash
1647-
run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.opencv@5.0.0 --deploy
1647+
run: python3 tests/mwrap/check_installed_template.py --mcpp "$MCPP" --package mcpplibs.mwrap.opencv@5.0.0.1 --deploy
16481648

16491649
- name: Installed mwrap archive, project template and relocated deployment
16501650
if: contains(format(' {0} ', env.MEMBERS), ' onnxruntime-cpu ') && matrix.toolchain == 'default'

‎pkgs/mwrap/opencv.lua‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ package = {
2222
},
2323
sha256 = "01e440d03eef4b77a7bb7a7043f2c28b83f18e9270f203462a0fe69c1d41d0a2",
2424
},
25+
["5.0.0.1"] = {
26+
url = {
27+
GLOBAL = "https://github.com/mcpplibs/opencv-m/releases/download/mwrap-5.0.0.1/opencv-m-5.0.0.1.tar.gz",
28+
CN = "https://gitcode.com/mcpp-res/mwrap-opencv/releases/download/5.0.0.1/opencv-m-5.0.0.1.tar.gz",
29+
},
30+
sha256 = "159537581443a8d394e38d98f9ef5c5a48326677bb53057b994337a498b98a1f",
31+
},
2532
},
2633
macosx = {
2734
["5.0.0"] = {
@@ -31,6 +38,13 @@ package = {
3138
},
3239
sha256 = "01e440d03eef4b77a7bb7a7043f2c28b83f18e9270f203462a0fe69c1d41d0a2",
3340
},
41+
["5.0.0.1"] = {
42+
url = {
43+
GLOBAL = "https://github.com/mcpplibs/opencv-m/releases/download/mwrap-5.0.0.1/opencv-m-5.0.0.1.tar.gz",
44+
CN = "https://gitcode.com/mcpp-res/mwrap-opencv/releases/download/5.0.0.1/opencv-m-5.0.0.1.tar.gz",
45+
},
46+
sha256 = "159537581443a8d394e38d98f9ef5c5a48326677bb53057b994337a498b98a1f",
47+
},
3448
},
3549
windows = {
3650
["5.0.0"] = {
@@ -40,6 +54,13 @@ package = {
4054
},
4155
sha256 = "01e440d03eef4b77a7bb7a7043f2c28b83f18e9270f203462a0fe69c1d41d0a2",
4256
},
57+
["5.0.0.1"] = {
58+
url = {
59+
GLOBAL = "https://github.com/mcpplibs/opencv-m/releases/download/mwrap-5.0.0.1/opencv-m-5.0.0.1.tar.gz",
60+
CN = "https://gitcode.com/mcpp-res/mwrap-opencv/releases/download/5.0.0.1/opencv-m-5.0.0.1.tar.gz",
61+
},
62+
sha256 = "159537581443a8d394e38d98f9ef5c5a48326677bb53057b994337a498b98a1f",
63+
},
4364
},
4465
},
4566
}

‎tests/mwrap/check_git_index_discovery.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
PACKAGES = {
13-
"opencv": "5.0.0", "onnxruntime": "1.25.1.1", "llamacpp": "b10069",
13+
"opencv": "5.0.0.1", "onnxruntime": "1.25.1.1", "llamacpp": "b10069",
1414
"ffmpeg": "8.1.2.1", "grpc": "1.83.0", "imgui": "1.92.8", "godot_cpp": "10.0.0",
1515
}
1616

‎tests/mwrap/check_webp_deployment.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ def main():
3636
manifest.write_text(text)
3737
(project / "src").mkdir()
3838
shutil.copyfile(project / "tests/pipeline.cpp", project / "src/main.cpp")
39-
env = dict(os.environ, MCPP_HOME=str(home))
39+
# The compile database is read below for the packages' source roots;
40+
# mcpp writes it under target/ unless a path is stated.
41+
env = dict(os.environ, MCPP_HOME=str(home), MCPP_COMPILE_COMMANDS="compile_commands.json")
4042
commands = [[args.mcpp, "self", "config", "--mirror", "GLOBAL"]]
4143
if args.published_index:
4244
commands.append([args.mcpp, "index", "update"])

‎tests/mwrap/opencv-cpu/mcpp.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ description = "Install the OpenCV mwrap archive and run a generated image pipeli
88
# An explicit empty table overrides the legacy workspace redirect.
99

1010
[dependencies]
11-
"mcpplibs.mwrap.opencv" = { version = "5.0.0", features = ["imgproc", "imgcodecs-png", "imgcodecs-jpeg"] }
11+
mcpplibs.mwrap.opencv = { version = "5.0.0.1", features = ["imgproc", "imgcodecs-png", "imgcodecs-jpeg"] }

‎tests/mwrap/opencv-webp/mcpp.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ description = "Consume the OpenCV archive with optional WebP image, animation an
88
# An explicit empty table overrides the legacy workspace redirect.
99

1010
[dependencies]
11-
"mcpplibs.mwrap.opencv" = { version = "5.0.0", features = ["imgcodecs-webp"] }
11+
mcpplibs.mwrap.opencv = { version = "5.0.0.1", features = ["imgcodecs-webp"] }

0 commit comments

Comments
 (0)