From 9094e06e30532cb980bc5176f419d8d23f369751 Mon Sep 17 00:00:00 2001 From: chooyy Date: Fri, 7 Nov 2025 14:56:25 +0800 Subject: [PATCH 1/6] opencv: fix build & cmake --- packages/o/opencv/xmake.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/o/opencv/xmake.lua b/packages/o/opencv/xmake.lua index 4e6bd774ab4..f3ebec38ba2 100644 --- a/packages/o/opencv/xmake.lua +++ b/packages/o/opencv/xmake.lua @@ -21,6 +21,7 @@ package("opencv") add_versions("3.4.9", "b7ea364de7273cfb3b771a0d9c111b8b8dfb42ff2bcd2d84681902fb8f49892a") add_patches("4.11.0", "https://github.com/opencv/opencv/commit/767dd838d3074409fd72a4d76c320b1370e95943.diff", "376dd90500ab7205084fd4298ff26137ce9678b00233ad20ca2189ef9eca3a58") + add_patches("4.12.0", "https://github.com/opencv/opencv/pull/27691/commits/90c444abd387ffa70b2e72a34922903a2f0f4f5a.patch", "4811cf490195a7b2952e075c4d713593326bc54fcfa42a33e19d7ed025bb5b6f") add_resources("4.12.0", "opencv_contrib", "https://github.com/opencv/opencv_contrib/archive/4.12.0.tar.gz", "4197722b4c5ed42b476d42e29beb29a52b6b25c34ec7b4d589c3ae5145fee98e") add_resources("4.11.0", "opencv_contrib", "https://github.com/opencv/opencv_contrib/archive/4.11.0.tar.gz", "2dfc5957201de2aa785064711125af6abb2e80a64e2dc246aca4119b19687041") @@ -237,7 +238,11 @@ package("opencv") shflags = {"-Wl,-Bsymbolic"} end end - import("package.tools.cmake").install(package, configs, {buildir = "bd", shflags = shflags, ldflags = ldflags}) + import("package.tools.cmake").install(package, configs, {builddir = "bd", shflags = shflags, ldflags = ldflags}) + + io.replace(package:installdir("lib/cmake/opencv4/OpenCVModules.cmake"), + "opencv_wechat_qrcode\n", + "opencv_wechat_qrcode\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Iconv)\n", {plain = true}) for _, link in ipairs({"opencv_phase_unwrapping", "opencv_surface_matching", "opencv_saliency", "opencv_wechat_qrcode", "opencv_mcc", "opencv_face", "opencv_img_hash", "opencv_videostab", "opencv_structured_light", "opencv_intensity_transform", From 0be21ee267c139ddacc6b71619cba498e091e2a3 Mon Sep 17 00:00:00 2001 From: chooyy Date: Fri, 7 Nov 2025 16:57:39 +0800 Subject: [PATCH 2/6] update --- packages/o/opencv/xmake.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/o/opencv/xmake.lua b/packages/o/opencv/xmake.lua index f3ebec38ba2..ed70882ba0f 100644 --- a/packages/o/opencv/xmake.lua +++ b/packages/o/opencv/xmake.lua @@ -240,9 +240,11 @@ package("opencv") end import("package.tools.cmake").install(package, configs, {builddir = "bd", shflags = shflags, ldflags = ldflags}) - io.replace(package:installdir("lib/cmake/opencv4/OpenCVModules.cmake"), - "opencv_wechat_qrcode\n", - "opencv_wechat_qrcode\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Iconv)\n", {plain = true}) + if package:is_plat("linux", "macosx") then + io.replace(package:installdir("lib/cmake/opencv4/OpenCVModules.cmake"), + "opencv_wechat_qrcode\n", + "opencv_wechat_qrcode\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Iconv)\n", {plain = true}) + end for _, link in ipairs({"opencv_phase_unwrapping", "opencv_surface_matching", "opencv_saliency", "opencv_wechat_qrcode", "opencv_mcc", "opencv_face", "opencv_img_hash", "opencv_videostab", "opencv_structured_light", "opencv_intensity_transform", From bf699b11a6d839b55600da6e756e44bf17286148 Mon Sep 17 00:00:00 2001 From: chooyy Date: Mon, 10 Nov 2025 10:52:47 +0800 Subject: [PATCH 3/6] update --- packages/o/opencv/xmake.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/o/opencv/xmake.lua b/packages/o/opencv/xmake.lua index ed70882ba0f..a864e5aa10f 100644 --- a/packages/o/opencv/xmake.lua +++ b/packages/o/opencv/xmake.lua @@ -240,10 +240,10 @@ package("opencv") end import("package.tools.cmake").install(package, configs, {builddir = "bd", shflags = shflags, ldflags = ldflags}) - if package:is_plat("linux", "macosx") then + if not package:is_plat("windows", "android") then io.replace(package:installdir("lib/cmake/opencv4/OpenCVModules.cmake"), - "opencv_wechat_qrcode\n", - "opencv_wechat_qrcode\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Iconv)\n", {plain = true}) + "opencv_wechat_qrcode\n", + "opencv_wechat_qrcode\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Iconv)\n", {plain = true}) end for _, link in ipairs({"opencv_phase_unwrapping", "opencv_surface_matching", "opencv_saliency", "opencv_wechat_qrcode", "opencv_mcc", "opencv_face", From 12d16151ea36e3e8016dc4384540516d7a3f8f91 Mon Sep 17 00:00:00 2001 From: chooyy Date: Mon, 10 Nov 2025 13:49:52 +0800 Subject: [PATCH 4/6] update --- packages/o/opencv/xmake.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/o/opencv/xmake.lua b/packages/o/opencv/xmake.lua index a864e5aa10f..eda7eef5b02 100644 --- a/packages/o/opencv/xmake.lua +++ b/packages/o/opencv/xmake.lua @@ -241,9 +241,12 @@ package("opencv") import("package.tools.cmake").install(package, configs, {builddir = "bd", shflags = shflags, ldflags = ldflags}) if not package:is_plat("windows", "android") then - io.replace(package:installdir("lib/cmake/opencv4/OpenCVModules.cmake"), - "opencv_wechat_qrcode\n", - "opencv_wechat_qrcode\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Iconv)\n", {plain = true}) + local cmakefile = os.files("**/OpenCVModules.cmake") + if cmakefile then + io.replace(package:installdir(cmakefile[1]), + "opencv_wechat_qrcode\n", + "opencv_wechat_qrcode\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Iconv)\n", {plain = true}) + end end for _, link in ipairs({"opencv_phase_unwrapping", "opencv_surface_matching", "opencv_saliency", "opencv_wechat_qrcode", "opencv_mcc", "opencv_face", From 0731e1e7d36ce2d9456a9b35c76dfbf02e65e177 Mon Sep 17 00:00:00 2001 From: chooyy Date: Mon, 10 Nov 2025 16:14:29 +0800 Subject: [PATCH 5/6] update --- packages/o/opencv/xmake.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/o/opencv/xmake.lua b/packages/o/opencv/xmake.lua index eda7eef5b02..5e25b66947d 100644 --- a/packages/o/opencv/xmake.lua +++ b/packages/o/opencv/xmake.lua @@ -241,10 +241,9 @@ package("opencv") import("package.tools.cmake").install(package, configs, {builddir = "bd", shflags = shflags, ldflags = ldflags}) if not package:is_plat("windows", "android") then - local cmakefile = os.files("**/OpenCVModules.cmake") + local cmakefile = os.files(package:installdir("**/OpenCVModules.cmake")) if cmakefile then - io.replace(package:installdir(cmakefile[1]), - "opencv_wechat_qrcode\n", + io.replace(cmakefile[1], "opencv_wechat_qrcode\n", "opencv_wechat_qrcode\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Iconv)\n", {plain = true}) end end From 2edc7ddc0b0f09cd55112f23f6f3b514382dbe59 Mon Sep 17 00:00:00 2001 From: chooyy Date: Fri, 14 Nov 2025 10:15:17 +0800 Subject: [PATCH 6/6] trigger ci --- packages/o/opencv/xmake.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/o/opencv/xmake.lua b/packages/o/opencv/xmake.lua index 5e25b66947d..1e1e17f7830 100644 --- a/packages/o/opencv/xmake.lua +++ b/packages/o/opencv/xmake.lua @@ -1,5 +1,4 @@ package("opencv") - set_homepage("https://opencv.org/") set_description("A open source computer vision library.") set_license("Apache-2.0")