From 627493c76e471d5405298a1970e51700793eafc4 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 14:31:28 +0000 Subject: [PATCH 01/81] re-enable macos10 build. --- .github/workflows/{macos10.yml.disabled => macos10.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{macos10.yml.disabled => macos10.yml} (100%) diff --git a/.github/workflows/macos10.yml.disabled b/.github/workflows/macos10.yml similarity index 100% rename from .github/workflows/macos10.yml.disabled rename to .github/workflows/macos10.yml From 73eeb7414fc92bff6f8f9b2f46258ed95e0de1c7 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 15:16:29 +0000 Subject: [PATCH 02/81] disable running tests on macos for now. --- .github/workflows/macos10.yml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index 5ac7bd546..8f3be81d1 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -123,23 +123,4 @@ jobs: with: name: artifacts_macos_10 path: artifacts_macos - - - name: Test - run: | - cd ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests - # ls - dotnet build -c Release -f net6.0 - cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net6.0/ - cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/ - # ls ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net6.0/ - # ls - sudo cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib /usr/local/lib/ - LD_LIBRARY_PATH=. - dotnet test OpenCvSharp.Tests.csproj -c Release -f net6.0 --runtime osx-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null - ls - ls TestResults - - - uses: actions/upload-artifact@v1 - with: - name: artifacts_macos_10_test_results - path: test/OpenCvSharp.Tests/TestResults/test-results.trx + \ No newline at end of file From 49c30c7751e3d1e6dc8f2a0468a94acd20ef3302 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 16:02:23 +0000 Subject: [PATCH 03/81] build apple universal binaries. --- .github/workflows/macos10.yml | 14 +++++++------- ...penCvSharp4.runtime.osx.10.15-universal.csproj} | 2 +- ...penCvSharp4.runtime.osx.10.15-universal.nuspec} | 5 +++-- 3 files changed, 11 insertions(+), 10 deletions(-) rename nuget/{OpenCvSharp4.runtime.osx.10.15-x64.csproj => OpenCvSharp4.runtime.osx.10.15-universal.csproj} (84%) rename nuget/{OpenCvSharp4.runtime.osx.10.15-x64.nuspec => OpenCvSharp4.runtime.osx.10.15-universal.nuspec} (87%) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index 8f3be81d1..c1fbeec30 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -41,6 +41,7 @@ jobs: cd opencv-${OPENCV_VERSION} && mkdir build && cd build cmake \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ @@ -79,7 +80,7 @@ jobs: -DWITH_OPENEXR=OFF \ -DOPENCV_ENABLE_NONFREE=ON \ -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_macos .. - make -j2 + make -j4 make install cd ${GITHUB_WORKSPACE} ls @@ -88,8 +89,8 @@ jobs: run: | pwd mkdir src/build && cd $_ - cmake -DCMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. - make -j2 + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. + make -j4 ls ls OpenCvSharpExtern cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/nuget/ @@ -114,13 +115,12 @@ jobs: run: | yyyymmdd=`date '+%Y%m%d'` echo $yyyymmdd - sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" ${GITHUB_WORKSPACE}/nuget/OpenCvSharp4.runtime.osx.10.15-x64.nuspec - cat ${GITHUB_WORKSPACE}/nuget/OpenCvSharp4.runtime.osx.10.15-x64.nuspec - dotnet pack ${GITHUB_WORKSPACE}/nuget/OpenCvSharp4.runtime.osx.10.15-x64.csproj -o ${GITHUB_WORKSPACE}/artifacts_macos + sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" ${GITHUB_WORKSPACE}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + cat ${GITHUB_WORKSPACE}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + dotnet pack ${GITHUB_WORKSPACE}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${GITHUB_WORKSPACE}/artifacts_macos ls ${GITHUB_WORKSPACE}/artifacts_macos - uses: actions/upload-artifact@v3 with: name: artifacts_macos_10 path: artifacts_macos - \ No newline at end of file diff --git a/nuget/OpenCvSharp4.runtime.osx.10.15-x64.csproj b/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj similarity index 84% rename from nuget/OpenCvSharp4.runtime.osx.10.15-x64.csproj rename to nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj index 322ffa6b1..2a9612302 100644 --- a/nuget/OpenCvSharp4.runtime.osx.10.15-x64.csproj +++ b/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj @@ -3,7 +3,7 @@ netstandard2.0;netstandard2.1;netcoreapp2.1; true false - OpenCvSharp4.runtime.osx.10.15-x64.nuspec + OpenCvSharp4.runtime.osx.10.15-universal.nuspec @@ -26,5 +26,6 @@ + \ No newline at end of file From a8b9f95ec22f268af45b599ea938e612232e1bea Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 16:11:21 +0000 Subject: [PATCH 04/81] disable non mac jobs for now. --- .github/workflows/{docfx.yml => docfx.yml.disable} | 0 ...ker-deploy-ubuntu20.yml => docker-deploy-ubuntu20.yml.disable} | 0 .../{docker-ubuntu20.yml => docker-ubuntu20.yml.disable} | 0 .github/workflows/{linux-arm.yml => linux-arm.yml.disable} | 0 .../workflows/{publish_nuget.yml => publish_nuget.yml.disable} | 0 .github/workflows/{ubuntu20.yml => ubuntu20.yml.disable} | 0 .github/workflows/{wasm.yml => wasm.yml.disable} | 0 .github/workflows/{windows.yml => windows.yml.disable} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{docfx.yml => docfx.yml.disable} (100%) rename .github/workflows/{docker-deploy-ubuntu20.yml => docker-deploy-ubuntu20.yml.disable} (100%) rename .github/workflows/{docker-ubuntu20.yml => docker-ubuntu20.yml.disable} (100%) rename .github/workflows/{linux-arm.yml => linux-arm.yml.disable} (100%) rename .github/workflows/{publish_nuget.yml => publish_nuget.yml.disable} (100%) rename .github/workflows/{ubuntu20.yml => ubuntu20.yml.disable} (100%) rename .github/workflows/{wasm.yml => wasm.yml.disable} (100%) rename .github/workflows/{windows.yml => windows.yml.disable} (100%) diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml.disable similarity index 100% rename from .github/workflows/docfx.yml rename to .github/workflows/docfx.yml.disable diff --git a/.github/workflows/docker-deploy-ubuntu20.yml b/.github/workflows/docker-deploy-ubuntu20.yml.disable similarity index 100% rename from .github/workflows/docker-deploy-ubuntu20.yml rename to .github/workflows/docker-deploy-ubuntu20.yml.disable diff --git a/.github/workflows/docker-ubuntu20.yml b/.github/workflows/docker-ubuntu20.yml.disable similarity index 100% rename from .github/workflows/docker-ubuntu20.yml rename to .github/workflows/docker-ubuntu20.yml.disable diff --git a/.github/workflows/linux-arm.yml b/.github/workflows/linux-arm.yml.disable similarity index 100% rename from .github/workflows/linux-arm.yml rename to .github/workflows/linux-arm.yml.disable diff --git a/.github/workflows/publish_nuget.yml b/.github/workflows/publish_nuget.yml.disable similarity index 100% rename from .github/workflows/publish_nuget.yml rename to .github/workflows/publish_nuget.yml.disable diff --git a/.github/workflows/ubuntu20.yml b/.github/workflows/ubuntu20.yml.disable similarity index 100% rename from .github/workflows/ubuntu20.yml rename to .github/workflows/ubuntu20.yml.disable diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml.disable similarity index 100% rename from .github/workflows/wasm.yml rename to .github/workflows/wasm.yml.disable diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml.disable similarity index 100% rename from .github/workflows/windows.yml rename to .github/workflows/windows.yml.disable From 130b7b9715a5f88a03fa8f054e76c469cca53803 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 18:25:00 +0000 Subject: [PATCH 05/81] use cmakelists to set osx architectures. --- .github/workflows/macos10.yml | 1 - src/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index c1fbeec30..391e4607c 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -41,7 +41,6 @@ jobs: cd opencv-${OPENCV_VERSION} && mkdir build && cd build cmake \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4bee25b52..33a9ffebf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) - +set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) project(OpenCvSharpExtern) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") From 2d42614a0a843e1f28b5f3baa79bd03c650f43bb Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 19:04:57 +0000 Subject: [PATCH 06/81] cmake!!! --- .github/workflows/macos10.yml | 7 ++++--- src/CMakeLists.txt | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index 391e4607c..0b5b78ba9 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -40,7 +40,8 @@ jobs: wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip cd opencv-${OPENCV_VERSION} && mkdir build && cd build cmake \ - -DCMAKE_BUILD_TYPE=Release \ + "-DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ @@ -78,7 +79,7 @@ jobs: -DWITH_ADE=OFF \ -DWITH_OPENEXR=OFF \ -DOPENCV_ENABLE_NONFREE=ON \ - -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_macos .. + -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_macos" .. make -j4 make install cd ${GITHUB_WORKSPACE} @@ -88,7 +89,7 @@ jobs: run: | pwd mkdir src/build && cd $_ - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. + cmake "-DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos" .. make -j4 ls ls OpenCvSharpExtern diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 33a9ffebf..d32dff734 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 3.0) -set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) project(OpenCvSharpExtern) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") From f2542e860a4f2c19391313a35a9cdeff199a36fe Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 19:55:29 +0000 Subject: [PATCH 07/81] Revert "cmake!!!" This reverts commit 2d42614a0a843e1f28b5f3baa79bd03c650f43bb. --- .github/workflows/macos10.yml | 7 +++---- src/CMakeLists.txt | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index 0b5b78ba9..391e4607c 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -40,8 +40,7 @@ jobs: wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip cd opencv-${OPENCV_VERSION} && mkdir build && cd build cmake \ - "-DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 \ + -DCMAKE_BUILD_TYPE=Release \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ @@ -79,7 +78,7 @@ jobs: -DWITH_ADE=OFF \ -DWITH_OPENEXR=OFF \ -DOPENCV_ENABLE_NONFREE=ON \ - -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_macos" .. + -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_macos .. make -j4 make install cd ${GITHUB_WORKSPACE} @@ -89,7 +88,7 @@ jobs: run: | pwd mkdir src/build && cd $_ - cmake "-DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos" .. + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. make -j4 ls ls OpenCvSharpExtern diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d32dff734..33a9ffebf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.0) +set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) project(OpenCvSharpExtern) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") From a0d922e7fc89d86be84a4441a518265d3332e49c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 20:00:48 +0000 Subject: [PATCH 08/81] set osx archs from command line. --- .github/workflows/macos10.yml | 3 ++- src/CMakeLists.txt | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index 391e4607c..87f3d284d 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -40,6 +40,7 @@ jobs: wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip cd opencv-${OPENCV_VERSION} && mkdir build && cd build cmake \ + -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ -DBUILD_SHARED_LIBS=OFF \ @@ -88,7 +89,7 @@ jobs: run: | pwd mkdir src/build && cd $_ - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. + cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. make -j4 ls ls OpenCvSharpExtern diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 33a9ffebf..d32dff734 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 3.0) -set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) project(OpenCvSharpExtern) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") From ffd0ac6c34147a0800d0696d9ca8e1acb9669792 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 20:06:44 +0000 Subject: [PATCH 09/81] jobs --- .github/workflows/macos10.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index 87f3d284d..feb9ef94f 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -80,7 +80,7 @@ jobs: -DWITH_OPENEXR=OFF \ -DOPENCV_ENABLE_NONFREE=ON \ -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_macos .. - make -j4 + make -j1 make install cd ${GITHUB_WORKSPACE} ls @@ -90,7 +90,7 @@ jobs: pwd mkdir src/build && cd $_ cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. - make -j4 + make -j1 ls ls OpenCvSharpExtern cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/nuget/ From 7e6a8d9119deb0565cfe58dfc1eca9aa2558ee7c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 22:19:41 +0000 Subject: [PATCH 10/81] use macos 12. --- .github/workflows/macos10.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index feb9ef94f..3e231c8ec 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -14,7 +14,7 @@ env: jobs: build: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: actions/checkout@v3 From 88156540269e8e85f6058fe3738c450090acc362 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 22:24:55 +0000 Subject: [PATCH 11/81] wth --- .github/workflows/macos10.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index 3e231c8ec..535ad110f 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -40,7 +40,6 @@ jobs: wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip cd opencv-${OPENCV_VERSION} && mkdir build && cd build cmake \ - -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ -DBUILD_SHARED_LIBS=OFF \ From a0a09dbc03396ce8a129c625a16773a50c3f87fc Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 22:31:02 +0000 Subject: [PATCH 12/81] missing \ --- .github/workflows/macos10.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index 535ad110f..0be8eef5a 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -40,6 +40,7 @@ jobs: wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip cd opencv-${OPENCV_VERSION} && mkdir build && cd build cmake \ + -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \ -DCMAKE_BUILD_TYPE=Release \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ -DBUILD_SHARED_LIBS=OFF \ From 910e511d51a9c42791ae5862a7b3cba8831bf9ea Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 22:39:57 +0000 Subject: [PATCH 13/81] use all cores. --- .github/workflows/macos10.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index 0be8eef5a..4be1bf175 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -80,7 +80,7 @@ jobs: -DWITH_OPENEXR=OFF \ -DOPENCV_ENABLE_NONFREE=ON \ -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_macos .. - make -j1 + make -j3 make install cd ${GITHUB_WORKSPACE} ls @@ -90,7 +90,7 @@ jobs: pwd mkdir src/build && cd $_ cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. - make -j1 + make -j3 ls ls OpenCvSharpExtern cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/nuget/ From d8593950cea45d8c7eb3567f87cbe460378c4e45 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 21 Feb 2023 23:19:11 +0000 Subject: [PATCH 14/81] fix extern lib build --- .github/workflows/macos10.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index 4be1bf175..fe1988bb9 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -89,7 +89,7 @@ jobs: run: | pwd mkdir src/build && cd $_ - cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. + cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. make -j3 ls ls OpenCvSharpExtern From f6f45ecc17fd7673c74281585440fdd80449e65c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Feb 2023 11:37:53 +0000 Subject: [PATCH 15/81] fix linking issue. --- .github/workflows/macos10.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index fe1988bb9..df98e1f2e 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -41,6 +41,7 @@ jobs: cd opencv-${OPENCV_VERSION} && mkdir build && cd build cmake \ -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \ + -DWITH_IPP=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ -DBUILD_SHARED_LIBS=OFF \ @@ -89,7 +90,7 @@ jobs: run: | pwd mkdir src/build && cd $_ - cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. + cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. make -j3 ls ls OpenCvSharpExtern From 09a2edebca3fcc76d7b8a2a637b31b28906072a8 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Feb 2023 19:18:49 +0000 Subject: [PATCH 16/81] fix build for m1 --- .github/workflows/macos10.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index df98e1f2e..9cf1d5d53 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -40,6 +40,8 @@ jobs: wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip cd opencv-${OPENCV_VERSION} && mkdir build && cd build cmake \ + -DCMAKE_SYSTEM_PROCESSOR=arm64 \ + -DWITH_OPENJPEG=OFF \ -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \ -DWITH_IPP=OFF \ -DCMAKE_BUILD_TYPE=Release \ @@ -90,7 +92,7 @@ jobs: run: | pwd mkdir src/build && cd $_ - cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. + cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_macos .. make -j3 ls ls OpenCvSharpExtern From 4438951b4c6d5d06b42fdc0fe446b54593d5f881 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 22 Feb 2023 19:27:32 +0000 Subject: [PATCH 17/81] install intel and arm64 dependencies. --- .github/workflows/macos10.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml index 9cf1d5d53..99ba50177 100644 --- a/.github/workflows/macos10.yml +++ b/.github/workflows/macos10.yml @@ -21,10 +21,14 @@ jobs: with: fetch-depth: 1 - - name: Install build dependencies + - name: Install build dependencies (x64) run: | brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp # openexr + - name: Install build dependencies (arm64) + run: | + arch -arm64 /opt/homebrew/bin/brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp # openexr + # - name: Cache OpenCV # id: opencv-cache # uses: actions/cache@v3 From 89b6b3cf96f33aa572b1f6045e79bfa13f831973 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 13:10:13 +0000 Subject: [PATCH 18/81] add azure pipelines support. --- azure-pipelines.yml | 86 +++++++++++++++++++++++++++++++++++++++++++++ buildmac.sh | 54 ++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 azure-pipelines.yml create mode 100755 buildmac.sh diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..df15296e6 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,86 @@ +# Starter pipeline +# Start with a minimal pipeline that you can customize to build and deploy your code. +# Add steps that build, run tests, deploy, and more: +# https://aka.ms/yaml + +trigger: +- master + +jobs: +- job: Mac ARM64 + pool: + name: 'AvaloniaMacPool' + + steps: + - script: brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr + displayName: install build dependencies + + - script: | + pwd + wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip + wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip + cd opencv-${OPENCV_VERSION} && mkdir build && cd build + cmake \ + -DCMAKE_SYSTEM_PROCESSOR=arm64 \ + -DWITH_OPENJPEG=OFF \ + -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \ + -DWITH_IPP=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_JAVA=OFF \ + -DBUILD_opencv_java_bindings_generator=OFF \ + -DBUILD_opencv_python_bindings_generator=OFF \ + -DBUILD_opencv_python_tests=OFF \ + -DBUILD_opencv_ts=OFF \ + -DBUILD_opencv_js=OFF \ + -DBUILD_opencv_js_bindings_generator=OFF \ + -DBUILD_opencv_apps=OFF \ + -DBUILD_opencv_barcode=OFF \ + -DBUILD_opencv_bioinspired=OFF \ + -DBUILD_opencv_ccalib=OFF \ + -DBUILD_opencv_datasets=OFF \ + -DBUILD_opencv_dnn_objdetect=OFF \ + -DBUILD_opencv_dpm=OFF \ + -DBUILD_opencv_fuzzy=OFF \ + -DBUILD_opencv_gapi=ON \ + -DBUILD_opencv_intensity_transform=OFF \ + -DBUILD_opencv_mcc=OFF \ + -DBUILD_opencv_objc_bindings_generator=OFF \ + -DBUILD_opencv_rapid=OFF \ + -DBUILD_opencv_reg=OFF \ + -DBUILD_opencv_stereo=OFF \ + -DBUILD_opencv_structured_light=OFF \ + -DBUILD_opencv_surface_matching=OFF \ + -DBUILD_opencv_wechat_qrcode=ON \ + -DBUILD_opencv_videostab=OFF \ + -DWITH_GSTREAMER=OFF \ + -DWITH_EIGEN=OFF \ + -DWITH_ADE=OFF \ + -DWITH_OPENEXR=OFF \ + -DOPENCV_ENABLE_NONFREE=ON \ + -DCMAKE_INSTALL_PREFIX=${AGENT_BUILDDIRECTORY}/opencv_macos .. + make -j3 + make install + cd ${AGENT_BUILDDIRECTORY} + ls + + +- job: Mac Intel + pool: + vmImage: 'macOS-12' + + steps: + - script: + + + - task: UseDotNet@2 + displayName: 'Use .NET Core SDK 6.0.404' + inputs: + version: 6.0.404 + + diff --git a/buildmac.sh b/buildmac.sh new file mode 100755 index 000000000..4f7ca223a --- /dev/null +++ b/buildmac.sh @@ -0,0 +1,54 @@ +OPENCV_VERSION=4.7 + +pwd + wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip + wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip + cd opencv-${OPENCV_VERSION} && mkdir build && cd build + cmake \ + -DCMAKE_SYSTEM_PROCESSOR=arm64 \ + -DWITH_OPENJPEG=OFF \ + -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \ + -DWITH_IPP=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_JAVA=OFF \ + -DBUILD_opencv_java_bindings_generator=OFF \ + -DBUILD_opencv_python_bindings_generator=OFF \ + -DBUILD_opencv_python_tests=OFF \ + -DBUILD_opencv_ts=OFF \ + -DBUILD_opencv_js=OFF \ + -DBUILD_opencv_js_bindings_generator=OFF \ + -DBUILD_opencv_apps=OFF \ + -DBUILD_opencv_barcode=OFF \ + -DBUILD_opencv_bioinspired=OFF \ + -DBUILD_opencv_ccalib=OFF \ + -DBUILD_opencv_datasets=OFF \ + -DBUILD_opencv_dnn_objdetect=OFF \ + -DBUILD_opencv_dpm=OFF \ + -DBUILD_opencv_fuzzy=OFF \ + -DBUILD_opencv_gapi=ON \ + -DBUILD_opencv_intensity_transform=OFF \ + -DBUILD_opencv_mcc=OFF \ + -DBUILD_opencv_objc_bindings_generator=OFF \ + -DBUILD_opencv_rapid=OFF \ + -DBUILD_opencv_reg=OFF \ + -DBUILD_opencv_stereo=OFF \ + -DBUILD_opencv_structured_light=OFF \ + -DBUILD_opencv_surface_matching=OFF \ + -DBUILD_opencv_wechat_qrcode=ON \ + -DBUILD_opencv_videostab=OFF \ + -DWITH_GSTREAMER=OFF \ + -DWITH_EIGEN=OFF \ + -DWITH_ADE=OFF \ + -DWITH_OPENEXR=OFF \ + -DOPENCV_ENABLE_NONFREE=ON \ + -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_macos .. + make -j3 + make install + cd ${GITHUB_WORKSPACE} + ls From 2ed7250c8fdba614f709afa81ca2279376a4c7f4 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 13:34:11 +0000 Subject: [PATCH 19/81] build on azure --- azure-pipelines.yml | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index df15296e6..4f7faa099 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,7 +23,7 @@ jobs: cmake \ -DCMAKE_SYSTEM_PROCESSOR=arm64 \ -DWITH_OPENJPEG=OFF \ - -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \ + -DCMAKE_OSX_ARCHITECTURES="arm64" \ -DWITH_IPP=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ @@ -68,19 +68,41 @@ jobs: make install cd ${AGENT_BUILDDIRECTORY} ls + displayName: 'Build OpenCV' - -- job: Mac Intel - pool: - vmImage: 'macOS-12' + - script: | + pwd + mkdir src/build && cd $_ + cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${AGENT_BUILDDIRECTORY}/opencv_macos .. + make -j3 + ls + ls OpenCvSharpExtern + cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${AGENT_BUILDDIRECTORY}/nuget/ + displayName: 'Build OpenCVSharpExtern' - steps: - - script: + - script: | + cd ${AGENT_BUILDDIRECTORY}/nuget/ + otool -L libOpenCvSharpExtern.dylib + nm libOpenCvSharpExtern.dylib + echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c + gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern + LD_LIBRARY_PATH=. ./test + displayName: 'Check OpenCVSharpExtern' + - script: | + yyyymmdd=`date '+%Y%m%d'` + echo $yyyymmdd + sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" ${AGENT_BUILDDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + cat ${AGENT_BUILDDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + dotnet pack ${AGENT_BUILDDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${AGENT_BUILDDIRECTORY}/artifacts_macos + ls ${AGENT_BUILDDIRECTORY}/artifacts_macos - - task: UseDotNet@2 - displayName: 'Use .NET Core SDK 6.0.404' + - task: PublishBuildArtifacts@1 inputs: - version: 6.0.404 + pathToPublish: '$(Agent.BuildDirectory)/artifacts_macos' + artifactName: 'Binaries' + condition: succeeded() + + From 1305aa511f54ef49da2a7b3951eb6e006f5fd6c8 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 13:37:21 +0000 Subject: [PATCH 20/81] fixyaml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4f7faa099..a901e0ba3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ trigger: - master jobs: -- job: Mac ARM64 +- job: OsxArm64 pool: name: 'AvaloniaMacPool' From cdde4de7aa0cb8e21c77fc320bd87fbe65ff7c6c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 13:47:57 +0000 Subject: [PATCH 21/81] set opencv version var. --- azure-pipelines.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a901e0ba3..e97392a0b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,10 @@ # Start with a minimal pipeline that you can customize to build and deploy your code. # Add steps that build, run tests, deploy, and more: # https://aka.ms/yaml +variables: +- name: OpenCV.Version + value: 4.7.0 + trigger: - master From 9689192ce4fba78d382aa5465499e2afbfe5d56a Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 16:37:26 +0000 Subject: [PATCH 22/81] build without png --- azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e97392a0b..86a9d095a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -37,6 +37,8 @@ jobs: -DBUILD_DOCS=OFF \ -DBUILD_EXAMPLES=OFF \ -DBUILD_JAVA=OFF \ + -DBUILD_PNG=OFF \ + -DWITH_PNG=OFF \ -DBUILD_opencv_java_bindings_generator=OFF \ -DBUILD_opencv_python_bindings_generator=OFF \ -DBUILD_opencv_python_tests=OFF \ @@ -77,7 +79,7 @@ jobs: - script: | pwd mkdir src/build && cd $_ - cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${AGENT_BUILDDIRECTORY}/opencv_macos .. + cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${AGENT_BUILDDIRECTORY}/opencv_macos .. make -j3 ls ls OpenCvSharpExtern From 84ccece89591b6723d19a3bdf443e9c9f0b2302e Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 16:46:31 +0000 Subject: [PATCH 23/81] force arm64. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 86a9d095a..1b7372d3a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,7 +16,7 @@ jobs: name: 'AvaloniaMacPool' steps: - - script: brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr + - script: arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr displayName: install build dependencies - script: | From d18036a859c076140d0ec88fb5b432f968a2fca2 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 16:59:48 +0000 Subject: [PATCH 24/81] fix nuget copy --- azure-pipelines.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1b7372d3a..9ccac8111 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,25 +69,25 @@ jobs: -DWITH_ADE=OFF \ -DWITH_OPENEXR=OFF \ -DOPENCV_ENABLE_NONFREE=ON \ - -DCMAKE_INSTALL_PREFIX=${AGENT_BUILDDIRECTORY}/opencv_macos .. + -DCMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. make -j3 make install - cd ${AGENT_BUILDDIRECTORY} + cd ${BUILD_SOURCESDIRECTORY} ls displayName: 'Build OpenCV' - script: | pwd mkdir src/build && cd $_ - cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${AGENT_BUILDDIRECTORY}/opencv_macos .. + cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. make -j3 ls ls OpenCvSharpExtern - cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${AGENT_BUILDDIRECTORY}/nuget/ + cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/ displayName: 'Build OpenCVSharpExtern' - script: | - cd ${AGENT_BUILDDIRECTORY}/nuget/ + cd ${BUILD_SOURCESDIRECTORY}/nuget/ otool -L libOpenCvSharpExtern.dylib nm libOpenCvSharpExtern.dylib echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c @@ -98,10 +98,10 @@ jobs: - script: | yyyymmdd=`date '+%Y%m%d'` echo $yyyymmdd - sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" ${AGENT_BUILDDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - cat ${AGENT_BUILDDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - dotnet pack ${AGENT_BUILDDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${AGENT_BUILDDIRECTORY}/artifacts_macos - ls ${AGENT_BUILDDIRECTORY}/artifacts_macos + sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + cat ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + dotnet pack ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos + ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos - task: PublishBuildArtifacts@1 inputs: From c1ef44babd54eda9609f32a18ee52eab3cd9ce43 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 17:08:04 +0000 Subject: [PATCH 25/81] use all cores --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9ccac8111..5c1700dac 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -70,7 +70,7 @@ jobs: -DWITH_OPENEXR=OFF \ -DOPENCV_ENABLE_NONFREE=ON \ -DCMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. - make -j3 + make -j8 make install cd ${BUILD_SOURCESDIRECTORY} ls @@ -80,7 +80,7 @@ jobs: pwd mkdir src/build && cd $_ cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. - make -j3 + make -j8 ls ls OpenCvSharpExtern cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/ From 967be8b818d12ffdf46778ce930aee6a36a87210 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 17:11:04 +0000 Subject: [PATCH 26/81] fix text build. --- azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5c1700dac..611ecbf11 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -91,8 +91,7 @@ jobs: otool -L libOpenCvSharpExtern.dylib nm libOpenCvSharpExtern.dylib echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c - gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern - LD_LIBRARY_PATH=. ./test + arch -arm64 gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern LD_LIBRARY_PATH=. ./test displayName: 'Check OpenCVSharpExtern' - script: | From 910340e20e940798b98035237832614a49cdb32e Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 17:24:48 +0000 Subject: [PATCH 27/81] force it to build and execute everything on arm. --- azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 611ecbf11..5551a8067 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,6 +20,7 @@ jobs: displayName: install build dependencies - script: | + arch -arm64 /bin/bash pwd wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip @@ -77,6 +78,7 @@ jobs: displayName: 'Build OpenCV' - script: | + arch -arm64 /bin/bash pwd mkdir src/build && cd $_ cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. @@ -87,11 +89,13 @@ jobs: displayName: 'Build OpenCVSharpExtern' - script: | + arch -arm64 /bin/bash cd ${BUILD_SOURCESDIRECTORY}/nuget/ otool -L libOpenCvSharpExtern.dylib nm libOpenCvSharpExtern.dylib echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c - arch -arm64 gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern LD_LIBRARY_PATH=. ./test + gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern + LD_LIBRARY_PATH=. ./test displayName: 'Check OpenCVSharpExtern' - script: | From 13afe96e1544698b521dddd6bb52037c0990b43d Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 18:00:01 +0000 Subject: [PATCH 28/81] dont get stuck waiting for bash to exit. --- azure-pipelines.yml | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5551a8067..1cab5a65f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,12 +20,11 @@ jobs: displayName: install build dependencies - script: | - arch -arm64 /bin/bash pwd - wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip - wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip + arch -arm64 wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip + arch -arm64 wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip cd opencv-${OPENCV_VERSION} && mkdir build && cd build - cmake \ + arch -arm64 cmake \ -DCMAKE_SYSTEM_PROCESSOR=arm64 \ -DWITH_OPENJPEG=OFF \ -DCMAKE_OSX_ARCHITECTURES="arm64" \ @@ -71,31 +70,29 @@ jobs: -DWITH_OPENEXR=OFF \ -DOPENCV_ENABLE_NONFREE=ON \ -DCMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. - make -j8 - make install + arch -arm64 make -j8 + arch -arm64 make install cd ${BUILD_SOURCESDIRECTORY} ls displayName: 'Build OpenCV' - script: | - arch -arm64 /bin/bash pwd mkdir src/build && cd $_ - cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. - make -j8 + arch -arm64 cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -arm64 make -j8 ls ls OpenCvSharpExtern cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/ displayName: 'Build OpenCVSharpExtern' - - script: | - arch -arm64 /bin/bash + - script: | cd ${BUILD_SOURCESDIRECTORY}/nuget/ - otool -L libOpenCvSharpExtern.dylib + arch -arm64 tool -L libOpenCvSharpExtern.dylib nm libOpenCvSharpExtern.dylib echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c - gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern - LD_LIBRARY_PATH=. ./test + arch -arm64 gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern + arch -arm64 LD_LIBRARY_PATH=. ./test displayName: 'Check OpenCVSharpExtern' - script: | From f596a8a353223a3779e67f42fb8bc0679476ff8e Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 18:11:44 +0000 Subject: [PATCH 29/81] make running open cv tests non mandatory. --- azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1cab5a65f..c36065967 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -92,8 +92,9 @@ jobs: nm libOpenCvSharpExtern.dylib echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c arch -arm64 gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern - arch -arm64 LD_LIBRARY_PATH=. ./test + LD_LIBRARY_PATH=. arch -arm64 ./test displayName: 'Check OpenCVSharpExtern' + continueOnError: true - script: | yyyymmdd=`date '+%Y%m%d'` @@ -102,6 +103,7 @@ jobs: cat ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec dotnet pack ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos + displayName: Generate Nuget Package. - task: PublishBuildArtifacts@1 inputs: From 089827072ddce36af267729f9ed5b1cfca8e2228 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 24 Feb 2023 18:31:13 +0000 Subject: [PATCH 30/81] publish correct artifact --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c36065967..8c2cebce9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -107,7 +107,7 @@ jobs: - task: PublishBuildArtifacts@1 inputs: - pathToPublish: '$(Agent.BuildDirectory)/artifacts_macos' + pathToPublish: '$(Build.SourcesDirectory)/artifacts_macos' artifactName: 'Binaries' condition: succeeded() From 0b594251d6905bf33f1699883a34e19c4d02df3e Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 11:11:06 +0100 Subject: [PATCH 31/81] try and build universal package --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8c2cebce9..2b9a4436b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,7 +27,7 @@ jobs: arch -arm64 cmake \ -DCMAKE_SYSTEM_PROCESSOR=arm64 \ -DWITH_OPENJPEG=OFF \ - -DCMAKE_OSX_ARCHITECTURES="arm64" \ + -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \ -DWITH_IPP=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ From 41cb1f08509e7b741cb98faa718bca4717bf983f Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 11:26:05 +0100 Subject: [PATCH 32/81] force both builds to be universal binaries. --- azure-pipelines.yml | 4 ++-- src/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2b9a4436b..8fdca24f2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,7 +27,7 @@ jobs: arch -arm64 cmake \ -DCMAKE_SYSTEM_PROCESSOR=arm64 \ -DWITH_OPENJPEG=OFF \ - -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \ + -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ -DWITH_IPP=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ @@ -79,7 +79,7 @@ jobs: - script: | pwd mkdir src/build && cd $_ - arch -arm64 cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -arm64 cmake -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. arch -arm64 make -j8 ls ls OpenCvSharpExtern diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d32dff734..33a9ffebf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.0) +set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) project(OpenCvSharpExtern) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") From b43176dba0c9d6a771d17e2a6f42b32f161dec89 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 11:47:24 +0100 Subject: [PATCH 33/81] build arm and x64 seperately. --- azure-pipelines.yml | 108 ++++++++++++++++++++++++++++++++++++++------ src/CMakeLists.txt | 1 - 2 files changed, 94 insertions(+), 15 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8fdca24f2..b3577d22f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,7 +11,7 @@ trigger: - master jobs: -- job: OsxArm64 +- job: Osx-Arm64 pool: name: 'AvaloniaMacPool' @@ -27,7 +27,7 @@ jobs: arch -arm64 cmake \ -DCMAKE_SYSTEM_PROCESSOR=arm64 \ -DWITH_OPENJPEG=OFF \ - -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ + -DCMAKE_OSX_ARCHITECTURES="arm64" \ -DWITH_IPP=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ @@ -79,7 +79,7 @@ jobs: - script: | pwd mkdir src/build && cd $_ - arch -arm64 cmake -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -arm64 cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. arch -arm64 make -j8 ls ls OpenCvSharpExtern @@ -96,21 +96,101 @@ jobs: displayName: 'Check OpenCVSharpExtern' continueOnError: true - - script: | - yyyymmdd=`date '+%Y%m%d'` - echo $yyyymmdd - sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - cat ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - dotnet pack ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos - ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos - displayName: Generate Nuget Package. - - task: PublishBuildArtifacts@1 inputs: - pathToPublish: '$(Build.SourcesDirectory)/artifacts_macos' - artifactName: 'Binaries' + pathToPublish: '$(Build.SourcesDirectory)/nuget' + artifactName: 'Binaries arm64' condition: succeeded() +- job: Osx-x86_64 + pool: + name: 'AvaloniaMacPool' + + steps: + - script: brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr + displayName: install build dependencies + - script: | + pwd + wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip + wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip + cd opencv-${OPENCV_VERSION} && mkdir build && cd build + cmake \ + -DCMAKE_SYSTEM_PROCESSOR=x86_64 \ + -DWITH_OPENJPEG=OFF \ + -DCMAKE_OSX_ARCHITECTURES="x86_64" \ + -DWITH_IPP=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_JAVA=OFF \ + -DBUILD_PNG=OFF \ + -DWITH_PNG=OFF \ + -DBUILD_opencv_java_bindings_generator=OFF \ + -DBUILD_opencv_python_bindings_generator=OFF \ + -DBUILD_opencv_python_tests=OFF \ + -DBUILD_opencv_ts=OFF \ + -DBUILD_opencv_js=OFF \ + -DBUILD_opencv_js_bindings_generator=OFF \ + -DBUILD_opencv_apps=OFF \ + -DBUILD_opencv_barcode=OFF \ + -DBUILD_opencv_bioinspired=OFF \ + -DBUILD_opencv_ccalib=OFF \ + -DBUILD_opencv_datasets=OFF \ + -DBUILD_opencv_dnn_objdetect=OFF \ + -DBUILD_opencv_dpm=OFF \ + -DBUILD_opencv_fuzzy=OFF \ + -DBUILD_opencv_gapi=ON \ + -DBUILD_opencv_intensity_transform=OFF \ + -DBUILD_opencv_mcc=OFF \ + -DBUILD_opencv_objc_bindings_generator=OFF \ + -DBUILD_opencv_rapid=OFF \ + -DBUILD_opencv_reg=OFF \ + -DBUILD_opencv_stereo=OFF \ + -DBUILD_opencv_structured_light=OFF \ + -DBUILD_opencv_surface_matching=OFF \ + -DBUILD_opencv_wechat_qrcode=ON \ + -DBUILD_opencv_videostab=OFF \ + -DWITH_GSTREAMER=OFF \ + -DWITH_EIGEN=OFF \ + -DWITH_ADE=OFF \ + -DWITH_OPENEXR=OFF \ + -DOPENCV_ENABLE_NONFREE=ON \ + -DCMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + make -j8 + make install + cd ${BUILD_SOURCESDIRECTORY} + ls + displayName: 'Build OpenCV' + + - script: | + pwd + mkdir src/build && cd $_ + cmake -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + make -j8 + ls + ls OpenCvSharpExtern + cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/ + displayName: 'Build OpenCVSharpExtern' + + - script: | + cd ${BUILD_SOURCESDIRECTORY}/nuget/ + tool -L libOpenCvSharpExtern.dylib + nm libOpenCvSharpExtern.dylib + echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c + gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern + LD_LIBRARY_PATH=. ./test + displayName: 'Check OpenCVSharpExtern' + continueOnError: true + + - task: PublishBuildArtifacts@1 + inputs: + pathToPublish: '$(Build.SourcesDirectory)/nuget' + artifactName: 'BinariesX64' + condition: succeeded() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 33a9ffebf..d32dff734 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 3.0) -set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) project(OpenCvSharpExtern) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") From 1bb7a1cfeef60926943f3c22c90fefa1bb8dd853 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 11:48:48 +0100 Subject: [PATCH 34/81] fix azure syntax. --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b3577d22f..29a7ac90d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,7 +11,7 @@ trigger: - master jobs: -- job: Osx-Arm64 +- job: OsxArm pool: name: 'AvaloniaMacPool' @@ -102,7 +102,7 @@ jobs: artifactName: 'Binaries arm64' condition: succeeded() -- job: Osx-x86_64 +- job: OsxIntel pool: name: 'AvaloniaMacPool' From c9db9bd5088b64040f26ac0bde7ae68642ad29c1 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 12:23:09 +0100 Subject: [PATCH 35/81] fix intel build --- azure-pipelines.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 29a7ac90d..bbfad9c1c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -116,9 +116,7 @@ jobs: wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip cd opencv-${OPENCV_VERSION} && mkdir build && cd build cmake \ - -DCMAKE_SYSTEM_PROCESSOR=x86_64 \ -DWITH_OPENJPEG=OFF \ - -DCMAKE_OSX_ARCHITECTURES="x86_64" \ -DWITH_IPP=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ @@ -170,7 +168,7 @@ jobs: - script: | pwd mkdir src/build && cd $_ - cmake -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + cmake -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. make -j8 ls ls OpenCvSharpExtern From 9c5e2db3d46af0a7c324f5650ae6f395fdd34785 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 12:46:08 +0100 Subject: [PATCH 36/81] make compatible with both intel and arm build agents. --- azure-pipelines.yml | 50 +++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bbfad9c1c..084edbe9b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -96,10 +96,19 @@ jobs: displayName: 'Check OpenCVSharpExtern' continueOnError: true + - script: | + yyyymmdd=`date '+%Y%m%d'` + echo $yyyymmdd + sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + cat ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + dotnet pack ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos + ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos + displayName: Generate Nuget Package. + - task: PublishBuildArtifacts@1 inputs: - pathToPublish: '$(Build.SourcesDirectory)/nuget' - artifactName: 'Binaries arm64' + pathToPublish: '$(Build.SourcesDirectory)/artifacts_macos' + artifactName: 'Binaries' condition: succeeded() - job: OsxIntel @@ -107,16 +116,18 @@ jobs: name: 'AvaloniaMacPool' steps: - - script: brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr + - script: arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr displayName: install build dependencies - script: | pwd - wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip - wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip + arch -x86_64 wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip + arch -x86_64 wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip cd opencv-${OPENCV_VERSION} && mkdir build && cd build - cmake \ + arch -x86_64 cmake \ + -DCMAKE_SYSTEM_PROCESSOR=x86_64 \ -DWITH_OPENJPEG=OFF \ + -DCMAKE_OSX_ARCHITECTURES="x86_64" \ -DWITH_IPP=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ @@ -159,8 +170,8 @@ jobs: -DWITH_OPENEXR=OFF \ -DOPENCV_ENABLE_NONFREE=ON \ -DCMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. - make -j8 - make install + arch -x86_64 make -j8 + arch -x86_64 make install cd ${BUILD_SOURCESDIRECTORY} ls displayName: 'Build OpenCV' @@ -168,8 +179,8 @@ jobs: - script: | pwd mkdir src/build && cd $_ - cmake -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. - make -j8 + arch -x86_64 cmake -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -x86_64 make -j8 ls ls OpenCvSharpExtern cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/ @@ -177,18 +188,27 @@ jobs: - script: | cd ${BUILD_SOURCESDIRECTORY}/nuget/ - tool -L libOpenCvSharpExtern.dylib + arch -x86_64 tool -L libOpenCvSharpExtern.dylib nm libOpenCvSharpExtern.dylib echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c - gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern - LD_LIBRARY_PATH=. ./test + arch -x86_64 gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern + LD_LIBRARY_PATH=. arch -x86_64 ./test displayName: 'Check OpenCVSharpExtern' continueOnError: true + - script: | + yyyymmdd=`date '+%Y%m%d'` + echo $yyyymmdd + sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + cat ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + dotnet pack ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos + ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos + displayName: Generate Nuget Package. + - task: PublishBuildArtifacts@1 inputs: - pathToPublish: '$(Build.SourcesDirectory)/nuget' - artifactName: 'BinariesX64' + pathToPublish: '$(Build.SourcesDirectory)/artifacts_macos' + artifactName: 'Binaries' condition: succeeded() From 5c872c81bb4450afd9c5e797af7804fb192d8671 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 12:56:26 +0100 Subject: [PATCH 37/81] force arm agent for arm and intel agent for intel. --- azure-pipelines.yml | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 084edbe9b..767feadc4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,6 +14,8 @@ jobs: - job: OsxArm pool: name: 'AvaloniaMacPool' + demands: + - arch -equals arm steps: - script: arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr @@ -96,24 +98,17 @@ jobs: displayName: 'Check OpenCVSharpExtern' continueOnError: true - - script: | - yyyymmdd=`date '+%Y%m%d'` - echo $yyyymmdd - sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - cat ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - dotnet pack ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos - ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos - displayName: Generate Nuget Package. - - task: PublishBuildArtifacts@1 inputs: - pathToPublish: '$(Build.SourcesDirectory)/artifacts_macos' - artifactName: 'Binaries' + pathToPublish: '$(Build.SourcesDirectory)/nuget' + artifactName: 'BinariesArm' condition: succeeded() - job: OsxIntel pool: name: 'AvaloniaMacPool' + demands: + - arch -equals intel steps: - script: arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr @@ -196,19 +191,10 @@ jobs: displayName: 'Check OpenCVSharpExtern' continueOnError: true - - script: | - yyyymmdd=`date '+%Y%m%d'` - echo $yyyymmdd - sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - cat ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - dotnet pack ${BUILD_SOURCESDIRECTORY}/nuget/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos - ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos - displayName: Generate Nuget Package. - - task: PublishBuildArtifacts@1 inputs: - pathToPublish: '$(Build.SourcesDirectory)/artifacts_macos' - artifactName: 'Binaries' + pathToPublish: '$(Build.SourcesDirectory)/nuget' + artifactName: 'BinariesIntel' condition: succeeded() From 0f9b6b7f9384de3dc584a66b51a7cb70d897f494 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 13:33:26 +0100 Subject: [PATCH 38/81] put binaries into intel and arm folders so the nuget package can be built in the release pipeline. --- azure-pipelines.yml | 4 ++-- nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 767feadc4..97ec77dd2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -85,7 +85,7 @@ jobs: arch -arm64 make -j8 ls ls OpenCvSharpExtern - cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/ + cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/arm displayName: 'Build OpenCVSharpExtern' - script: | @@ -178,7 +178,7 @@ jobs: arch -x86_64 make -j8 ls ls OpenCvSharpExtern - cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/ + cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/intel displayName: 'Build OpenCVSharpExtern' - script: | diff --git a/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec b/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec index 8fff69349..9d96eb428 100644 --- a/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec +++ b/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec @@ -25,7 +25,7 @@ - - + + \ No newline at end of file From f77e6a326b7337a4ef1a52caf46ebf69c9a2de70 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 13:38:25 +0100 Subject: [PATCH 39/81] fix copy of dylib. --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 97ec77dd2..76be5e2db 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -85,7 +85,7 @@ jobs: arch -arm64 make -j8 ls ls OpenCvSharpExtern - cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/arm + cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/arm/ displayName: 'Build OpenCVSharpExtern' - script: | @@ -178,7 +178,7 @@ jobs: arch -x86_64 make -j8 ls ls OpenCvSharpExtern - cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/intel + cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/intel/ displayName: 'Build OpenCVSharpExtern' - script: | From 76a24b102adcd9495548465b395cc000f3240d71 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 13:45:28 +0100 Subject: [PATCH 40/81] mkdir --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 76be5e2db..047ab570e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -85,6 +85,7 @@ jobs: arch -arm64 make -j8 ls ls OpenCvSharpExtern + mkdir ${BUILD_SOURCESDIRECTORY}/nuget/arm/ cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/arm/ displayName: 'Build OpenCVSharpExtern' @@ -178,6 +179,7 @@ jobs: arch -x86_64 make -j8 ls ls OpenCvSharpExtern + ${BUILD_SOURCESDIRECTORY}/nuget/intel/ cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/intel/ displayName: 'Build OpenCVSharpExtern' From 0183536eb9281addea20955a5572caec1caa3bfc Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 13:57:08 +0100 Subject: [PATCH 41/81] mkdir --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 047ab570e..0ebba0ad5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -179,7 +179,7 @@ jobs: arch -x86_64 make -j8 ls ls OpenCvSharpExtern - ${BUILD_SOURCESDIRECTORY}/nuget/intel/ + mkdir ${BUILD_SOURCESDIRECTORY}/nuget/intel/ cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/intel/ displayName: 'Build OpenCVSharpExtern' From 666e634f36dee44bba7bf70e030cd077d0f71b5c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 14:58:04 +0100 Subject: [PATCH 42/81] use stages to package. --- azure-pipelines.yml | 384 ++++++++++++++++++++++++-------------------- 1 file changed, 206 insertions(+), 178 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0ebba0ad5..d3bc240a2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,194 +9,222 @@ variables: trigger: - master +stages: +-stage: build + jobs: + - job: OsxArm + pool: + name: 'AvaloniaMacPool' + demands: + - arch -equals arm -jobs: -- job: OsxArm - pool: - name: 'AvaloniaMacPool' - demands: - - arch -equals arm + steps: + - script: arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr + displayName: install build dependencies - steps: - - script: arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr - displayName: install build dependencies + - script: | + pwd + arch -arm64 wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip + arch -arm64 wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip + cd opencv-${OPENCV_VERSION} && mkdir build && cd build + arch -arm64 cmake \ + -DCMAKE_SYSTEM_PROCESSOR=arm64 \ + -DWITH_OPENJPEG=OFF \ + -DCMAKE_OSX_ARCHITECTURES="arm64" \ + -DWITH_IPP=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_JAVA=OFF \ + -DBUILD_PNG=OFF \ + -DWITH_PNG=OFF \ + -DBUILD_opencv_java_bindings_generator=OFF \ + -DBUILD_opencv_python_bindings_generator=OFF \ + -DBUILD_opencv_python_tests=OFF \ + -DBUILD_opencv_ts=OFF \ + -DBUILD_opencv_js=OFF \ + -DBUILD_opencv_js_bindings_generator=OFF \ + -DBUILD_opencv_apps=OFF \ + -DBUILD_opencv_barcode=OFF \ + -DBUILD_opencv_bioinspired=OFF \ + -DBUILD_opencv_ccalib=OFF \ + -DBUILD_opencv_datasets=OFF \ + -DBUILD_opencv_dnn_objdetect=OFF \ + -DBUILD_opencv_dpm=OFF \ + -DBUILD_opencv_fuzzy=OFF \ + -DBUILD_opencv_gapi=ON \ + -DBUILD_opencv_intensity_transform=OFF \ + -DBUILD_opencv_mcc=OFF \ + -DBUILD_opencv_objc_bindings_generator=OFF \ + -DBUILD_opencv_rapid=OFF \ + -DBUILD_opencv_reg=OFF \ + -DBUILD_opencv_stereo=OFF \ + -DBUILD_opencv_structured_light=OFF \ + -DBUILD_opencv_surface_matching=OFF \ + -DBUILD_opencv_wechat_qrcode=ON \ + -DBUILD_opencv_videostab=OFF \ + -DWITH_GSTREAMER=OFF \ + -DWITH_EIGEN=OFF \ + -DWITH_ADE=OFF \ + -DWITH_OPENEXR=OFF \ + -DOPENCV_ENABLE_NONFREE=ON \ + -DCMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -arm64 make -j8 + arch -arm64 make install + cd ${BUILD_SOURCESDIRECTORY} + ls + displayName: 'Build OpenCV' - - script: | - pwd - arch -arm64 wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip - arch -arm64 wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip - cd opencv-${OPENCV_VERSION} && mkdir build && cd build - arch -arm64 cmake \ - -DCMAKE_SYSTEM_PROCESSOR=arm64 \ - -DWITH_OPENJPEG=OFF \ - -DCMAKE_OSX_ARCHITECTURES="arm64" \ - -DWITH_IPP=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ - -DBUILD_SHARED_LIBS=OFF \ - -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ - -DBUILD_PERF_TESTS=OFF \ - -DBUILD_DOCS=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_JAVA=OFF \ - -DBUILD_PNG=OFF \ - -DWITH_PNG=OFF \ - -DBUILD_opencv_java_bindings_generator=OFF \ - -DBUILD_opencv_python_bindings_generator=OFF \ - -DBUILD_opencv_python_tests=OFF \ - -DBUILD_opencv_ts=OFF \ - -DBUILD_opencv_js=OFF \ - -DBUILD_opencv_js_bindings_generator=OFF \ - -DBUILD_opencv_apps=OFF \ - -DBUILD_opencv_barcode=OFF \ - -DBUILD_opencv_bioinspired=OFF \ - -DBUILD_opencv_ccalib=OFF \ - -DBUILD_opencv_datasets=OFF \ - -DBUILD_opencv_dnn_objdetect=OFF \ - -DBUILD_opencv_dpm=OFF \ - -DBUILD_opencv_fuzzy=OFF \ - -DBUILD_opencv_gapi=ON \ - -DBUILD_opencv_intensity_transform=OFF \ - -DBUILD_opencv_mcc=OFF \ - -DBUILD_opencv_objc_bindings_generator=OFF \ - -DBUILD_opencv_rapid=OFF \ - -DBUILD_opencv_reg=OFF \ - -DBUILD_opencv_stereo=OFF \ - -DBUILD_opencv_structured_light=OFF \ - -DBUILD_opencv_surface_matching=OFF \ - -DBUILD_opencv_wechat_qrcode=ON \ - -DBUILD_opencv_videostab=OFF \ - -DWITH_GSTREAMER=OFF \ - -DWITH_EIGEN=OFF \ - -DWITH_ADE=OFF \ - -DWITH_OPENEXR=OFF \ - -DOPENCV_ENABLE_NONFREE=ON \ - -DCMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. - arch -arm64 make -j8 - arch -arm64 make install - cd ${BUILD_SOURCESDIRECTORY} - ls - displayName: 'Build OpenCV' + - script: | + pwd + mkdir src/build && cd $_ + arch -arm64 cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -arm64 make -j8 + ls + ls OpenCvSharpExtern + mkdir ${BUILD_SOURCESDIRECTORY}/nuget/arm/ + cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/arm/ + displayName: 'Build OpenCVSharpExtern' - - script: | - pwd - mkdir src/build && cd $_ - arch -arm64 cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. - arch -arm64 make -j8 - ls - ls OpenCvSharpExtern - mkdir ${BUILD_SOURCESDIRECTORY}/nuget/arm/ - cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/arm/ - displayName: 'Build OpenCVSharpExtern' + - script: | + cd ${BUILD_SOURCESDIRECTORY}/nuget/ + arch -arm64 tool -L libOpenCvSharpExtern.dylib + nm libOpenCvSharpExtern.dylib + echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c + arch -arm64 gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern + LD_LIBRARY_PATH=. arch -arm64 ./test + displayName: 'Check OpenCVSharpExtern' + continueOnError: true - - script: | - cd ${BUILD_SOURCESDIRECTORY}/nuget/ - arch -arm64 tool -L libOpenCvSharpExtern.dylib - nm libOpenCvSharpExtern.dylib - echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c - arch -arm64 gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern - LD_LIBRARY_PATH=. arch -arm64 ./test - displayName: 'Check OpenCVSharpExtern' - continueOnError: true + - task: PublishBuildArtifacts@1 + inputs: + pathToPublish: '$(Build.SourcesDirectory)/nuget' + artifactName: 'BinariesArm' + condition: succeeded() - - task: PublishBuildArtifacts@1 - inputs: - pathToPublish: '$(Build.SourcesDirectory)/nuget' - artifactName: 'BinariesArm' - condition: succeeded() + - job: OsxIntel + pool: + name: 'AvaloniaMacPool' + demands: + - arch -equals intel -- job: OsxIntel - pool: - name: 'AvaloniaMacPool' - demands: - - arch -equals intel + steps: + - script: arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr + displayName: install build dependencies - steps: - - script: arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr - displayName: install build dependencies + - script: | + pwd + arch -x86_64 wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip + arch -x86_64 wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip + cd opencv-${OPENCV_VERSION} && mkdir build && cd build + arch -x86_64 cmake \ + -DCMAKE_SYSTEM_PROCESSOR=x86_64 \ + -DWITH_OPENJPEG=OFF \ + -DCMAKE_OSX_ARCHITECTURES="x86_64" \ + -DWITH_IPP=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ + -DBUILD_PERF_TESTS=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_JAVA=OFF \ + -DBUILD_PNG=OFF \ + -DWITH_PNG=OFF \ + -DBUILD_opencv_java_bindings_generator=OFF \ + -DBUILD_opencv_python_bindings_generator=OFF \ + -DBUILD_opencv_python_tests=OFF \ + -DBUILD_opencv_ts=OFF \ + -DBUILD_opencv_js=OFF \ + -DBUILD_opencv_js_bindings_generator=OFF \ + -DBUILD_opencv_apps=OFF \ + -DBUILD_opencv_barcode=OFF \ + -DBUILD_opencv_bioinspired=OFF \ + -DBUILD_opencv_ccalib=OFF \ + -DBUILD_opencv_datasets=OFF \ + -DBUILD_opencv_dnn_objdetect=OFF \ + -DBUILD_opencv_dpm=OFF \ + -DBUILD_opencv_fuzzy=OFF \ + -DBUILD_opencv_gapi=ON \ + -DBUILD_opencv_intensity_transform=OFF \ + -DBUILD_opencv_mcc=OFF \ + -DBUILD_opencv_objc_bindings_generator=OFF \ + -DBUILD_opencv_rapid=OFF \ + -DBUILD_opencv_reg=OFF \ + -DBUILD_opencv_stereo=OFF \ + -DBUILD_opencv_structured_light=OFF \ + -DBUILD_opencv_surface_matching=OFF \ + -DBUILD_opencv_wechat_qrcode=ON \ + -DBUILD_opencv_videostab=OFF \ + -DWITH_GSTREAMER=OFF \ + -DWITH_EIGEN=OFF \ + -DWITH_ADE=OFF \ + -DWITH_OPENEXR=OFF \ + -DOPENCV_ENABLE_NONFREE=ON \ + -DCMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -x86_64 make -j8 + arch -x86_64 make install + cd ${BUILD_SOURCESDIRECTORY} + ls + displayName: 'Build OpenCV' - - script: | - pwd - arch -x86_64 wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip - arch -x86_64 wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip - cd opencv-${OPENCV_VERSION} && mkdir build && cd build - arch -x86_64 cmake \ - -DCMAKE_SYSTEM_PROCESSOR=x86_64 \ - -DWITH_OPENJPEG=OFF \ - -DCMAKE_OSX_ARCHITECTURES="x86_64" \ - -DWITH_IPP=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ - -DBUILD_SHARED_LIBS=OFF \ - -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ - -DBUILD_PERF_TESTS=OFF \ - -DBUILD_DOCS=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_JAVA=OFF \ - -DBUILD_PNG=OFF \ - -DWITH_PNG=OFF \ - -DBUILD_opencv_java_bindings_generator=OFF \ - -DBUILD_opencv_python_bindings_generator=OFF \ - -DBUILD_opencv_python_tests=OFF \ - -DBUILD_opencv_ts=OFF \ - -DBUILD_opencv_js=OFF \ - -DBUILD_opencv_js_bindings_generator=OFF \ - -DBUILD_opencv_apps=OFF \ - -DBUILD_opencv_barcode=OFF \ - -DBUILD_opencv_bioinspired=OFF \ - -DBUILD_opencv_ccalib=OFF \ - -DBUILD_opencv_datasets=OFF \ - -DBUILD_opencv_dnn_objdetect=OFF \ - -DBUILD_opencv_dpm=OFF \ - -DBUILD_opencv_fuzzy=OFF \ - -DBUILD_opencv_gapi=ON \ - -DBUILD_opencv_intensity_transform=OFF \ - -DBUILD_opencv_mcc=OFF \ - -DBUILD_opencv_objc_bindings_generator=OFF \ - -DBUILD_opencv_rapid=OFF \ - -DBUILD_opencv_reg=OFF \ - -DBUILD_opencv_stereo=OFF \ - -DBUILD_opencv_structured_light=OFF \ - -DBUILD_opencv_surface_matching=OFF \ - -DBUILD_opencv_wechat_qrcode=ON \ - -DBUILD_opencv_videostab=OFF \ - -DWITH_GSTREAMER=OFF \ - -DWITH_EIGEN=OFF \ - -DWITH_ADE=OFF \ - -DWITH_OPENEXR=OFF \ - -DOPENCV_ENABLE_NONFREE=ON \ - -DCMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. - arch -x86_64 make -j8 - arch -x86_64 make install - cd ${BUILD_SOURCESDIRECTORY} - ls - displayName: 'Build OpenCV' + - script: | + pwd + mkdir src/build && cd $_ + arch -x86_64 cmake -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -x86_64 make -j8 + ls + ls OpenCvSharpExtern + mkdir ${BUILD_SOURCESDIRECTORY}/nuget/intel/ + cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/intel/ + displayName: 'Build OpenCVSharpExtern' - - script: | - pwd - mkdir src/build && cd $_ - arch -x86_64 cmake -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. - arch -x86_64 make -j8 - ls - ls OpenCvSharpExtern - mkdir ${BUILD_SOURCESDIRECTORY}/nuget/intel/ - cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/intel/ - displayName: 'Build OpenCVSharpExtern' + - script: | + cd ${BUILD_SOURCESDIRECTORY}/nuget/ + arch -x86_64 tool -L libOpenCvSharpExtern.dylib + nm libOpenCvSharpExtern.dylib + echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c + arch -x86_64 gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern + LD_LIBRARY_PATH=. arch -x86_64 ./test + displayName: 'Check OpenCVSharpExtern' + continueOnError: true - - script: | - cd ${BUILD_SOURCESDIRECTORY}/nuget/ - arch -x86_64 tool -L libOpenCvSharpExtern.dylib - nm libOpenCvSharpExtern.dylib - echo -ne "#include \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c - arch -x86_64 gcc -I./ -L./ test.c -o test -lOpenCvSharpExtern - LD_LIBRARY_PATH=. arch -x86_64 ./test - displayName: 'Check OpenCVSharpExtern' - continueOnError: true + - task: PublishBuildArtifacts@1 + inputs: + pathToPublish: '$(Build.SourcesDirectory)/nuget' + artifactName: 'BinariesIntel' + condition: succeeded() - - task: PublishBuildArtifacts@1 - inputs: - pathToPublish: '$(Build.SourcesDirectory)/nuget' - artifactName: 'BinariesIntel' - condition: succeeded() + -stage: pack + dependsOn: build + jobs: + - job: package + pool: + vmImage: 'ubuntu-latest' + steps: + - download: current + artifact: BinariesArm + - download: current + artifact: BinariesIntel + + - script: | + mkdir $(Pipeline.Workspace)/BinariesArm/intel/ + cp $(Pipeline.Workspace)/BinariesIntel/intel/*.* $(Pipeline.Workspace)/BinariesArm/arm/ + yyyymmdd=`date '+%Y%m%d'` + echo $yyyymmdd + sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + cat $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + dotnet pack $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos + ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos + displayName: Generate Nuget Package. - + - task: PublishBuildArtifacts@1 + inputs: + pathToPublish: '$(Build.SourcesDirectory)/artifacts_macos' + artifactName: 'Binaries' + condition: succeeded() From 7291de92b8cfec48759c2de2adf201275f0f6250 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 14:58:49 +0100 Subject: [PATCH 43/81] fix yml. --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d3bc240a2..ef06fb625 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,7 +10,7 @@ variables: trigger: - master stages: --stage: build +- stage: build jobs: - job: OsxArm pool: @@ -200,7 +200,7 @@ stages: artifactName: 'BinariesIntel' condition: succeeded() - -stage: pack + - stage: pack dependsOn: build jobs: - job: package From 80b6d2735f6a36311dbef5d3128f3df9ac195442 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 14:59:35 +0100 Subject: [PATCH 44/81] yaml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ef06fb625..98a6ad983 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -200,7 +200,7 @@ stages: artifactName: 'BinariesIntel' condition: succeeded() - - stage: pack +- stage: pack dependsOn: build jobs: - job: package From 2571f994a5a26640c3bcc0e57e8e04402bfb3fe2 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 15:00:59 +0100 Subject: [PATCH 45/81] indentation yaml --- azure-pipelines.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 98a6ad983..623c4e828 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -213,14 +213,14 @@ stages: artifact: BinariesIntel - script: | - mkdir $(Pipeline.Workspace)/BinariesArm/intel/ - cp $(Pipeline.Workspace)/BinariesIntel/intel/*.* $(Pipeline.Workspace)/BinariesArm/arm/ - yyyymmdd=`date '+%Y%m%d'` - echo $yyyymmdd - sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - cat $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - dotnet pack $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos - ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos + mkdir $(Pipeline.Workspace)/BinariesArm/intel/ + cp $(Pipeline.Workspace)/BinariesIntel/intel/*.* $(Pipeline.Workspace)/BinariesArm/arm/ + yyyymmdd=`date '+%Y%m%d'` + echo $yyyymmdd + sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + cat $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + dotnet pack $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos + ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos displayName: Generate Nuget Package. - task: PublishBuildArtifacts@1 From df088f909aee5e6f995e46da363397bb187cfdc9 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 15:02:28 +0100 Subject: [PATCH 46/81] process of elimination. --- azure-pipelines.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 623c4e828..595e2ed04 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -211,17 +211,6 @@ stages: artifact: BinariesArm - download: current artifact: BinariesIntel - - - script: | - mkdir $(Pipeline.Workspace)/BinariesArm/intel/ - cp $(Pipeline.Workspace)/BinariesIntel/intel/*.* $(Pipeline.Workspace)/BinariesArm/arm/ - yyyymmdd=`date '+%Y%m%d'` - echo $yyyymmdd - sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - cat $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec - dotnet pack $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos - ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos - displayName: Generate Nuget Package. - task: PublishBuildArtifacts@1 inputs: From 6b21fb385b121f47d772458484c7f01f352e1d67 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 15:05:26 +0100 Subject: [PATCH 47/81] restore script. --- azure-pipelines.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 595e2ed04..d9419a28c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -211,6 +211,17 @@ stages: artifact: BinariesArm - download: current artifact: BinariesIntel + + - script: | + mkdir $(Pipeline.Workspace)/BinariesArm/intel/ + cp $(Pipeline.Workspace)/BinariesIntel/intel/ $(Pipeline.Workspace)/BinariesArm/arm/ + yyyymmdd=`date '+%Y%m%d'` + echo $yyyymmdd + sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + cat $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec + dotnet pack $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos + ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos + displayName: Generate Nuget Package. - task: PublishBuildArtifacts@1 inputs: From 108b5c024b58a9632e7218777986244ad221088f Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 15:06:23 +0100 Subject: [PATCH 48/81] indentation. --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d9419a28c..b91a05912 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -220,8 +220,8 @@ stages: sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec cat $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec dotnet pack $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.csproj -o ${BUILD_SOURCESDIRECTORY}/artifacts_macos - ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos - displayName: Generate Nuget Package. + ls ${BUILD_SOURCESDIRECTORY}/artifacts_macos + displayName: Generate Nuget Package. - task: PublishBuildArtifacts@1 inputs: From 5a4c992de1ab14df5e41670863c72fdc30c566b8 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 15:29:08 +0100 Subject: [PATCH 49/81] fix cp cmd --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b91a05912..bf32c929d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -214,7 +214,7 @@ stages: - script: | mkdir $(Pipeline.Workspace)/BinariesArm/intel/ - cp $(Pipeline.Workspace)/BinariesIntel/intel/ $(Pipeline.Workspace)/BinariesArm/arm/ + cp -r $(Pipeline.Workspace)/BinariesIntel/intel/* $(Pipeline.Workspace)/BinariesArm/arm/ yyyymmdd=`date '+%Y%m%d'` echo $yyyymmdd sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec From c743f2f38c826869debc03a2de8d445a1de0e4b4 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 15:48:00 +0100 Subject: [PATCH 50/81] fix packaging. --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bf32c929d..d39e345cc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -213,8 +213,9 @@ stages: artifact: BinariesIntel - script: | + mkdir ${BUILD_SOURCESDIRECTORY}/artifacts_macos mkdir $(Pipeline.Workspace)/BinariesArm/intel/ - cp -r $(Pipeline.Workspace)/BinariesIntel/intel/* $(Pipeline.Workspace)/BinariesArm/arm/ + cp -r $(Pipeline.Workspace)/BinariesIntel/intel/* $(Pipeline.Workspace)/BinariesArm/intel/ yyyymmdd=`date '+%Y%m%d'` echo $yyyymmdd sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec From e58a70a569d6b3395315c05e2024e781af1880c7 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Tue, 27 Jun 2023 16:06:02 +0100 Subject: [PATCH 51/81] fix artifact name. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d39e345cc..45c4d5576 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -227,5 +227,5 @@ stages: - task: PublishBuildArtifacts@1 inputs: pathToPublish: '$(Build.SourcesDirectory)/artifacts_macos' - artifactName: 'Binaries' + artifactName: 'nuget' condition: succeeded() From c99e76dc5184333da2393dcc0eb4f16bbc1c3051 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 7 Jul 2023 11:02:00 +0100 Subject: [PATCH 52/81] attempt dylib repack. --- azure-pipelines.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 45c4d5576..1c6931d29 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -90,6 +90,14 @@ stages: cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/arm/ displayName: 'Build OpenCVSharpExtern' + + - script: | + wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.1/DylibRepack-arm + chmod +x ./DylibRepack-arm + mv ./DylibRepack-arm ./DylibRepack + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/ ${BUILD_SOURCESDIRECTORY}/nuget/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/libgdiplus.dylib + displayName: Repack Dylib Dependencies + - script: | cd ${BUILD_SOURCESDIRECTORY}/nuget/ arch -arm64 tool -L libOpenCvSharpExtern.dylib From 73aba78055dc5aaf860cba1bd28857031673ca61 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 7 Jul 2023 11:08:34 +0100 Subject: [PATCH 53/81] fix repack. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1c6931d29..2734ab7ed 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -95,7 +95,7 @@ stages: wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.1/DylibRepack-arm chmod +x ./DylibRepack-arm mv ./DylibRepack-arm ./DylibRepack - ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/ ${BUILD_SOURCESDIRECTORY}/nuget/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/libgdiplus.dylib + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/ ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib displayName: Repack Dylib Dependencies - script: | From 76e68c3897efaa94ba32e4a0b096b00051d14488 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 7 Jul 2023 11:24:02 +0100 Subject: [PATCH 54/81] pass webp to repack. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2734ab7ed..19851282b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -95,7 +95,7 @@ stages: wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.1/DylibRepack-arm chmod +x ./DylibRepack-arm mv ./DylibRepack-arm ./DylibRepack - ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/ ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/ ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib /opt/homebrew/lib/libwebp.dylib displayName: Repack Dylib Dependencies - script: | From 8983d122d84506ce5b49c8735d929a94d4bfbe6d Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 7 Jul 2023 13:57:22 +0100 Subject: [PATCH 55/81] try new repack --- azure-pipelines.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 19851282b..badc8824c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -92,10 +92,11 @@ stages: - script: | - wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.1/DylibRepack-arm + wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.2/DylibRepack-arm chmod +x ./DylibRepack-arm mv ./DylibRepack-arm ./DylibRepack - ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/ ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib /opt/homebrew/lib/libwebp.dylib + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/ ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib + ./DylibRepack verify ${BUILD_SOURCESDIRECTORY}/nuget/libOpenCvSharpExtern.dylib displayName: Repack Dylib Dependencies - script: | From 4486063fd76d47a04e03287acdfc03ea1976c023 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 7 Jul 2023 14:51:15 +0100 Subject: [PATCH 56/81] repack without verify. --- azure-pipelines.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index badc8824c..b108b846f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -95,8 +95,9 @@ stages: wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.2/DylibRepack-arm chmod +x ./DylibRepack-arm mv ./DylibRepack-arm ./DylibRepack - ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/ ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib - ./DylibRepack verify ${BUILD_SOURCESDIRECTORY}/nuget/libOpenCvSharpExtern.dylib + mkdir ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib + displayName: Repack Dylib Dependencies - script: | From 99d87366c5ea84a95283d3e051dd3aeb7ada7b04 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 7 Jul 2023 15:01:36 +0100 Subject: [PATCH 57/81] attempt to package repacked binaries. --- azure-pipelines.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b108b846f..0213cb7d1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -90,14 +90,12 @@ stages: cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/arm/ displayName: 'Build OpenCVSharpExtern' - - script: | wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.2/DylibRepack-arm chmod +x ./DylibRepack-arm mv ./DylibRepack-arm ./DylibRepack mkdir ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib - displayName: Repack Dylib Dependencies - script: | @@ -194,6 +192,14 @@ stages: cp OpenCvSharpExtern/libOpenCvSharpExtern.dylib ${BUILD_SOURCESDIRECTORY}/nuget/intel/ displayName: 'Build OpenCVSharpExtern' + - script: | + wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.2/DylibRepack-intel + chmod +x ./DylibRepack-intel + mv ./DylibRepack-intel ./DylibRepack + mkdir ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack ${BUILD_SOURCESDIRECTORY}/nuget/intel/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib + displayName: Repack Dylib Dependencies + - script: | cd ${BUILD_SOURCESDIRECTORY}/nuget/ arch -x86_64 tool -L libOpenCvSharpExtern.dylib @@ -225,7 +231,8 @@ stages: - script: | mkdir ${BUILD_SOURCESDIRECTORY}/artifacts_macos mkdir $(Pipeline.Workspace)/BinariesArm/intel/ - cp -r $(Pipeline.Workspace)/BinariesIntel/intel/* $(Pipeline.Workspace)/BinariesArm/intel/ + mkdir $(Pipeline.Workspace)/BinariesArm/intel/repack + cp -r $(Pipeline.Workspace)/BinariesIntel/intel/repack/* $(Pipeline.Workspace)/BinariesArm/intel/repack yyyymmdd=`date '+%Y%m%d'` echo $yyyymmdd sed -E -i=.bak "s/[0-9]\.[0-9]{1,2}\.[0-9]{1,2}.[0-9]{8}(-beta[0-9]*)?<\/version>/${OPENCV_VERSION}.${yyyymmdd}${BETA}<\/version>/" $(Pipeline.Workspace)/BinariesArm/OpenCvSharp4.runtime.osx.10.15-universal.nuspec From 3f4aadb6b92a41769df885b98732755e25e79388 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 7 Jul 2023 15:05:04 +0100 Subject: [PATCH 58/81] fix nuspec. --- nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec b/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec index 9d96eb428..107ed8365 100644 --- a/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec +++ b/nuget/OpenCvSharp4.runtime.osx.10.15-universal.nuspec @@ -25,7 +25,7 @@ - - + + \ No newline at end of file From 60689ddc907e38e44afa397ffe7cbd1799605560 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 7 Jul 2023 15:25:29 +0100 Subject: [PATCH 59/81] fix libgdiplus location on intel mac. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0213cb7d1..83b2723a0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -197,7 +197,7 @@ stages: chmod +x ./DylibRepack-intel mv ./DylibRepack-intel ./DylibRepack mkdir ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack - ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack ${BUILD_SOURCESDIRECTORY}/nuget/intel/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack ${BUILD_SOURCESDIRECTORY}/nuget/intel/libOpenCvSharpExtern.dylib /usr/local/lib/libgdiplus.dylib displayName: Repack Dylib Dependencies - script: | From c76712a2cfdebe8c1d34ad8488fc3e27304d1ecf Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 7 Jul 2023 17:55:38 +0100 Subject: [PATCH 60/81] fix codesign. --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 83b2723a0..a14452a18 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -96,6 +96,7 @@ stages: mv ./DylibRepack-arm ./DylibRepack mkdir ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib + for f in ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack/*; do codesign --remove-signature $f; codesign -s - $f; done; displayName: Repack Dylib Dependencies - script: | @@ -198,6 +199,7 @@ stages: mv ./DylibRepack-intel ./DylibRepack mkdir ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack ${BUILD_SOURCESDIRECTORY}/nuget/intel/libOpenCvSharpExtern.dylib /usr/local/lib/libgdiplus.dylib + for f in ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack/*; do codesign --remove-signature $f; codesign -s - $f; done; displayName: Repack Dylib Dependencies - script: | From 880f4a554062561eb16e3362ad7b73c689f079ab Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 09:24:40 +0100 Subject: [PATCH 61/81] Adjust mac build --- azure-pipelines.yml | 180 +++++++++++++++++++++----------------------- 1 file changed, 85 insertions(+), 95 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a14452a18..bcab5a7f4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -24,55 +24,50 @@ stages: - script: | pwd - arch -arm64 wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip - arch -arm64 wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip + arch -arm64 git clone --branch ${OPENCV_VERSION} https://github.com/opencv/opencv.git + arch -arm64 git clone --branch ${OPENCV_VERSION} https://github.com/opencv/opencv_contrib.git cd opencv-${OPENCV_VERSION} && mkdir build && cd build arch -arm64 cmake \ - -DCMAKE_SYSTEM_PROCESSOR=arm64 \ - -DWITH_OPENJPEG=OFF \ - -DCMAKE_OSX_ARCHITECTURES="arm64" \ - -DWITH_IPP=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ - -DBUILD_SHARED_LIBS=OFF \ - -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ - -DBUILD_PERF_TESTS=OFF \ - -DBUILD_DOCS=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_JAVA=OFF \ - -DBUILD_PNG=OFF \ - -DWITH_PNG=OFF \ - -DBUILD_opencv_java_bindings_generator=OFF \ - -DBUILD_opencv_python_bindings_generator=OFF \ - -DBUILD_opencv_python_tests=OFF \ - -DBUILD_opencv_ts=OFF \ - -DBUILD_opencv_js=OFF \ - -DBUILD_opencv_js_bindings_generator=OFF \ - -DBUILD_opencv_apps=OFF \ - -DBUILD_opencv_barcode=OFF \ - -DBUILD_opencv_bioinspired=OFF \ - -DBUILD_opencv_ccalib=OFF \ - -DBUILD_opencv_datasets=OFF \ - -DBUILD_opencv_dnn_objdetect=OFF \ - -DBUILD_opencv_dpm=OFF \ - -DBUILD_opencv_fuzzy=OFF \ - -DBUILD_opencv_gapi=ON \ - -DBUILD_opencv_intensity_transform=OFF \ - -DBUILD_opencv_mcc=OFF \ - -DBUILD_opencv_objc_bindings_generator=OFF \ - -DBUILD_opencv_rapid=OFF \ - -DBUILD_opencv_reg=OFF \ - -DBUILD_opencv_stereo=OFF \ - -DBUILD_opencv_structured_light=OFF \ - -DBUILD_opencv_surface_matching=OFF \ - -DBUILD_opencv_wechat_qrcode=ON \ - -DBUILD_opencv_videostab=OFF \ - -DWITH_GSTREAMER=OFF \ - -DWITH_EIGEN=OFF \ - -DWITH_ADE=OFF \ - -DWITH_OPENEXR=OFF \ - -DOPENCV_ENABLE_NONFREE=ON \ - -DCMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + -D CMAKE_SYSTEM_PROCESSOR=arm64 \ + -D CMAKE_OSX_ARCHITECTURES="arm64" \ + -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \ + -D CMAKE_BUILD_TYPE=RELEASE \ + -D BUILD_SHARED_LIBS=OFF \ + -D ENABLE_CXX11=ON \ + -D BUILD_EXAMPLES=OFF \ + -D BUILD_DOCS=OFF \ + -D BUILD_PERF_TESTS=OFF \ + -D BUILD_TESTS=OFF \ + -D BUILD_JAVA=OFF \ + -D BUILD_opencv_app=OFF \ + -D BUILD_opencv_barcode=OFF \ + -D BUILD_opencv_java_bindings_generator=OFF \ + -D BUILD_opencv_js_bindings_generator=OFF \ + -D BUILD_opencv_python_bindings_generator=OFF \ + -D BUILD_opencv_python_tests=OFF \ + -D BUILD_opencv_ts=OFF \ + -D BUILD_opencv_js=OFF \ + -D BUILD_opencv_bioinspired=OFF \ + -D BUILD_opencv_ccalib=OFF \ + -D BUILD_opencv_datasets=OFF \ + -D BUILD_opencv_dnn_objdetect=OFF \ + -D BUILD_opencv_dpm=OFF \ + -D BUILD_opencv_fuzzy=OFF \ + -D BUILD_opencv_gapi=OFF \ + -D BUILD_opencv_intensity_transform=OFF \ + -D BUILD_opencv_mcc=OFF \ + -D BUILD_opencv_objc_bindings_generator=OFF \ + -D BUILD_opencv_rapid=OFF \ + -D BUILD_opencv_reg=OFF \ + -D BUILD_opencv_stereo=OFF \ + -D BUILD_opencv_structured_light=OFF \ + -D BUILD_opencv_surface_matching=OFF \ + -D BUILD_opencv_videostab=OFF \ + -D BUILD_opencv_wechat_qrcode=ON \ + -D WITH_GSTREAMER=OFF \ + -D WITH_ADE=OFF \ + -D OPENCV_ENABLE_NONFREE=ON \ + -D CMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. arch -arm64 make -j8 arch -arm64 make install cd ${BUILD_SOURCESDIRECTORY} @@ -82,7 +77,7 @@ stages: - script: | pwd mkdir src/build && cd $_ - arch -arm64 cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -arm64 cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. arch -arm64 make -j8 ls ls OpenCvSharpExtern @@ -127,54 +122,49 @@ stages: - script: | pwd - arch -x86_64 wget https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip -Oopencv-${OPENCV_VERSION}.zip && unzip opencv-${OPENCV_VERSION}.zip - arch -x86_64 wget https://github.com/opencv/opencv_contrib/archive/${OPENCV_VERSION}.zip -Oopencv_contrib-${OPENCV_VERSION}.zip && unzip opencv_contrib-${OPENCV_VERSION}.zip + arch -x86_64 git clone --branch ${OPENCV_VERSION} https://github.com/opencv/opencv.git + arch -x86_64 git clone --branch ${OPENCV_VERSION} https://github.com/opencv/opencv_contrib.git cd opencv-${OPENCV_VERSION} && mkdir build && cd build arch -x86_64 cmake \ - -DCMAKE_SYSTEM_PROCESSOR=x86_64 \ - -DWITH_OPENJPEG=OFF \ - -DCMAKE_OSX_ARCHITECTURES="x86_64" \ - -DWITH_IPP=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${OPENCV_VERSION}/modules \ - -DBUILD_SHARED_LIBS=OFF \ - -DENABLE_CXX11=ON -DBUILD_TESTS=OFF \ - -DBUILD_PERF_TESTS=OFF \ - -DBUILD_DOCS=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_JAVA=OFF \ - -DBUILD_PNG=OFF \ - -DWITH_PNG=OFF \ - -DBUILD_opencv_java_bindings_generator=OFF \ - -DBUILD_opencv_python_bindings_generator=OFF \ - -DBUILD_opencv_python_tests=OFF \ - -DBUILD_opencv_ts=OFF \ - -DBUILD_opencv_js=OFF \ - -DBUILD_opencv_js_bindings_generator=OFF \ - -DBUILD_opencv_apps=OFF \ - -DBUILD_opencv_barcode=OFF \ - -DBUILD_opencv_bioinspired=OFF \ - -DBUILD_opencv_ccalib=OFF \ - -DBUILD_opencv_datasets=OFF \ - -DBUILD_opencv_dnn_objdetect=OFF \ - -DBUILD_opencv_dpm=OFF \ - -DBUILD_opencv_fuzzy=OFF \ - -DBUILD_opencv_gapi=ON \ - -DBUILD_opencv_intensity_transform=OFF \ - -DBUILD_opencv_mcc=OFF \ - -DBUILD_opencv_objc_bindings_generator=OFF \ - -DBUILD_opencv_rapid=OFF \ - -DBUILD_opencv_reg=OFF \ - -DBUILD_opencv_stereo=OFF \ - -DBUILD_opencv_structured_light=OFF \ - -DBUILD_opencv_surface_matching=OFF \ - -DBUILD_opencv_wechat_qrcode=ON \ - -DBUILD_opencv_videostab=OFF \ - -DWITH_GSTREAMER=OFF \ - -DWITH_EIGEN=OFF \ - -DWITH_ADE=OFF \ - -DWITH_OPENEXR=OFF \ - -DOPENCV_ENABLE_NONFREE=ON \ + -D CMAKE_SYSTEM_PROCESSOR=x86_64 \ + -D CMAKE_OSX_ARCHITECTURES="x86_64" \ + -D CMAKE_BUILD_TYPE=Release \ + -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \ + -D BUILD_SHARED_LIBS=OFF \ + -D ENABLE_CXX11=ON \ + -D BUILD_EXAMPLES=OFF \ + -D BUILD_DOCS=OFF \ + -D BUILD_PERF_TESTS=OFF \ + -D BUILD_TESTS=OFF \ + -D BUILD_JAVA=OFF \ + -D BUILD_opencv_app=OFF \ + -D BUILD_opencv_barcode=OFF \ + -D BUILD_opencv_java_bindings_generator=OFF \ + -D BUILD_opencv_js_bindings_generator=OFF \ + -D BUILD_opencv_python_bindings_generator=OFF \ + -D BUILD_opencv_python_tests=OFF \ + -D BUILD_opencv_ts=OFF \ + -D BUILD_opencv_js=OFF \ + -D BUILD_opencv_bioinspired=OFF \ + -D BUILD_opencv_ccalib=OFF \ + -D BUILD_opencv_datasets=OFF \ + -D BUILD_opencv_dnn_objdetect=OFF \ + -D BUILD_opencv_dpm=OFF \ + -D BUILD_opencv_fuzzy=OFF \ + -D BUILD_opencv_gapi=OFF \ + -D BUILD_opencv_intensity_transform=OFF \ + -D BUILD_opencv_mcc=OFF \ + -D BUILD_opencv_objc_bindings_generator=OFF \ + -D BUILD_opencv_rapid=OFF \ + -D BUILD_opencv_reg=OFF \ + -D BUILD_opencv_stereo=OFF \ + -D BUILD_opencv_structured_light=OFF \ + -D BUILD_opencv_surface_matching=OFF \ + -D BUILD_opencv_videostab=OFF \ + -D BUILD_opencv_wechat_qrcode=ON \ + -D WITH_GSTREAMER=OFF \ + -D WITH_ADE=OFF \ + -D OPENCV_ENABLE_NONFREE=ON \ -DCMAKE_INSTALL_PREFIX=${BUILD_SOURCESDIRECTORY}/opencv_macos .. arch -x86_64 make -j8 arch -x86_64 make install @@ -185,7 +175,7 @@ stages: - script: | pwd mkdir src/build && cd $_ - arch -x86_64 cmake -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DWITH_OPENJPEG=OFF -DWITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DWITH_IPP=OFF -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -x86_64 cmake -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. arch -x86_64 make -j8 ls ls OpenCvSharpExtern From 44127b8936fffc1b4c4e610fc60c016393d86226 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 11:20:22 +0100 Subject: [PATCH 62/81] Try another host --- azure-pipelines.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bcab5a7f4..9a62098a7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,9 +14,7 @@ stages: jobs: - job: OsxArm pool: - name: 'AvaloniaMacPool' - demands: - - arch -equals arm + vmImage: 'macos-12' steps: - script: arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr From 2f93457be330ca6436ce4dd9aa2fa8a1ad755916 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 13:12:16 +0100 Subject: [PATCH 63/81] Revert changes --- azure-pipelines.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9a62098a7..0b6856d7b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,8 +14,9 @@ stages: jobs: - job: OsxArm pool: - vmImage: 'macos-12' - + name: 'AvaloniaMacPool' + demands: + - arch -equals arm steps: - script: arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr displayName: install build dependencies From 0c3341111198b924939c0e4fdfd2e00c55323b18 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 16:01:46 +0100 Subject: [PATCH 64/81] Fix paths --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0b6856d7b..23a740cf0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,7 +25,7 @@ stages: pwd arch -arm64 git clone --branch ${OPENCV_VERSION} https://github.com/opencv/opencv.git arch -arm64 git clone --branch ${OPENCV_VERSION} https://github.com/opencv/opencv_contrib.git - cd opencv-${OPENCV_VERSION} && mkdir build && cd build + cd opencv && mkdir build && cd build arch -arm64 cmake \ -D CMAKE_SYSTEM_PROCESSOR=arm64 \ -D CMAKE_OSX_ARCHITECTURES="arm64" \ @@ -123,7 +123,7 @@ stages: pwd arch -x86_64 git clone --branch ${OPENCV_VERSION} https://github.com/opencv/opencv.git arch -x86_64 git clone --branch ${OPENCV_VERSION} https://github.com/opencv/opencv_contrib.git - cd opencv-${OPENCV_VERSION} && mkdir build && cd build + cd opencv && mkdir build && cd build arch -x86_64 cmake \ -D CMAKE_SYSTEM_PROCESSOR=x86_64 \ -D CMAKE_OSX_ARCHITECTURES="x86_64" \ From 109b40198f369a1d214f057e2bdeff484d1b2494 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 16:43:23 +0100 Subject: [PATCH 65/81] Add missing deps and reinstall deps --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 23a740cf0..9a82db105 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,7 @@ stages: demands: - arch -equals arm steps: - - script: arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr + - script: arch -arm64 brew reinstall wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas displayName: install build dependencies - script: | @@ -116,7 +116,7 @@ stages: - arch -equals intel steps: - - script: arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr + - script: arch -x86_64 brew reinstall wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas displayName: install build dependencies - script: | From f6d1331f8466aa9774f0797986d0c9f381f69e78 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 19:35:34 +0100 Subject: [PATCH 66/81] Try something else --- azure-pipelines.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9a82db105..ec2cf52f7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,9 @@ stages: demands: - arch -equals arm steps: - - script: arch -arm64 brew reinstall wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas + - script: | + arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas + arch -arm64 brew link openexr displayName: install build dependencies - script: | @@ -116,7 +118,9 @@ stages: - arch -equals intel steps: - - script: arch -x86_64 brew reinstall wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas + - script: | + arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas + arch -x86_64 brew link openexr displayName: install build dependencies - script: | From 3ecb629be90f62e02f74a982adf29db1e5a6ebc1 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 20:13:22 +0100 Subject: [PATCH 67/81] Next try --- azure-pipelines.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ec2cf52f7..c60fb3eb9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,8 +19,9 @@ stages: - arch -equals arm steps: - script: | - arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas - arch -arm64 brew link openexr + arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr@3.2.1 openblas + arch -arm64 export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" + arch -arm64 export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies - script: | @@ -119,8 +120,9 @@ stages: steps: - script: | - arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas - arch -x86_64 brew link openexr + arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr@3.2.1 openblas + arch -x86_64 export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" + arch -x86_64 export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies - script: | From 8bc692dde283e882ee7dd7ffe8565e8764f59dfd Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 20:35:07 +0100 Subject: [PATCH 68/81] remove version --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c60fb3eb9..3443736df 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,7 @@ stages: - arch -equals arm steps: - script: | - arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr@3.2.1 openblas + arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas arch -arm64 export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" arch -arm64 export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies @@ -120,7 +120,7 @@ stages: steps: - script: | - arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr@3.2.1 openblas + arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas arch -x86_64 export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" arch -x86_64 export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies From b6dd1940b3d2ff1b0fe7edd1042e312cc37ceeee Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 21:35:03 +0100 Subject: [PATCH 69/81] Maybe? --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3443736df..0e71e41e8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,8 +20,8 @@ stages: steps: - script: | arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas - arch -arm64 export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" - arch -arm64 export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" + export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" + export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies - script: | @@ -121,8 +121,8 @@ stages: steps: - script: | arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas - arch -x86_64 export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" - arch -x86_64 export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" + export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" + export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies - script: | From b54c131d72f44cb9cb4772f3ccbe4064c7a50603 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 21:45:43 +0100 Subject: [PATCH 70/81] Next --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0e71e41e8..2ab2acbda 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ stages: steps: - script: | arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas - export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" + export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include" -std=c++11" export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies @@ -121,7 +121,7 @@ stages: steps: - script: | arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas - export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" + export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include" -std=c++11" export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies From e6579927f1a5e879514b4043bc6ffb7a6d79ce67 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 21:49:55 +0100 Subject: [PATCH 71/81] No idea --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2ab2acbda..7d532623e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,8 +20,8 @@ stages: steps: - script: | arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas - export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include" -std=c++11" - export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" + export CFLAGS="-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" + export LDFLAGS="-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies - script: | @@ -121,8 +121,8 @@ stages: steps: - script: | arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas - export CFLAGS=„-I/opt/homebrew/Cellar/openexr/3.2.1/include" -std=c++11" - export LDFLAGS=„-L/opt/homebrew/Cellar/openexr/3.2.1/lib" + export CFLAGS="-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" + export LDFLAGS="-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies - script: | From 116f42a9a93456eece408bc8b852b3f45c62c228 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Thu, 9 Nov 2023 09:52:24 +0100 Subject: [PATCH 72/81] Disable openEXR --- azure-pipelines.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7d532623e..5fc4094ba 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,8 +20,6 @@ stages: steps: - script: | arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas - export CFLAGS="-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" - export LDFLAGS="-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies - script: | @@ -34,6 +32,7 @@ stages: -D CMAKE_OSX_ARCHITECTURES="arm64" \ -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \ -D CMAKE_BUILD_TYPE=RELEASE \ + -D WITH_OPENEXR=OFF \ -D BUILD_SHARED_LIBS=OFF \ -D ENABLE_CXX11=ON \ -D BUILD_EXAMPLES=OFF \ @@ -121,8 +120,6 @@ stages: steps: - script: | arch -x86_64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas - export CFLAGS="-I/opt/homebrew/Cellar/openexr/3.2.1/include -std=c++11" - export LDFLAGS="-L/opt/homebrew/Cellar/openexr/3.2.1/lib" displayName: install build dependencies - script: | @@ -136,6 +133,7 @@ stages: -D CMAKE_BUILD_TYPE=Release \ -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \ -D BUILD_SHARED_LIBS=OFF \ + -D WITH_OPENEXR=OFF \ -D ENABLE_CXX11=ON \ -D BUILD_EXAMPLES=OFF \ -D BUILD_DOCS=OFF \ From 34eb6c3e1085807ad26d65345d6e49fba4e10855 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Thu, 9 Nov 2023 10:09:10 +0100 Subject: [PATCH 73/81] Try to link hombrew --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5fc4094ba..4859c4cdb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,6 +20,7 @@ stages: steps: - script: | arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas + arch -arm64 ln -s /opt/homebrew/lib/* /usr/local/lib displayName: install build dependencies - script: | From 94b344fdd9b4cf8841bfb3292889cde94b6ab690 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Thu, 9 Nov 2023 10:16:18 +0100 Subject: [PATCH 74/81] Next --- azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4859c4cdb..d3b8c0d06 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,6 @@ stages: steps: - script: | arch -arm64 brew install wget pkg-config mono-libgdiplus gtk+ ffmpeg@4 glog yasm harfbuzz jpeg libpng libtiff openjpeg metis openblas opencore-amr protobuf tbb webp openexr openblas - arch -arm64 ln -s /opt/homebrew/lib/* /usr/local/lib displayName: install build dependencies - script: | @@ -92,7 +91,7 @@ stages: chmod +x ./DylibRepack-arm mv ./DylibRepack-arm ./DylibRepack mkdir ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack - ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libpng16.16.dylib /opt/homebrew/lib/libgdiplus.dylib for f in ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack/*; do codesign --remove-signature $f; codesign -s - $f; done; displayName: Repack Dylib Dependencies From ba88ec0323e7b7808632a3fde409304911f9b2d4 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Thu, 9 Nov 2023 10:23:52 +0100 Subject: [PATCH 75/81] Disable Jpeg and Png --- azure-pipelines.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d3b8c0d06..31af62d76 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,6 +33,10 @@ stages: -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \ -D CMAKE_BUILD_TYPE=RELEASE \ -D WITH_OPENEXR=OFF \ + -D WITH_OPENJPEG=OFF \ + -D WITH_IPP=OFF \ + -D BUILD_PNG=OFF \ + -D WITH_PNG=OFF \ -D BUILD_SHARED_LIBS=OFF \ -D ENABLE_CXX11=ON \ -D BUILD_EXAMPLES=OFF \ @@ -91,7 +95,7 @@ stages: chmod +x ./DylibRepack-arm mv ./DylibRepack-arm ./DylibRepack mkdir ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack - ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libpng16.16.dylib /opt/homebrew/lib/libgdiplus.dylib + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib for f in ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack/*; do codesign --remove-signature $f; codesign -s - $f; done; displayName: Repack Dylib Dependencies @@ -133,7 +137,11 @@ stages: -D CMAKE_BUILD_TYPE=Release \ -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \ -D BUILD_SHARED_LIBS=OFF \ - -D WITH_OPENEXR=OFF \ + -D WITH_OPENEXR=OFF \ + -D WITH_OPENJPEG=OFF \ + -D WITH_IPP=OFF \ + -D BUILD_PNG=OFF \ + -D WITH_PNG=OFF \ -D ENABLE_CXX11=ON \ -D BUILD_EXAMPLES=OFF \ -D BUILD_DOCS=OFF \ From c6d8b9e016338150f1e52c2f9736612a637a0813 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Thu, 9 Nov 2023 10:32:03 +0100 Subject: [PATCH 76/81] Disable Jpeg and Png for OpenCVSharpExtern --- azure-pipelines.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 31af62d76..631899313 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -82,7 +82,14 @@ stages: - script: | pwd mkdir src/build && cd $_ - arch -arm64 cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -arm64 cmake \ + -D CMAKE_OSX_ARCHITECTURES="arm64" \ + -D CMAKE_SYSTEM_PROCESSOR=arm64 \ + -D CMAKE_BUILD_TYPE=Release \ + -D WITH_OPENJPEG=OFF \ + -D WITH_IPP=OFF \ + -D WITH_PNG=OFF \ + -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. arch -arm64 make -j8 ls ls OpenCvSharpExtern @@ -186,7 +193,14 @@ stages: - script: | pwd mkdir src/build && cd $_ - arch -x86_64 cmake -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. + arch -x86_64 cmake \ + -D CMAKE_OSX_ARCHITECTURES="x86_64" \ + -D CMAKE_SYSTEM_PROCESSOR=x86_64 \ + -D CMAKE_BUILD_TYPE=Release \ + -D WITH_OPENJPEG=OFF \ + -D WITH_IPP=OFF \ + -D WITH_PNG=OFF \ + -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. arch -x86_64 make -j8 ls ls OpenCvSharpExtern From a8b2dac24402a2626102bbd287dac2bbee879159 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Thu, 9 Nov 2023 10:43:07 +0100 Subject: [PATCH 77/81] Why not --- azure-pipelines.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 631899313..4e36c415f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,12 +32,13 @@ stages: -D CMAKE_OSX_ARCHITECTURES="arm64" \ -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \ -D CMAKE_BUILD_TYPE=RELEASE \ - -D WITH_OPENEXR=OFF \ - -D WITH_OPENJPEG=OFF \ - -D WITH_IPP=OFF \ - -D BUILD_PNG=OFF \ - -D WITH_PNG=OFF \ -D BUILD_SHARED_LIBS=OFF \ + -D WITH_OPENEXR=ON \ + -D BUILD_OPENEXR=ON \ + -D WITH_OPENJPEG=ON \ + -D BUILD_OPENJPEG=ON \ + -D WITH_PNG=ON \ + -D BUILD_PNG=ON \ -D ENABLE_CXX11=ON \ -D BUILD_EXAMPLES=OFF \ -D BUILD_DOCS=OFF \ @@ -86,9 +87,6 @@ stages: -D CMAKE_OSX_ARCHITECTURES="arm64" \ -D CMAKE_SYSTEM_PROCESSOR=arm64 \ -D CMAKE_BUILD_TYPE=Release \ - -D WITH_OPENJPEG=OFF \ - -D WITH_IPP=OFF \ - -D WITH_PNG=OFF \ -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. arch -arm64 make -j8 ls @@ -144,11 +142,12 @@ stages: -D CMAKE_BUILD_TYPE=Release \ -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \ -D BUILD_SHARED_LIBS=OFF \ - -D WITH_OPENEXR=OFF \ - -D WITH_OPENJPEG=OFF \ - -D WITH_IPP=OFF \ - -D BUILD_PNG=OFF \ - -D WITH_PNG=OFF \ + -D WITH_OPENEXR=ON \ + -D BUILD_OPENEXR=ON \ + -D WITH_OPENJPEG=ON \ + -D BUILD_OPENJPEG=ON \ + -D WITH_PNG=ON \ + -D BUILD_PNG=ON \ -D ENABLE_CXX11=ON \ -D BUILD_EXAMPLES=OFF \ -D BUILD_DOCS=OFF \ @@ -197,9 +196,6 @@ stages: -D CMAKE_OSX_ARCHITECTURES="x86_64" \ -D CMAKE_SYSTEM_PROCESSOR=x86_64 \ -D CMAKE_BUILD_TYPE=Release \ - -D WITH_OPENJPEG=OFF \ - -D WITH_IPP=OFF \ - -D WITH_PNG=OFF \ -D CMAKE_PREFIX_PATH=${BUILD_SOURCESDIRECTORY}/opencv_macos .. arch -x86_64 make -j8 ls From bffc967b56edcc0952428dfa94594bf135dbc61d Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Thu, 9 Nov 2023 10:52:24 +0100 Subject: [PATCH 78/81] Why? --- azure-pipelines.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4e36c415f..1dcd00b77 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,12 +33,12 @@ stages: -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \ -D CMAKE_BUILD_TYPE=RELEASE \ -D BUILD_SHARED_LIBS=OFF \ - -D WITH_OPENEXR=ON \ - -D BUILD_OPENEXR=ON \ - -D WITH_OPENJPEG=ON \ - -D BUILD_OPENJPEG=ON \ - -D WITH_PNG=ON \ - -D BUILD_PNG=ON \ + -D WITH_OPENEXR=ON \ + -D BUILD_OPENEXR=ON \ + -D WITH_OPENJPEG=ON \ + -D BUILD_OPENJPEG=ON \ + -D WITH_PNG=ON \ + -D BUILD_PNG=ON \ -D ENABLE_CXX11=ON \ -D BUILD_EXAMPLES=OFF \ -D BUILD_DOCS=OFF \ @@ -142,12 +142,12 @@ stages: -D CMAKE_BUILD_TYPE=Release \ -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \ -D BUILD_SHARED_LIBS=OFF \ - -D WITH_OPENEXR=ON \ - -D BUILD_OPENEXR=ON \ - -D WITH_OPENJPEG=ON \ - -D BUILD_OPENJPEG=ON \ - -D WITH_PNG=ON \ - -D BUILD_PNG=ON \ + -D WITH_OPENEXR=ON \ + -D BUILD_OPENEXR=ON \ + -D WITH_OPENJPEG=ON \ + -D BUILD_OPENJPEG=ON \ + -D WITH_PNG=ON \ + -D BUILD_PNG=ON \ -D ENABLE_CXX11=ON \ -D BUILD_EXAMPLES=OFF \ -D BUILD_DOCS=OFF \ From 91b7232d9eca794c02a376db781199d3d27b9566 Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Thu, 9 Nov 2023 10:56:11 +0100 Subject: [PATCH 79/81] Remove whitespaces --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1dcd00b77..227f7161a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,7 +36,7 @@ stages: -D WITH_OPENEXR=ON \ -D BUILD_OPENEXR=ON \ -D WITH_OPENJPEG=ON \ - -D BUILD_OPENJPEG=ON \ + -D BUILD_OPENJPEG=ON \ -D WITH_PNG=ON \ -D BUILD_PNG=ON \ -D ENABLE_CXX11=ON \ @@ -145,7 +145,7 @@ stages: -D WITH_OPENEXR=ON \ -D BUILD_OPENEXR=ON \ -D WITH_OPENJPEG=ON \ - -D BUILD_OPENJPEG=ON \ + -D BUILD_OPENJPEG=ON \ -D WITH_PNG=ON \ -D BUILD_PNG=ON \ -D ENABLE_CXX11=ON \ From 13b547875fe15c50340296f834044c38fa005694 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 10 Nov 2023 11:57:39 +0000 Subject: [PATCH 80/81] Update azure-pipelines.yml --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 227f7161a..58f9cefc7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -100,7 +100,7 @@ stages: chmod +x ./DylibRepack-arm mv ./DylibRepack-arm ./DylibRepack mkdir ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack - ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib /opt/homebrew/lib/libpng.dylib for f in ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack/*; do codesign --remove-signature $f; codesign -s - $f; done; displayName: Repack Dylib Dependencies @@ -209,7 +209,7 @@ stages: chmod +x ./DylibRepack-intel mv ./DylibRepack-intel ./DylibRepack mkdir ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack - ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack ${BUILD_SOURCESDIRECTORY}/nuget/intel/libOpenCvSharpExtern.dylib /usr/local/lib/libgdiplus.dylib + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack ${BUILD_SOURCESDIRECTORY}/nuget/intel/libOpenCvSharpExtern.dylib /usr/local/lib/libgdiplus.dylib /usr/local/lib/libpng.dylib for f in ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack/*; do codesign --remove-signature $f; codesign -s - $f; done; displayName: Repack Dylib Dependencies From e2f7b8e44889dd5a028f474df2a0cd223bf4869e Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 10 Nov 2023 13:08:51 +0000 Subject: [PATCH 81/81] fix build. --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 58f9cefc7..17f6936f9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -96,11 +96,11 @@ stages: displayName: 'Build OpenCVSharpExtern' - script: | - wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.2/DylibRepack-arm + wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.3/DylibRepack-arm chmod +x ./DylibRepack-arm mv ./DylibRepack-arm ./DylibRepack mkdir ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack - ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib /opt/homebrew/lib/libpng.dylib + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack ${BUILD_SOURCESDIRECTORY}/nuget/arm/libOpenCvSharpExtern.dylib /opt/homebrew/lib/libgdiplus.dylib for f in ${BUILD_SOURCESDIRECTORY}/nuget/arm/repack/*; do codesign --remove-signature $f; codesign -s - $f; done; displayName: Repack Dylib Dependencies @@ -205,11 +205,11 @@ stages: displayName: 'Build OpenCVSharpExtern' - script: | - wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.2/DylibRepack-intel + wget --no-check-certificate https://github.com/kekekeks/DylibRepack/releases/download/v0.0.3/DylibRepack-intel chmod +x ./DylibRepack-intel mv ./DylibRepack-intel ./DylibRepack mkdir ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack - ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack ${BUILD_SOURCESDIRECTORY}/nuget/intel/libOpenCvSharpExtern.dylib /usr/local/lib/libgdiplus.dylib /usr/local/lib/libpng.dylib + ./DylibRepack repack -o ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack ${BUILD_SOURCESDIRECTORY}/nuget/intel/libOpenCvSharpExtern.dylib /usr/local/lib/libgdiplus.dylib for f in ${BUILD_SOURCESDIRECTORY}/nuget/intel/repack/*; do codesign --remove-signature $f; codesign -s - $f; done; displayName: Repack Dylib Dependencies