Skip to content

Commit

Permalink
changed submodule urls to use https: instead of git: -- and checkout …
Browse files Browse the repository at this point in the history
…out the 4.10.0 tag for both
  • Loading branch information
r0ml committed Sep 6, 2024
1 parent 3270297 commit a0847cb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ let package = Package(
),
*/
.binaryTarget(name: "OpenCV",
url: "https://github.com/r0ml/OpenCV/releases/download/4.10.1/OpenCV.xcframework.zip",
checksum: "35c6a516d1d2d23b0012dc7f1e8123cfa77c33b769f41727bf16d608f68ef207"),
url: "https://github.com/r0ml/OpenCV/releases/download/4.10.2/OpenCV.xcframework.zip",
checksum: "3f350ab2d703979612460a5b8d858ff0ec4eb7b99a4a32a0ef6a1c4627f5759c"),
/*
.binaryTarget(name: "OpenCV",
path: "build_xcframework/OpenCV.xcframework"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ The built xcframework should be located at `build_xcframework/OpenCV.xcframework

After building the xcframework, one needs to
1) run `./postbuild.sh xxx` where xxx is the new version number of the updated package. This will update the version number in the download URL, create the release zip file, and update the checksum in Package.swift
2) commit the changes
3) create a tag with the above version number for this commit
4)
2) commit and push the changes
3) create a new release on github using the version number from the `postbuild.sh` step
4) upload the `OpenCV.framework.zip` in build_xcframework as the asset in the release


## Alternate
Expand Down
13 changes: 7 additions & 6 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
# arm7 architecture fails to build
# it's OK if this never works

# as near as I can make out, objc support and Swift support are mutually exclusive.
# Ergo, I need either --without objc or --disable-swift .
# If both are missing, objc support fails to build with complaint about missing CMAKE_Swift_COMPILER . Setting the SWIFTC environment variable doesn't help.
# Given that I'm more interested in Swift support than objc support, I went with --without objc .
# would like to get this working someday
rm -rf build_xcframework

python3 opencv/platforms/apple/build_xcframework.py --out ./build_xcframework --debug --contrib opencv_contrib --framework_name=OpenCV --build_only_specified_archs --iphoneos_archs "arm64" --iphonesimulator_archs "arm64,x86_64" --iphoneos_deployment_target "16.0" --macos_archs "arm64,x86_64" --catalyst_archs "arm64,x86_64" # --visionos_archs "arm64" --visionsimulator_archs "arm64"# --without objc # --disable-swift
python3 opencv/platforms/apple/build_xcframework.py --out ./build_xcframework --debug \
--contrib opencv_contrib --framework_name=OpenCV --build_only_specified_archs \
--macos_archs "arm64,x86_64" --macosx_deployment_target "13.0" \
--iphoneos_archs "arm64" --iphonesimulator_archs "arm64,x86_64" --iphoneos_deployment_target "16.0" \
--catalyst_archs "arm64,x86_64" \
# --visionos_archs "arm64" --visionsimulator_archs "arm64"

# cd build_xcframework/OpenCV.xcframework
# rm */OpenCV.framework/Modules

0 comments on commit a0847cb

Please sign in to comment.