From 880f4a554062561eb16e3362ad7b73c689f079ab Mon Sep 17 00:00:00 2001 From: Benedikt Stebner Date: Wed, 8 Nov 2023 09:24:40 +0100 Subject: [PATCH 01/21] 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 02/21] 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 03/21] 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 04/21] 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 05/21] 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 06/21] 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 07/21] 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 08/21] 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 09/21] 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 10/21] 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 11/21] 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 12/21] 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 13/21] 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 14/21] 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 15/21] 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 16/21] 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 17/21] 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 18/21] 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 19/21] 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 20/21] 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 21/21] 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