diff --git a/.github/workflows/docker-static-opencv.yml b/.github/workflows/docker-static-opencv.yml index 6a6f7f38..3ac61f22 100644 --- a/.github/workflows/docker-static-opencv.yml +++ b/.github/workflows/docker-static-opencv.yml @@ -29,8 +29,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - gocv/opencv:4.11.0-alpine-ffmpeg-gstreamer - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-alpine-ffmpeg-gstreamer + gocv/opencv:4.12.0-alpine-ffmpeg-gstreamer + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-alpine-ffmpeg-gstreamer tags: | type=sha,format=long type=raw,value=latest @@ -53,8 +53,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.11.0-alpine-ffmpeg-gstreamer - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-alpine-ffmpeg-gstreamer + gocv/opencv:4.12.0-alpine-ffmpeg-gstreamer + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-alpine-ffmpeg-gstreamer labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cfb91e3d..1d6da67b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -52,7 +52,7 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3 with: - image: tonistiigi/binfmt:qemu-v7.0.0-28 + image: tonistiigi/binfmt:latest - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Check out the repo @@ -62,8 +62,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - gocv/opencv:4.11.0 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0 + gocv/opencv:4.12.0 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0 tags: | type=sha,format=long type=raw,value=latest @@ -87,9 +87,9 @@ jobs: push: true tags: | gocv/opencv:latest - gocv/opencv:4.11.0 + gocv/opencv:4.12.0 ghcr.io/${{ github.repository_owner }}/opencv:latest - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -136,7 +136,7 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3 with: - image: tonistiigi/binfmt:qemu-v7.0.0-28 + image: tonistiigi/binfmt:latest - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Check out the repo @@ -146,8 +146,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - gocv/opencv:4.11.0-static - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-static + gocv/opencv:4.12.0-static + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-static tags: | type=sha,format=long type=raw,value=latest @@ -170,8 +170,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.11.0-static - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-static + gocv/opencv:4.12.0-static + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-static labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -224,8 +224,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - gocv/opencv:4.11.0-gpu-cuda-11 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-gpu-cuda-11 + gocv/opencv:4.12.0-gpu-cuda-11 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-gpu-cuda-11 tags: | type=sha,format=long type=raw,value=latest @@ -248,8 +248,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.11.0-gpu-cuda-11 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-gpu-cuda-11 + gocv/opencv:4.12.0-gpu-cuda-11 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-gpu-cuda-11 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -302,8 +302,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - gocv/opencv:4.11.0-gpu-cuda-11.2.2 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-gpu-cuda-11.2.2 + gocv/opencv:4.12.0-gpu-cuda-11.2.2 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-gpu-cuda-11.2.2 tags: | type=sha,format=long type=raw,value=latest @@ -326,8 +326,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.11.0-gpu-cuda-11.2.2 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-gpu-cuda-11.2.2 + gocv/opencv:4.12.0-gpu-cuda-11.2.2 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-gpu-cuda-11.2.2 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -380,8 +380,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - gocv/opencv:4.11.0-gpu-cuda-12 - ghcr.io/${{ github.repository_owner }}/opemcv:4.11.0-gpu-cuda-12 + gocv/opencv:4.12.0-gpu-cuda-12 + ghcr.io/${{ github.repository_owner }}/opemcv:4.12.0-gpu-cuda-12 tags: | type=sha,format=long type=raw,value=latest @@ -404,8 +404,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.11.0-gpu-cuda-12 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-gpu-cuda-12 + gocv/opencv:4.12.0-gpu-cuda-12 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-gpu-cuda-12 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -426,8 +426,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - gocv/opencv:4.11.0-ubuntu-18.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-18.04 + gocv/opencv:4.12.0-ubuntu-18.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-18.04 tags: | type=sha,format=long type=raw,value=latest @@ -450,8 +450,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.11.0-ubuntu-18.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-18.04 + gocv/opencv:4.12.0-ubuntu-18.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-18.04 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -472,8 +472,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - gocv/opencv:4.11.0-ubuntu-20.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-20.04 + gocv/opencv:4.12.0-ubuntu-20.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-20.04 tags: | type=sha,format=long type=raw,value=latest @@ -496,8 +496,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.11.0-ubuntu-20.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-20.04 + gocv/opencv:4.12.0-ubuntu-20.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-20.04 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -518,8 +518,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - gocv/opencv:4.11.0-ubuntu-22.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-22.04 + gocv/opencv:4.12.0-ubuntu-22.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-22.04 tags: | type=sha,format=long type=raw,value=latest @@ -542,8 +542,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.11.0-ubuntu-22.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-22.04 + gocv/opencv:4.12.0-ubuntu-22.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-22.04 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -564,8 +564,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - gocv/opencv:4.11.0-ubuntu-24.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-24.04 + gocv/opencv:4.12.0-ubuntu-24.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-24.04 tags: | type=sha,format=long type=raw,value=latest @@ -588,8 +588,8 @@ jobs: context: . push: true tags: | - gocv/opencv:4.11.0-ubuntu-24.04 - ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-24.04 + gocv/opencv:4.12.0-ubuntu-24.04 + ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-24.04 labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 54b24044..f9aca1c2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -9,7 +9,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: ghcr.io/hybridgroup/opencv:4.11.0 + container: ghcr.io/hybridgroup/opencv:4.12.0 steps: - name: Checkout diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a93097a7..b3c60744 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -24,7 +24,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.23' + go-version: '1.24' cache: true - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0d29f38c..787f41e2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,45 +20,45 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.24' cache: true - name: Restore cached OpenCV source uses: actions/cache/restore@v4 id: cache-opencv-source with: - key: opencv-source-4110-windows-v1a + key: opencv-source-4120-windows-v1a path: | - ./opencv/opencv-4.11.0 - ./opencv/opencv_contrib-4.11.0 + ./opencv/opencv-4.12.0 + ./opencv/opencv_contrib-4.12.0 - name: Download OpenCV source if: steps.cache-opencv-source.outputs.cache-hit != 'true' shell: bash run: | mkdir -p ./opencv - curl -Lo ./opencv/opencv-4.11.0.zip https://github.com/opencv/opencv/archive/4.11.0.zip - curl -Lo ./opencv/opencv_contrib-4.11.0.zip https://github.com/opencv/opencv_contrib/archive/4.11.0.zip + curl -Lo ./opencv/opencv-4.12.0.zip https://github.com/opencv/opencv/archive/4.12.0.zip + curl -Lo ./opencv/opencv_contrib-4.12.0.zip https://github.com/opencv/opencv_contrib/archive/4.12.0.zip - name: Extract OpenCV source if: steps.cache-opencv-source.outputs.cache-hit != 'true' shell: bash run: | cd ./opencv - mkdir -p opencv-4.11.0 - mkdir -p opencv_contrib-4.11.0 - 7z x opencv-4.11.0.zip - 7z x opencv_contrib-4.11.0.zip + mkdir -p opencv-4.12.0 + mkdir -p opencv_contrib-4.12.0 + 7z x opencv-4.12.0.zip + 7z x opencv_contrib-4.12.0.zip - name: Save cached OpenCV source uses: actions/cache/save@v4 if: steps.cache-opencv-source.outputs.cache-hit != 'true' with: key: ${{ steps.cache-opencv-source.outputs.cache-primary-key }} path: | - ./opencv/opencv-4.11.0 - ./opencv/opencv_contrib-4.11.0 + ./opencv/opencv-4.12.0 + ./opencv/opencv_contrib-4.12.0 - name: Restore cached OpenCV build uses: actions/cache/restore@v4 id: cache-opencv-build with: - key: opencv-build-4110-windows-v1d + key: opencv-build-4120-windows-v1d path: | ./opencv/build - name: Build OpenCV @@ -66,7 +66,7 @@ jobs: run: | mkdir -p ./opencv/build cd ./opencv/build - cmake -G "MinGW Makefiles" -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH="../opencv_contrib-4.11.0/modules" -DBUILD_SHARED_LIBS=ON -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -DOPENCV_ENABLE_NONFREE=ON -Wno-dev ../opencv-4.11.0 + cmake -G "MinGW Makefiles" -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH="../opencv_contrib-4.12.0/modules" -DBUILD_SHARED_LIBS=ON -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -DOPENCV_ENABLE_NONFREE=ON -Wno-dev ../opencv-4.12.0 cmake --build . --target install - name: Save cached OpenCV build uses: actions/cache/save@v4 @@ -78,9 +78,9 @@ jobs: - name: Set GoCV env run: | go env - echo "CGO_CXXFLAGS=--std=c++11" >> $env:GITHUB_ENV + echo "CGO_CXXFLAGS=--std=c++11 -DNDEBUG" >> $env:GITHUB_ENV echo "CGO_CPPFLAGS=-I${env:GITHUB_WORKSPACE}\opencv\build\install\include" >> $env:GITHUB_ENV - echo "CGO_LDFLAGS=-L${env:GITHUB_WORKSPACE}\opencv\build\install\x64\mingw\lib -lopencv_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_photo4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 -lopencv_xphoto4110 -lopencv_xobjdetect4110" >> $env:GITHUB_ENV + echo "CGO_LDFLAGS=-L${env:GITHUB_WORKSPACE}\opencv\build\install\x64\mingw\lib -lopencv_core4120 -lopencv_face4120 -lopencv_videoio4120 -lopencv_imgproc4120 -lopencv_highgui4120 -lopencv_imgcodecs4120 -lopencv_objdetect4120 -lopencv_features2d4120 -lopencv_video4120 -lopencv_dnn4120 -lopencv_xfeatures2d4120 -lopencv_plot4120 -lopencv_tracking4120 -lopencv_img_hash4120 -lopencv_calib3d4120 -lopencv_bgsegm4120 -lopencv_photo4120 -lopencv_aruco4120 -lopencv_wechat_qrcode4120 -lopencv_ximgproc4120 -lopencv_xphoto4120 -lopencv_xobjdetect4120" >> $env:GITHUB_ENV echo "${env:GITHUB_WORKSPACE}/opencv/build/install/x64/mingw/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Install Tensorflow test model run: | diff --git a/Dockerfile b/Dockerfile index 8521f44b..94765cc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # to build this docker image: # docker build . -FROM ghcr.io/hybridgroup/opencv:4.11.0 +FROM ghcr.io/hybridgroup/opencv:4.12.0 ENV GOPATH /go diff --git a/Dockerfile-static b/Dockerfile-static index 27321f02..168b3a1c 100755 --- a/Dockerfile-static +++ b/Dockerfile-static @@ -1,7 +1,7 @@ # to build this docker image: # docker buildx build -f Dockerfile-static -t gocv-static --platform=linux/amd64,linux/arm64 . # -FROM --platform=$BUILDPLATFORM ghcr.io/hybridgroup/opencv:4.11.0-static AS gocv-build +FROM --platform=$BUILDPLATFORM ghcr.io/hybridgroup/opencv:4.12.0-static AS gocv-build ENV GOPATH /go diff --git a/Dockerfile-static-builder b/Dockerfile-static-builder index d56d1279..089d9647 100755 --- a/Dockerfile-static-builder +++ b/Dockerfile-static-builder @@ -9,7 +9,7 @@ # # NOTE that you cannot use highgui from the static build! # -FROM --platform=$BUILDPLATFORM ghcr.io/hybridgroup/opencv:4.11.0-static AS gocv-static-builder +FROM --platform=$BUILDPLATFORM ghcr.io/hybridgroup/opencv:4.12.0-static AS gocv-static-builder WORKDIR /src diff --git a/Dockerfile-test b/Dockerfile-test index 6f139af3..f3d73b5b 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -6,7 +6,7 @@ # docker run -it --rm -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix gocv-test-4.x # xhost - # -FROM ghcr.io/hybridgroup/opencv:4.11.0 AS gocv-test-4.11 +FROM ghcr.io/hybridgroup/opencv:4.12.0 AS gocv-test-4.11 ENV GOPATH /go diff --git a/Dockerfile-test.gpu-cuda-10 b/Dockerfile-test.gpu-cuda-10 index 969f0965..85bc4fee 100644 --- a/Dockerfile-test.gpu-cuda-10 +++ b/Dockerfile-test.gpu-cuda-10 @@ -4,7 +4,7 @@ # To run tests: # docker run -it --rm --gpus all gocv-test-gpu-cuda-10 # -FROM ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-10 AS gocv-gpu-test-cuda-10 +FROM ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-10 AS gocv-gpu-test-cuda-10 ENV GOPATH /go ENV PATH="${PATH}:/go/bin" diff --git a/Dockerfile-test.gpu-cuda-11 b/Dockerfile-test.gpu-cuda-11 index 2624e64a..060100e2 100644 --- a/Dockerfile-test.gpu-cuda-11 +++ b/Dockerfile-test.gpu-cuda-11 @@ -4,7 +4,7 @@ # To run tests: # docker run -it --rm --gpus all gocv-test-gpu-cuda-11 # -FROM ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-11 AS gocv-gpu-test-cuda-11 +FROM ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-11 AS gocv-gpu-test-cuda-11 ENV GOPATH /go ENV PATH="${PATH}:/go/bin" diff --git a/Dockerfile-test.gpu-cuda-11.2.2 b/Dockerfile-test.gpu-cuda-11.2.2 index 9745e303..44cd857a 100644 --- a/Dockerfile-test.gpu-cuda-11.2.2 +++ b/Dockerfile-test.gpu-cuda-11.2.2 @@ -4,7 +4,7 @@ # To run tests: # docker run -it --rm --gpus all gocv-test-gpu-cuda-11.2.2 # -FROM ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-11.2.2 AS gocv-gpu-test-cuda-11 +FROM ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-11.2.2 AS gocv-gpu-test-cuda-11 ENV GOPATH /go ENV PATH="${PATH}:/go/bin" diff --git a/Dockerfile-test.gpu-cuda-12 b/Dockerfile-test.gpu-cuda-12 index 59e6a9fc..5a0c6119 100644 --- a/Dockerfile-test.gpu-cuda-12 +++ b/Dockerfile-test.gpu-cuda-12 @@ -4,7 +4,7 @@ # To run tests: # docker run -it --rm --gpus all gocv-test-gpu-cuda-12 # -FROM ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-12 AS gocv-gpu-test-cuda-12 +FROM ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-12 AS gocv-gpu-test-cuda-12 ENV GOPATH /go ENV PATH="${PATH}:/go/bin" diff --git a/Dockerfile.gpu b/Dockerfile.gpu index c9a6e21e..bfce926b 100644 --- a/Dockerfile.gpu +++ b/Dockerfile.gpu @@ -1,6 +1,6 @@ # to build this docker image: # docker build -f Dockerfile.gpu . -FROM ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-11 AS gocv-gpu +FROM ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-11 AS gocv-gpu ENV GOPATH /go diff --git a/Dockerfile.opencv b/Dockerfile.opencv index 069cb1f6..bc74f9e7 100644 --- a/Dockerfile.opencv +++ b/Dockerfile.opencv @@ -1,17 +1,17 @@ # OpenCV 4 prebuilt multiarchitecture image # # To build release: -# docker buildx build -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.11.0 -t ghcr.io/hybridgroup/opencv:latest --platform=linux/arm64,linux/amd64 --push . +# docker buildx build -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.12.0 -t ghcr.io/hybridgroup/opencv:latest --platform=linux/arm64,linux/amd64 --push . # # To build prerelease: -# docker buildx build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.11.0-dev --platform=linux/arm64,linux/amd64 --push . +# docker buildx build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv -t ghcr.io/hybridgroup/opencv:4.12.0-dev --platform=linux/arm64,linux/amd64 --push . ################### # amd64 build stage ################### -FROM --platform=linux/amd64 golang:1.23-bullseye AS opencv-base-amd64 +FROM --platform=linux/amd64 golang:1.24-bullseye AS opencv-base-amd64 LABEL maintainer="hybridgroup" RUN apt-get update && apt-get install -y \ @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y \ FROM --platform=linux/amd64 opencv-base-amd64 AS opencv-build-amd64 -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -63,7 +63,7 @@ RUN cd opencv-${OPENCV_VERSION} && \ -D BUILD_opencv_python2=NO \ -D BUILD_opencv_python3=NO \ -D OPENCV_GENERATE_PKGCONFIG=ON .. && \ - make -j $(nproc --all) && \ + make -j $(( $(nproc) - 1 )) && \ make preinstall && make install && ldconfig && \ cd / && rm -rf opencv* @@ -72,7 +72,7 @@ RUN cd opencv-${OPENCV_VERSION} && \ # arm64 build stage ################### -FROM --platform=linux/arm64 golang:1.23-bullseye AS opencv-base-arm64 +FROM --platform=linux/arm64 golang:1.24-bullseye AS opencv-base-arm64 LABEL maintainer="hybridgroup" RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -85,7 +85,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ FROM --platform=linux/arm64 opencv-base-arm64 AS opencv-build-arm64 -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -129,7 +129,7 @@ RUN cd opencv-${OPENCV_VERSION} && \ -D BUILD_opencv_python3=NO \ -D OPENCV_GENERATE_PKGCONFIG=ON \ -D CMAKE_TOOLCHAIN_FILE=../platforms/linux/aarch64-gnu.toolchain.cmake .. && \ - make -j $(nproc --all) && \ + make -j $(( $(nproc) - 1 )) && \ make preinstall && make install && ldconfig && \ cd / && rm -rf opencv* diff --git a/Dockerfile.opencv-gpu-cuda-10 b/Dockerfile.opencv-gpu-cuda-10 index f86fb61a..b25a4c6a 100644 --- a/Dockerfile.opencv-gpu-cuda-10 +++ b/Dockerfile.opencv-gpu-cuda-10 @@ -1,5 +1,5 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-gpu-cuda-10 -t ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-10 . +# docker build -f Dockerfile.opencv-gpu-cuda-10 -t ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-10 . FROM nvidia/cuda:10.2-cudnn8-devel AS opencv-gpu-base LABEL maintainer="hybridgroup" @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip && \ @@ -59,7 +59,7 @@ RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSIO # install golang here FROM opencv-gpu-base AS opencv-gpu-golang -ENV GO_RELEASE=1.23.4 +ENV GO_RELEASE=1.24.4 RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \ tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \ rm go${GO_RELEASE}.linux-amd64.tar.gz diff --git a/Dockerfile.opencv-gpu-cuda-11 b/Dockerfile.opencv-gpu-cuda-11 index d91d7185..edf9eb88 100644 --- a/Dockerfile.opencv-gpu-cuda-11 +++ b/Dockerfile.opencv-gpu-cuda-11 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-11 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-11.2.2 -t ghcr.io/hybridgroup/opencv:4.11.0-dev-gpu-cuda-11 . +# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-11 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-11.2.2 -t ghcr.io/hybridgroup/opencv:4.12.0-dev-gpu-cuda-11 . FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 AS opencv-gpu-cuda-11-base LABEL maintainer="hybridgroup" ENV DEBIAN_FRONTEND=noninteractive @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -67,7 +67,7 @@ RUN curl -Lo opencv.zip ${OPENCV_FILE} && \ # install golang here FROM opencv-gpu-cuda-11-base AS opencv-gpu-cuda-11-golang -ENV GO_RELEASE=1.23.4 +ENV GO_RELEASE=1.24.4 RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \ tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \ rm go${GO_RELEASE}.linux-amd64.tar.gz diff --git a/Dockerfile.opencv-gpu-cuda-11.2.2 b/Dockerfile.opencv-gpu-cuda-11.2.2 index de604b7e..560a5a56 100644 --- a/Dockerfile.opencv-gpu-cuda-11.2.2 +++ b/Dockerfile.opencv-gpu-cuda-11.2.2 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-11.2.2 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-11.2.2 -t ghcr.io/hybridgroup/opencv:4.11.0-dev-gpu-cuda-11.2.2 . +# docker build -f Dockerfile.opencv-gpu-cuda-11 -t ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-11.2.2 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-11.2.2 -t ghcr.io/hybridgroup/opencv:4.12.0-dev-gpu-cuda-11.2.2 . FROM nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 AS opencv-gpu-cuda-11-base LABEL maintainer="hybridgroup" ENV DEBIAN_FRONTEND=noninteractive @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -67,7 +67,7 @@ RUN curl -Lo opencv.zip ${OPENCV_FILE} && \ # install golang here FROM opencv-gpu-cuda-11-base AS opencv-gpu-cuda-11-golang -ENV GO_RELEASE=1.23.4 +ENV GO_RELEASE=1.24.4 RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \ tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \ rm go${GO_RELEASE}.linux-amd64.tar.gz diff --git a/Dockerfile.opencv-gpu-cuda-12 b/Dockerfile.opencv-gpu-cuda-12 index fa7b130b..edb2075d 100644 --- a/Dockerfile.opencv-gpu-cuda-12 +++ b/Dockerfile.opencv-gpu-cuda-12 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-gpu-cuda-12 -t ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-12 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-12 -t ghcr.io/hybridgroup/opencv:4.11.0-dev-gpu-cuda-12 . +# docker build -f Dockerfile.opencv-gpu-cuda-12 -t ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-12 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-gpu-cuda-12 -t ghcr.io/hybridgroup/opencv:4.12.0-dev-gpu-cuda-12 . FROM nvidia/cuda:12.6.1-cudnn-devel-ubuntu22.04 AS opencv-gpu-cuda-12-base LABEL maintainer="hybridgroup" ENV DEBIAN_FRONTEND=noninteractive @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -67,7 +67,7 @@ RUN curl -Lo opencv.zip ${OPENCV_FILE} && \ # install golang here FROM opencv-gpu-cuda-12-base AS opencv-gpu-cuda-12-golang -ENV GO_RELEASE=1.23.4 +ENV GO_RELEASE=1.24.4 RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \ tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \ rm go${GO_RELEASE}.linux-amd64.tar.gz diff --git a/Dockerfile.opencv-openvino b/Dockerfile.opencv-openvino index cd86cc96..4b6972a4 100644 --- a/Dockerfile.opencv-openvino +++ b/Dockerfile.opencv-openvino @@ -1,5 +1,5 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-openvino -t ghcr.io/hybridgroup/opencv:4.11.0-openvino +# docker build -f Dockerfile.opencv-openvino -t ghcr.io/hybridgroup/opencv:4.12.0-openvino FROM openvino/ubuntu20_dev:2022.1.0 AS opencv-openvino-base LABEL maintainer="hybridgroup" ENV DEBIAN_FRONTEND=noninteractive @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip && \ @@ -48,7 +48,7 @@ RUN curl -Lo opencv.zip https://github.com/opencv/opencv/archive/${OPENCV_VERSIO # install golang here FROM opencv-openvino-base AS opencv-openvino-golang -ENV GO_RELEASE=1.23.4 +ENV GO_RELEASE=1.24.4 RUN wget https://dl.google.com/go/go${GO_RELEASE}.linux-amd64.tar.gz && \ tar xfv go${GO_RELEASE}.linux-amd64.tar.gz -C /usr/local && \ rm go${GO_RELEASE}.linux-amd64.tar.gz diff --git a/Dockerfile.opencv-static b/Dockerfile.opencv-static index 91c7cc95..af48eac5 100644 --- a/Dockerfile.opencv-static +++ b/Dockerfile.opencv-static @@ -1,17 +1,17 @@ # OpenCV 4 prebuilt multiarchitecture image # # To build release: -# docker buildx build -f Dockerfile.opencv-static -t ghcr.io/hybridgroup/opencv:4.11.0-static --platform=linux/arm64,linux/amd64 --push . +# docker buildx build -f Dockerfile.opencv-static -t ghcr.io/hybridgroup/opencv:4.12.0-static --platform=linux/arm64,linux/amd64 --push . # # To build prerelease: -# docker buildx build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-static -t ghcr.io/hybridgroup/opencv:4.11.0-static-dev --platform=linux/arm64,linux/amd64 --push . +# docker buildx build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-static -t ghcr.io/hybridgroup/opencv:4.12.0-static-dev --platform=linux/arm64,linux/amd64 --push . ################### # amd64 build stage ################### -FROM --platform=linux/amd64 golang:1.22-bullseye AS opencv-base-amd64 +FROM --platform=linux/amd64 golang:1.24-bullseye AS opencv-base-amd64 LABEL maintainer="hybridgroup" RUN apt-get update && apt-get -y install \ autoconf automake libass-dev libgnutls28-dev \ @@ -26,10 +26,10 @@ RUN apt-get update && apt-get -y install \ nasm && \ rm -rf /var/lib/apt/lists/* -RUN wget -O ffmpeg-5.0.tar.bz2 "https://www.ffmpeg.org/releases/ffmpeg-5.0.3.tar.bz2" && \ +RUN wget -O ffmpeg-5.0.tar.bz2 "https://www.ffmpeg.org/releases/ffmpeg-5.1.6.tar.bz2" && \ tar -xf ffmpeg-5.0.tar.bz2 -RUN cd ffmpeg-5.0.3 && \ +RUN cd ffmpeg-5.1.6 && \ ./configure --pkg-config-flags="--static" \ --enable-static --disable-shared --enable-gpl --enable-libx264 --enable-libvpx --enable-zlib \ --disable-sdl2 --disable-vaapi --disable-vdpau --disable-v4l2-m2m --disable-doc && \ @@ -37,7 +37,7 @@ RUN cd ffmpeg-5.0.3 && \ FROM --platform=linux/amd64 opencv-base-amd64 AS opencv-build-amd64 -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -92,7 +92,7 @@ RUN cd opencv-${OPENCV_VERSION} && \ -D BUILD_opencv_python2=NO \ -D BUILD_opencv_python3=NO \ -D OPENCV_GENERATE_PKGCONFIG=ON .. && \ - make -j $(nproc --all) && \ + make -j $(( $(nproc) - 1 )) && \ make preinstall && make install && ldconfig && \ cd / && rm -rf opencv* @@ -100,7 +100,7 @@ RUN cd opencv-${OPENCV_VERSION} && \ # arm64 build stage ################### -FROM --platform=linux/arm64 golang:1.22-bullseye AS opencv-base-arm64 +FROM --platform=linux/arm64 golang:1.24-bullseye AS opencv-base-arm64 LABEL maintainer="hybridgroup" RUN apt-get update && apt-get -y install \ autoconf automake libass-dev libgnutls28-dev \ @@ -115,10 +115,10 @@ RUN apt-get update && apt-get -y install \ nasm && \ rm -rf /var/lib/apt/lists/* -RUN wget -O ffmpeg-5.0.tar.bz2 "https://www.ffmpeg.org/releases/ffmpeg-5.0.3.tar.bz2" && \ +RUN wget -O ffmpeg-5.0.tar.bz2 "https://www.ffmpeg.org/releases/ffmpeg-5.1.6.tar.bz2" && \ tar -xf ffmpeg-5.0.tar.bz2 -RUN cd ffmpeg-5.0.3 && \ +RUN cd ffmpeg-5.1.6 && \ ./configure --pkg-config-flags="--static" \ --enable-static --disable-shared --enable-gpl --enable-libx264 --enable-libvpx --enable-zlib \ --disable-sdl2 --disable-vaapi --disable-vdpau --disable-v4l2-m2m --disable-doc && \ @@ -126,7 +126,7 @@ RUN cd ffmpeg-5.0.3 && \ FROM --platform=linux/arm64 opencv-base-arm64 AS opencv-build-arm64 -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" @@ -180,7 +180,7 @@ RUN cd opencv-${OPENCV_VERSION} && \ -D BUILD_opencv_python2=NO \ -D BUILD_opencv_python3=NO \ -D OPENCV_GENERATE_PKGCONFIG=ON .. && \ - make -j $(nproc --all) && \ + make -j $(( $(nproc) - 1 )) && \ make preinstall && make install && ldconfig && \ cd / && rm -rf opencv* diff --git a/Dockerfile.opencv-static-alpine b/Dockerfile.opencv-static-alpine index 1ee9e95e..35062fb7 100644 --- a/Dockerfile.opencv-static-alpine +++ b/Dockerfile.opencv-static-alpine @@ -11,7 +11,7 @@ FROM --platform=linux/amd64 ghcr.io/hybridgroup/gstreamer:1.24-alpine AS gstream FROM --platform=linux/amd64 ghcr.io/hybridgroup/ffmpeg:5.16-alpine AS builder-amd64 # Set OpenCV version -ARG OPENCV_VERSION=4.11.0 +ARG OPENCV_VERSION=4.12.0 # Download OpenCV source code WORKDIR /opencv @@ -109,7 +109,7 @@ FROM --platform=linux/arm64 ghcr.io/hybridgroup/gstreamer:1.24-alpine AS gstream FROM --platform=linux/arm64 ghcr.io/hybridgroup/ffmpeg:5.16-alpine AS builder-arm64 # Set OpenCV version -ARG OPENCV_VERSION=4.11.0 +ARG OPENCV_VERSION=4.12.0 # Download OpenCV source code WORKDIR /opencv diff --git a/Dockerfile.opencv-static-alpine-ffmpeg b/Dockerfile.opencv-static-alpine-ffmpeg index a8f5a107..ba25cdaf 100644 --- a/Dockerfile.opencv-static-alpine-ffmpeg +++ b/Dockerfile.opencv-static-alpine-ffmpeg @@ -9,7 +9,7 @@ FROM --platform=linux/amd64 ghcr.io/hybridgroup/ffmpeg:5.16-alpine AS builder-amd64 # Set OpenCV version -ARG OPENCV_VERSION=4.10.0 +ARG OPENCV_VERSION=4.12.0 # Download OpenCV source code WORKDIR /opencv @@ -93,7 +93,7 @@ RUN cmake -D CMAKE_BUILD_TYPE=Release \ FROM --platform=linux/arm64 ghcr.io/hybridgroup/ffmpeg:5.16-alpine AS builder-arm64 # Set OpenCV version -ARG OPENCV_VERSION=4.10.0 +ARG OPENCV_VERSION=4.12.0 # Download OpenCV source code WORKDIR /opencv diff --git a/Dockerfile.opencv-ubuntu-18.04 b/Dockerfile.opencv-ubuntu-18.04 index 1e938fe8..e5cfb29f 100644 --- a/Dockerfile.opencv-ubuntu-18.04 +++ b/Dockerfile.opencv-ubuntu-18.04 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.11.0-ubuntu-18.04 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.11.0-dev-ubuntu-18.04 . +# docker build -f Dockerfile.opencv-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.12.0-ubuntu-18.04 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-18.04 -t ghcr.io/hybridgroup/opencv:4.12.0-dev-ubuntu-18.04 . FROM ubuntu:18.04 AS opencv-base LABEL maintainer="hybridgroup" @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" diff --git a/Dockerfile.opencv-ubuntu-20.04 b/Dockerfile.opencv-ubuntu-20.04 index ab7e5e84..c3a2d6c2 100644 --- a/Dockerfile.opencv-ubuntu-20.04 +++ b/Dockerfile.opencv-ubuntu-20.04 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.11.0-ubuntu-20.04 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.11.0-dev-ubuntu-20.04 . +# docker build -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.12.0-ubuntu-20.04 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.12.0-dev-ubuntu-20.04 . FROM ubuntu:20.04 AS opencv-base LABEL maintainer="hybridgroup" @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-22-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" diff --git a/Dockerfile.opencv-ubuntu-22.04 b/Dockerfile.opencv-ubuntu-22.04 index 8ceccf60..ae91476f 100644 --- a/Dockerfile.opencv-ubuntu-22.04 +++ b/Dockerfile.opencv-ubuntu-22.04 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-ubuntu-22.04 -t ghcr.io/hybridgroup/opencv:4.11.0-ubuntu-22.04 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.11.0-dev-ubuntu-20.04 . +# docker build -f Dockerfile.opencv-ubuntu-22.04 -t ghcr.io/hybridgroup/opencv:4.12.0-ubuntu-22.04 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.12.0-dev-ubuntu-20.04 . FROM ubuntu:22.04 AS opencv-base LABEL maintainer="hybridgroup" @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" diff --git a/Dockerfile.opencv-ubuntu-24.04 b/Dockerfile.opencv-ubuntu-24.04 index c8661fe2..b04af48e 100644 --- a/Dockerfile.opencv-ubuntu-24.04 +++ b/Dockerfile.opencv-ubuntu-24.04 @@ -1,6 +1,6 @@ # to build this docker image: -# docker build -f Dockerfile.opencv-ubuntu-24.04 -t ghcr.io/hybridgroup/opencv:4.11.0-ubuntu-24.04 . -# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.11.0-dev-ubuntu-20.04 . +# docker build -f Dockerfile.opencv-ubuntu-24.04 -t ghcr.io/hybridgroup/opencv:4.12.0-ubuntu-24.04 . +# docker build --build-arg OPENCV_VERSION="4.x" --build-arg OPENCV_FILE="https://github.com/opencv/opencv/archive/refs/heads/4.x.zip" --build-arg OPENCV_CONTRIB_FILE="https://github.com/opencv/opencv_contrib/archive/refs/heads/4.x.zip" -f Dockerfile.opencv-ubuntu-20.04 -t ghcr.io/hybridgroup/opencv:4.12.0-dev-ubuntu-20.04 . FROM ubuntu:24.04 AS opencv-base LABEL maintainer="hybridgroup" @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-turbo8-dev libpng-dev libtiff-dev libdc1394-dev nasm && \ rm -rf /var/lib/apt/lists/* -ARG OPENCV_VERSION="4.11.0" +ARG OPENCV_VERSION="4.12.0" ENV OPENCV_VERSION $OPENCV_VERSION ARG OPENCV_FILE="https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip" diff --git a/Makefile b/Makefile index a68072d2..4c53df8c 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,13 @@ .PHONY: test deps download build clean astyle cmds docker # GoCV version to use. -GOCV_VERSION?="v0.41.0" +GOCV_VERSION?="v0.42.0" # OpenCV version to use. -OPENCV_VERSION?=4.11.0 +OPENCV_VERSION?=4.12.0 # Go version to use when building Docker image -GOVERSION?=1.23.4 +GOVERSION?=1.24.4 # Temporary directory to put files into. TMP_DIR?=/tmp/ diff --git a/README.md b/README.md index 42219a21..0043311e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The GoCV package provides Go language bindings for the [OpenCV 4](http://opencv.org/) computer vision library. -The GoCV package supports the latest releases of Go and OpenCV (v4.11.0) on Linux, macOS, and Windows. We intend to make the Go language a "first-class" client compatible with the latest developments in the OpenCV ecosystem. +The GoCV package supports the latest releases of Go and OpenCV (v4.12.0) on Linux, macOS, and Windows. We intend to make the Go language a "first-class" client compatible with the latest developments in the OpenCV ecosystem. GoCV supports [CUDA](https://en.wikipedia.org/wiki/CUDA) for hardware acceleration using Nvidia GPUs. Check out the [CUDA README](./cuda/README.md) for more info on how to use GoCV with OpenCV/CUDA. @@ -123,7 +123,7 @@ There are examples in the [cmd directory](./cmd) of this repo in the form of var ## How to install -To install GoCV, you must first have the matching version of OpenCV installed on your system. The current release of GoCV requires OpenCV 4.11.0. +To install GoCV, you must first have the matching version of OpenCV installed on your system. The current release of GoCV requires OpenCV 4.12.0. Here are instructions for Ubuntu, Raspian, macOS, and Windows. @@ -131,7 +131,7 @@ Here are instructions for Ubuntu, Raspian, macOS, and Windows. ### Installation -You can use `make` to install OpenCV 4.11.0 with the handy `Makefile` included with this repo. If you already have installed OpenCV, you do not need to do so again. The installation performed by the `Makefile` is minimal, so it may remove OpenCV options such as Python or Java wrappers if you have already installed OpenCV some other way. +You can use `make` to install OpenCV 4.12.0 with the handy `Makefile` included with this repo. If you already have installed OpenCV, you do not need to do so again. The installation performed by the `Makefile` is minimal, so it may remove OpenCV options such as Python or Java wrappers if you have already installed OpenCV some other way. #### Quick Install @@ -142,7 +142,7 @@ First, change directories to where you want to install GoCV, and then use git to Make sure to change `$HOME/folder/with/your/src/` to where you actually want to save the code. -Once you have cloned the repo, the following commands should do everything to download and install OpenCV 4.11.0 on Linux: +Once you have cloned the repo, the following commands should do everything to download and install OpenCV 4.12.0 on Linux: cd gocv make install @@ -154,7 +154,7 @@ If you need static opencv libraries If it works correctly, at the end of the entire process, the following message should be displayed: gocv version: 0.41.0 - opencv lib version: 4.11.0 + opencv lib version: 4.12.0 That's it, now you are ready to use GoCV. @@ -168,7 +168,7 @@ See the [openvino directory](./openvino) for information. #### Make Install for OpenVINO and Cuda -The following commands should do everything to download and install OpenCV 4.11.0 with CUDA and OpenVINO on Linux. Make sure to change `$HOME/folder/with/your/src/` to the directory you used to clone GoCV: +The following commands should do everything to download and install OpenCV 4.12.0 with CUDA and OpenVINO on Linux. Make sure to change `$HOME/folder/with/your/src/` to the directory you used to clone GoCV: cd $HOME/folder/with/gocv/ make install_all @@ -180,7 +180,7 @@ If you need static opencv libraries If it works correctly, at the end of the entire process, the following message should be displayed: gocv version: 0.41.0 - opencv lib version: 4.11.0-openvino + opencv lib version: 4.12.0-openvino cuda information: Device 0: "GeForce MX150" 2003Mb, sm_61, Driver/Runtime ver.10.0/10.0 @@ -207,7 +207,7 @@ Next, you need to update the system, and install any required packages: #### Download source -Now, download the OpenCV 4.11.0 and OpenCV Contrib source code: +Now, download the OpenCV 4.12.0 and OpenCV Contrib source code: make download @@ -242,7 +242,7 @@ Now you should be able to build or run any of the examples: The version program should output the following: gocv version: 0.41.0 - opencv lib version: 4.11.0 + opencv lib version: 4.12.0 #### Cleanup extra files @@ -324,7 +324,7 @@ There is a Docker image with Alpine 3.7 that has been created by project contrib ### Installation -We have a special installation for the Raspberry Pi that includes some hardware optimizations. You use `make` to install OpenCV 4.11.0 with the handy `Makefile` included with this repo. If you already have installed OpenCV, you do not need to do so again. The installation performed by the `Makefile` is minimal, so it may remove OpenCV options such as Python or Java wrappers if you have already installed OpenCV some other way. +We have a special installation for the Raspberry Pi that includes some hardware optimizations. You use `make` to install OpenCV 4.12.0 with the handy `Makefile` included with this repo. If you already have installed OpenCV, you do not need to do so again. The installation performed by the `Makefile` is minimal, so it may remove OpenCV options such as Python or Java wrappers if you have already installed OpenCV some other way. #### Quick Install @@ -335,7 +335,7 @@ First, change directories to where you want to install GoCV, and then use git to Make sure to change `$HOME/folder/with/your/src/` to where you actually want to save the code. -The following make command should do everything to download and install OpenCV 4.11.0 on Raspbian: +The following make command should do everything to download and install OpenCV 4.12.0 on Raspbian: cd $HOME/folder/with/your/src/gocv make install_raspi @@ -343,7 +343,7 @@ The following make command should do everything to download and install OpenCV 4 If it works correctly, at the end of the entire process, the following message should be displayed: gocv version: 0.41.0 - opencv lib version: 4.11.0 + opencv lib version: 4.12.0 That's it, now you are ready to use GoCV. @@ -351,13 +351,13 @@ That's it, now you are ready to use GoCV. ### Installation -You can install OpenCV 4.11.0 using Homebrew. +You can install OpenCV 4.12.0 using Homebrew. If you already have an earlier version of OpenCV (3.4.x) installed, you should probably remove it before installing the new version: brew uninstall opencv -You can then install OpenCV 4.11.0: +You can then install OpenCV 4.12.0: brew install opencv @@ -383,7 +383,7 @@ Now you should be able to build or run any of the examples: The version program should output the following: gocv version: 0.41.0 - opencv lib version: 4.11.0 + opencv lib version: 4.12.0 ### Custom Environment @@ -392,8 +392,8 @@ By default, pkg-config is used to determine the correct flags for compiling and For example: export CGO_CXXFLAGS="--std=c++11" - export CGO_CPPFLAGS="-I/usr/local/Cellar/opencv/4.11.0/include" - export CGO_LDFLAGS="-L/usr/local/Cellar/opencv/4.11.0/lib -lopencv_stitching -lopencv_superres -lopencv_videostab -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dpm -lopencv_face -lopencv_photo -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_line_descriptor -lopencv_optflow -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_surface_matching -lopencv_tracking -lopencv_datasets -lopencv_dnn -lopencv_plot -lopencv_xfeatures2d -lopencv_shape -lopencv_video -lopencv_ml -lopencv_ximgproc -lopencv_calib3d -lopencv_features2d -lopencv_highgui -lopencv_videoio -lopencv_flann -lopencv_xobjdetect -lopencv_imgcodecs -lopencv_objdetect -lopencv_xphoto -lopencv_imgproc -lopencv_core" + export CGO_CPPFLAGS="-I/usr/local/Cellar/opencv/4.12.0/include" + export CGO_LDFLAGS="-L/usr/local/Cellar/opencv/4.12.0/lib -lopencv_stitching -lopencv_superres -lopencv_videostab -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dpm -lopencv_face -lopencv_photo -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_line_descriptor -lopencv_optflow -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_surface_matching -lopencv_tracking -lopencv_datasets -lopencv_dnn -lopencv_plot -lopencv_xfeatures2d -lopencv_shape -lopencv_video -lopencv_ml -lopencv_ximgproc -lopencv_calib3d -lopencv_features2d -lopencv_highgui -lopencv_videoio -lopencv_flann -lopencv_xobjdetect -lopencv_imgcodecs -lopencv_objdetect -lopencv_xphoto -lopencv_imgproc -lopencv_core" Please note that you will need to run these 3 lines of code one time in your current session in order to build or run the code, in order to setup the needed ENV variables. Once you have done so, you can execute code that uses GoCV with your custom environment like this: @@ -405,7 +405,7 @@ Please note that you will need to run these 3 lines of code one time in your cur The following assumes that you are running a 64-bit version of Windows 10. -In order to build and install OpenCV 4.11.0 on Windows, you must first download and install MinGW-W64 and CMake, as follows. +In order to build and install OpenCV 4.12.0 on Windows, you must first download and install MinGW-W64 and CMake, as follows. #### MinGW-W64 @@ -421,9 +421,9 @@ Add the `C:\Program Files\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bi Download and install CMake [https://cmake.org/download/](https://cmake.org/download/) to the default location. CMake installer will add CMake to your system path. -#### OpenCV 4.11.0 and OpenCV Contrib Modules +#### OpenCV 4.12.0 and OpenCV Contrib Modules -The following commands should do everything to download and install OpenCV 4.11.0 on Windows: +The following commands should do everything to download and install OpenCV 4.12.0 on Windows: chdir %GOPATH%\src\gocv.io\x\gocv win_build_opencv.cmd @@ -445,7 +445,7 @@ Now you should be able to build or run any of the command examples: The version program should output the following: gocv version: 0.41.0 - opencv lib version: 4.11.0 + opencv lib version: 4.12.0 That's it, now you are ready to use GoCV. @@ -459,7 +459,7 @@ For example: set CGO_CXXFLAGS="--std=c++11" set CGO_CPPFLAGS=-IC:\opencv\build\install\include - set CGO_LDFLAGS=-LC:\opencv\build\install\x64\mingw\lib -lopencv_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 + set CGO_LDFLAGS=-LC:\opencv\build\install\x64\mingw\lib -lopencv_core4120 -lopencv_face4120 -lopencv_videoio4120 -lopencv_imgproc4120 -lopencv_highgui4120 -lopencv_imgcodecs4120 -lopencv_objdetect4120 -lopencv_features2d4120 -lopencv_video4120 -lopencv_dnn4120 -lopencv_xfeatures2d4120 -lopencv_plot4120 -lopencv_tracking4120 -lopencv_img_hash4120 Please note that you will need to run these 3 lines of code one time in your current session in order to build or run the code, in order to setup the needed ENV variables. Once you have done so, you can execute code that uses GoCV with your custom environment like this: @@ -468,7 +468,7 @@ Please note that you will need to run these 3 lines of code one time in your cur ## Android There is some work in progress for running GoCV on Android using Gomobile. For information on how to install OpenCV/GoCV for Android, please see: -https://gist.github.com/ogero/c19458cf64bd3e91faae85c3ac8874110 +https://gist.github.com/ogero/c19458cf64bd3e91faae85c3ac8874120 See original discussion here: https://github.com/hybridgroup/gocv/issues/235 diff --git a/cgo.go b/cgo.go index 53324b5e..cf16105f 100644 --- a/cgo.go +++ b/cgo.go @@ -6,8 +6,8 @@ package gocv /* #cgo !windows pkg-config: opencv4 -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo windows CPPFLAGS: -IC:/opencv/build/install/include -#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_photo4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core4120 -lopencv_face4120 -lopencv_videoio4120 -lopencv_imgproc4120 -lopencv_highgui4120 -lopencv_imgcodecs4120 -lopencv_objdetect4120 -lopencv_features2d4120 -lopencv_video4120 -lopencv_dnn4120 -lopencv_xfeatures2d4120 -lopencv_plot4120 -lopencv_tracking4120 -lopencv_img_hash4120 -lopencv_calib3d4120 -lopencv_bgsegm4120 -lopencv_photo4120 -lopencv_aruco4120 -lopencv_wechat_qrcode4120 -lopencv_ximgproc4120 */ import "C" diff --git a/cgo_static.go b/cgo_static.go index 6e3c4e91..dd88d83f 100644 --- a/cgo_static.go +++ b/cgo_static.go @@ -5,7 +5,7 @@ package gocv // Changes here should be mirrored in contrib/cgo_static.go and cuda/cgo_static.go. /* -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo CPPFLAGS: -I/usr/local/include -I/usr/local/include/opencv4 #cgo amd64 LDFLAGS: -O2 -g -static -L/usr/local/lib -L/usr/local/lib/opencv4/3rdparty -lopencv_gapi -lopencv_stitching -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dnn_superres -lopencv_dpm -lopencv_face -lopencv_freetype -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_intensity_transform -lopencv_line_descriptor -lopencv_mcc -lopencv_quality -lopencv_rapid -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_signal -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_highgui -lopencv_datasets -lopencv_text -lopencv_plot -lopencv_videostab -lopencv_videoio -lopencv_wechat_qrcode -lopencv_xfeatures2d -lopencv_shape -lopencv_ml -lopencv_ximgproc -lopencv_video -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_dnn -lopencv_flann -lopencv_xphoto -lopencv_photo -lopencv_imgproc -lopencv_core -llibprotobuf -lade -ltbb -littnotify -llibjpeg-turbo -llibwebp -llibtiff -llibopenjp2 -lIlmImf -lquirc -lippiw -lippicv -lpng -lz -lgcc -lstdc++ -lfreetype -lharfbuzz -ldl -lm -lpthread -lrt -lavdevice -lm -latomic -lavfilter -pthread -lm -latomic -lswscale -lm -latomic -lpostproc -lm -latomic -lavformat -lm -latomic -lz -lavcodec -lvpx -lm -lvpx -lm -lvpx -lm -lvpx -lm -pthread -lm -latomic -lz -lx264 -lswresample -lm -latomic -lavutil -pthread -lm -latomic #cgo arm64 LDFLAGS: -O2 -g -static -L/usr/local/lib -L/usr/local/lib/opencv4/3rdparty -lopencv_gapi -lopencv_stitching -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dnn_superres -lopencv_dpm -lopencv_face -lopencv_freetype -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_intensity_transform -lopencv_line_descriptor -lopencv_mcc -lopencv_quality -lopencv_rapid -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_signal -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_highgui -lopencv_datasets -lopencv_text -lopencv_plot -lopencv_videostab -lopencv_videoio -lopencv_wechat_qrcode -lopencv_xfeatures2d -lopencv_shape -lopencv_ml -lopencv_ximgproc -lopencv_video -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_dnn -lopencv_flann -lopencv_xphoto -lopencv_photo -lopencv_imgproc -lopencv_core -llibprotobuf -lade -ltbb -littnotify -llibjpeg-turbo -llibwebp -llibtiff -llibopenjp2 -lIlmImf -lquirc -ltegra_hal -lpng -lz -lgcc -lstdc++ -lfreetype -lharfbuzz -ldl -lm -lpthread -lrt -lavdevice -lm -latomic -lavfilter -pthread -lm -latomic -lswscale -lm -latomic -lpostproc -lm -latomic -lavformat -lm -latomic -lz -lavcodec -lvpx -lm -lvpx -lm -lvpx -lm -lvpx -lm -pthread -lm -latomic -lz -lx264 -lswresample -lm -latomic -lavutil -pthread -lm -latomic diff --git a/cgo_static_darwin.go b/cgo_static_darwin.go index b1457ab4..a85461b9 100644 --- a/cgo_static_darwin.go +++ b/cgo_static_darwin.go @@ -5,7 +5,7 @@ package gocv // Changes here should be mirrored in contrib/cgo_static_darwin.go and cuda/cgo_static_darwin.go. /* -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo pkg-config: --static opencv4 */ import "C" diff --git a/cgo_static_windows.go b/cgo_static_windows.go index 69263af8..843fe0c0 100644 --- a/cgo_static_windows.go +++ b/cgo_static_windows.go @@ -5,8 +5,8 @@ package gocv // Changes here should be mirrored in contrib/cgo_static_windows.go and cuda/cgo_static_windows.go. /* -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo CPPFLAGS: -IC:/opencv/build/install/include -#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo4110 -lopencv_tracking4110 -lopencv_superres4110 -lopencv_stitching4110 -lopencv_optflow4110 -lopencv_gapi4110 -lopencv_face4110 -lopencv_dpm4110 -lopencv_dnn_objdetect4110 -lopencv_ccalib4110 -lopencv_bioinspired4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_xobjdetect4110 -lopencv_ximgproc4110 -lopencv_xfeatures2d4110 -lopencv_videostab4110 -lopencv_video4110 -lopencv_structured_light4110 -lopencv_shape4110 -lopencv_rgbd4110 -lopencv_rapid4110 -lopencv_objdetect4110 -lopencv_mcc4110 -lopencv_highgui4110 -lopencv_datasets4110 -lopencv_calib3d4110 -lopencv_videoio4110 -lopencv_text4110 -lopencv_line_descriptor4110 -lopencv_imgcodecs4110 -lopencv_img_hash4110 -lopencv_hfs4110 -lopencv_fuzzy4110 -lopencv_features2d4110 -lopencv_dnn_superres4110 -lopencv_dnn4110 -lopencv_xphoto4110 -lopencv_wechat_qrcode4110 -lopencv_surface_matching4110 -lopencv_reg4110 -lopencv_quality4110 -lopencv_plot4110 -lopencv_photo4110 -lopencv_phase_unwrapping4110 -lopencv_ml4110 -lopencv_intensity_transform4110 -lopencv_imgproc4110 -lopencv_flann4110 -lopencv_core4110 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 +#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo4120 -lopencv_tracking4120 -lopencv_superres4120 -lopencv_stitching4120 -lopencv_optflow4120 -lopencv_gapi4120 -lopencv_face4120 -lopencv_dpm4120 -lopencv_dnn_objdetect4120 -lopencv_ccalib4120 -lopencv_bioinspired4120 -lopencv_bgsegm4120 -lopencv_aruco4120 -lopencv_xobjdetect4120 -lopencv_ximgproc4120 -lopencv_xfeatures2d4120 -lopencv_videostab4120 -lopencv_video4120 -lopencv_structured_light4120 -lopencv_shape4120 -lopencv_rgbd4120 -lopencv_rapid4120 -lopencv_objdetect4120 -lopencv_mcc4120 -lopencv_highgui4120 -lopencv_datasets4120 -lopencv_calib3d4120 -lopencv_videoio4120 -lopencv_text4120 -lopencv_line_descriptor4120 -lopencv_imgcodecs4120 -lopencv_img_hash4120 -lopencv_hfs4120 -lopencv_fuzzy4120 -lopencv_features2d4120 -lopencv_dnn_superres4120 -lopencv_dnn4120 -lopencv_xphoto4120 -lopencv_wechat_qrcode4120 -lopencv_surface_matching4120 -lopencv_reg4120 -lopencv_quality4120 -lopencv_plot4120 -lopencv_photo4120 -lopencv_phase_unwrapping4120 -lopencv_ml4120 -lopencv_intensity_transform4120 -lopencv_imgproc4120 -lopencv_flann4120 -lopencv_core4120 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 */ import "C" diff --git a/contrib/cgo.go b/contrib/cgo.go index 85051e50..f2233410 100644 --- a/contrib/cgo.go +++ b/contrib/cgo.go @@ -6,8 +6,8 @@ package contrib /* #cgo !windows pkg-config: opencv4 -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo windows CPPFLAGS: -IC:/opencv/build/install/include -#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_xphoto4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 -lopencv_xobjdetect4110 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core4120 -lopencv_face4120 -lopencv_videoio4120 -lopencv_imgproc4120 -lopencv_highgui4120 -lopencv_imgcodecs4120 -lopencv_objdetect4120 -lopencv_features2d4120 -lopencv_video4120 -lopencv_dnn4120 -lopencv_xfeatures2d4120 -lopencv_plot4120 -lopencv_tracking4120 -lopencv_img_hash4120 -lopencv_calib3d4120 -lopencv_bgsegm4120 -lopencv_xphoto4120 -lopencv_aruco4120 -lopencv_wechat_qrcode4120 -lopencv_ximgproc4120 -lopencv_xobjdetect4120 */ import "C" diff --git a/contrib/cgo_static.go b/contrib/cgo_static.go index aa05f10a..e2a8cfdc 100644 --- a/contrib/cgo_static.go +++ b/contrib/cgo_static.go @@ -5,7 +5,7 @@ package contrib // Changes here should be mirrored in contrib/cgo_static.go and cuda/cgo_static.go. /* -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo CPPFLAGS: -I/usr/local/include -I/usr/local/include/opencv4 #cgo amd64 LDFLAGS: -O2 -g -static -L/usr/local/lib -L/usr/local/lib/opencv4/3rdparty -lopencv_gapi -lopencv_stitching -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dnn_superres -lopencv_dpm -lopencv_face -lopencv_freetype -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_intensity_transform -lopencv_line_descriptor -lopencv_mcc -lopencv_quality -lopencv_rapid -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_signal -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_highgui -lopencv_datasets -lopencv_text -lopencv_plot -lopencv_videostab -lopencv_videoio -lopencv_wechat_qrcode -lopencv_xfeatures2d -lopencv_shape -lopencv_ml -lopencv_ximgproc -lopencv_video -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_dnn -lopencv_flann -lopencv_xphoto -lopencv_photo -lopencv_imgproc -lopencv_core -llibprotobuf -lade -ltbb -littnotify -llibjpeg-turbo -llibwebp -llibtiff -llibopenjp2 -lIlmImf -lquirc -lippiw -lippicv -lpng -lz -lgcc -lstdc++ -lfreetype -lharfbuzz -ldl -lm -lpthread -lrt -lavdevice -lm -latomic -lavfilter -pthread -lm -latomic -lswscale -lm -latomic -lpostproc -lm -latomic -lavformat -lm -latomic -lz -lavcodec -lvpx -lm -lvpx -lm -lvpx -lm -lvpx -lm -pthread -lm -latomic -lz -lx264 -lswresample -lm -latomic -lavutil -pthread -lm -latomic #cgo arm64 LDFLAGS: -O2 -g -static -L/usr/local/lib -L/usr/local/lib/opencv4/3rdparty -lopencv_gapi -lopencv_stitching -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dnn_superres -lopencv_dpm -lopencv_face -lopencv_freetype -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_intensity_transform -lopencv_line_descriptor -lopencv_mcc -lopencv_quality -lopencv_rapid -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_signal -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_highgui -lopencv_datasets -lopencv_text -lopencv_plot -lopencv_videostab -lopencv_videoio -lopencv_wechat_qrcode -lopencv_xfeatures2d -lopencv_shape -lopencv_ml -lopencv_ximgproc -lopencv_video -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_dnn -lopencv_flann -lopencv_xphoto -lopencv_photo -lopencv_imgproc -lopencv_core -llibprotobuf -lade -ltbb -littnotify -llibjpeg-turbo -llibwebp -llibtiff -llibopenjp2 -lIlmImf -lquirc -ltegra_hal -lpng -lz -lgcc -lstdc++ -lfreetype -lharfbuzz -ldl -lm -lpthread -lrt -lavdevice -lm -latomic -lavfilter -pthread -lm -latomic -lswscale -lm -latomic -lpostproc -lm -latomic -lavformat -lm -latomic -lz -lavcodec -lvpx -lm -lvpx -lm -lvpx -lm -lvpx -lm -pthread -lm -latomic -lz -lx264 -lswresample -lm -latomic -lavutil -pthread -lm -latomic diff --git a/contrib/cgo_static_darwin.go b/contrib/cgo_static_darwin.go index a9dca884..bc9e7b95 100644 --- a/contrib/cgo_static_darwin.go +++ b/contrib/cgo_static_darwin.go @@ -5,7 +5,7 @@ package contrib // Changes here should be mirrored in contrib/cgo_static_darwin.go and cuda/cgo_static_darwin.go. /* -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo pkg-config: --static opencv4 */ import "C" diff --git a/contrib/cgo_static_windows.go b/contrib/cgo_static_windows.go index 6f9b35b8..c7498abd 100644 --- a/contrib/cgo_static_windows.go +++ b/contrib/cgo_static_windows.go @@ -5,8 +5,8 @@ package contrib // Changes here should be mirrored in contrib/cgo_static_windows.go and cuda/cgo_static_windows.go. /* -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo CPPFLAGS: -IC:/opencv/build/install/include -#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo4110 -lopencv_tracking4110 -lopencv_superres4110 -lopencv_stitching4110 -lopencv_optflow4110 -lopencv_gapi4110 -lopencv_face4110 -lopencv_dpm4110 -lopencv_dnn_objdetect4110 -lopencv_ccalib4110 -lopencv_bioinspired4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_xobjdetect4110 -lopencv_ximgproc4110 -lopencv_xfeatures2d4110 -lopencv_videostab4110 -lopencv_video4110 -lopencv_structured_light4110 -lopencv_shape4110 -lopencv_rgbd4110 -lopencv_rapid4110 -lopencv_objdetect4110 -lopencv_mcc4110 -lopencv_highgui4110 -lopencv_datasets4110 -lopencv_calib3d4110 -lopencv_videoio4110 -lopencv_text4110 -lopencv_line_descriptor4110 -lopencv_imgcodecs4110 -lopencv_img_hash4110 -lopencv_hfs4110 -lopencv_fuzzy4110 -lopencv_features2d4110 -lopencv_dnn_superres4110 -lopencv_dnn4110 -lopencv_xphoto4110 -lopencv_wechat_qrcode4110 -lopencv_surface_matching4110 -lopencv_reg4110 -lopencv_quality4110 -lopencv_plot4110 -lopencv_photo4110 -lopencv_phase_unwrapping4110 -lopencv_ml4110 -lopencv_intensity_transform4110 -lopencv_imgproc4110 -lopencv_flann4110 -lopencv_core4110 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 +#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo4120 -lopencv_tracking4120 -lopencv_superres4120 -lopencv_stitching4120 -lopencv_optflow4120 -lopencv_gapi4120 -lopencv_face4120 -lopencv_dpm4120 -lopencv_dnn_objdetect4120 -lopencv_ccalib4120 -lopencv_bioinspired4120 -lopencv_bgsegm4120 -lopencv_aruco4120 -lopencv_xobjdetect4120 -lopencv_ximgproc4120 -lopencv_xfeatures2d4120 -lopencv_videostab4120 -lopencv_video4120 -lopencv_structured_light4120 -lopencv_shape4120 -lopencv_rgbd4120 -lopencv_rapid4120 -lopencv_objdetect4120 -lopencv_mcc4120 -lopencv_highgui4120 -lopencv_datasets4120 -lopencv_calib3d4120 -lopencv_videoio4120 -lopencv_text4120 -lopencv_line_descriptor4120 -lopencv_imgcodecs4120 -lopencv_img_hash4120 -lopencv_hfs4120 -lopencv_fuzzy4120 -lopencv_features2d4120 -lopencv_dnn_superres4120 -lopencv_dnn4120 -lopencv_xphoto4120 -lopencv_wechat_qrcode4120 -lopencv_surface_matching4120 -lopencv_reg4120 -lopencv_quality4120 -lopencv_plot4120 -lopencv_photo4120 -lopencv_phase_unwrapping4120 -lopencv_ml4120 -lopencv_intensity_transform4120 -lopencv_imgproc4120 -lopencv_flann4120 -lopencv_core4120 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 */ import "C" diff --git a/cuda/cgo.go b/cuda/cgo.go index 236be33c..0e571e5a 100644 --- a/cuda/cgo.go +++ b/cuda/cgo.go @@ -6,8 +6,8 @@ package cuda /* #cgo !windows pkg-config: opencv4 -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo windows CPPFLAGS: -IC:/opencv/build/install/include -#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 -lopencv_xobjdetect4110 +#cgo windows LDFLAGS: -LC:/opencv/build/install/x64/mingw/lib -lopencv_core4120 -lopencv_face4120 -lopencv_videoio4120 -lopencv_imgproc4120 -lopencv_highgui4120 -lopencv_imgcodecs4120 -lopencv_objdetect4120 -lopencv_features2d4120 -lopencv_video4120 -lopencv_dnn4120 -lopencv_xfeatures2d4120 -lopencv_plot4120 -lopencv_tracking4120 -lopencv_img_hash4120 -lopencv_calib3d4120 -lopencv_bgsegm4120 -lopencv_aruco4120 -lopencv_wechat_qrcode4120 -lopencv_ximgproc4120 -lopencv_xobjdetect4120 */ import "C" diff --git a/cuda/cgo_static.go b/cuda/cgo_static.go index 913a95dc..1b9c928b 100644 --- a/cuda/cgo_static.go +++ b/cuda/cgo_static.go @@ -5,7 +5,7 @@ package gocv // Changes here should be mirrored in contrib/cgo_static.go and cuda/cgo_static.go. /* -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo CPPFLAGS: -I/usr/local/include -I/usr/local/include/opencv4 #cgo amd64 LDFLAGS: -O2 -g -static -L/usr/local/lib -L/usr/local/lib/opencv4/3rdparty -lopencv_gapi -lopencv_stitching -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dnn_superres -lopencv_dpm -lopencv_face -lopencv_freetype -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_intensity_transform -lopencv_line_descriptor -lopencv_mcc -lopencv_quality -lopencv_rapid -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_signal -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_highgui -lopencv_datasets -lopencv_text -lopencv_plot -lopencv_videostab -lopencv_videoio -lopencv_wechat_qrcode -lopencv_xfeatures2d -lopencv_shape -lopencv_ml -lopencv_ximgproc -lopencv_video -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_dnn -lopencv_flann -lopencv_xphoto -lopencv_photo -lopencv_imgproc -lopencv_core -llibprotobuf -lade -ltbb -littnotify -llibjpeg-turbo -llibwebp -llibtiff -llibopenjp2 -lIlmImf -lquirc -lippiw -lippicv -lpng -lz -lgcc -lstdc++ -lfreetype -lharfbuzz -ldl -lm -lpthread -lrt -lavdevice -lm -latomic -lavfilter -pthread -lm -latomic -lswscale -lm -latomic -lpostproc -lm -latomic -lavformat -lm -latomic -lz -lavcodec -lvpx -lm -lvpx -lm -lvpx -lm -lvpx -lm -pthread -lm -latomic -lz -lx264 -lswresample -lm -latomic -lavutil -pthread -lm -latomic #cgo arm64 LDFLAGS: -O2 -g -static -L/usr/local/lib -L/usr/local/lib/opencv4/3rdparty -lopencv_gapi -lopencv_stitching -lopencv_aruco -lopencv_bgsegm -lopencv_bioinspired -lopencv_ccalib -lopencv_dnn_objdetect -lopencv_dnn_superres -lopencv_dpm -lopencv_face -lopencv_freetype -lopencv_fuzzy -lopencv_hfs -lopencv_img_hash -lopencv_intensity_transform -lopencv_line_descriptor -lopencv_mcc -lopencv_quality -lopencv_rapid -lopencv_reg -lopencv_rgbd -lopencv_saliency -lopencv_signal -lopencv_stereo -lopencv_structured_light -lopencv_phase_unwrapping -lopencv_superres -lopencv_optflow -lopencv_surface_matching -lopencv_tracking -lopencv_highgui -lopencv_datasets -lopencv_text -lopencv_plot -lopencv_videostab -lopencv_videoio -lopencv_wechat_qrcode -lopencv_xfeatures2d -lopencv_shape -lopencv_ml -lopencv_ximgproc -lopencv_video -lopencv_xobjdetect -lopencv_objdetect -lopencv_calib3d -lopencv_imgcodecs -lopencv_features2d -lopencv_dnn -lopencv_flann -lopencv_xphoto -lopencv_photo -lopencv_imgproc -lopencv_core -llibprotobuf -lade -ltbb -littnotify -llibjpeg-turbo -llibwebp -llibtiff -llibopenjp2 -lIlmImf -lquirc -ltegra_hal -lpng -lz -lgcc -lstdc++ -lfreetype -lharfbuzz -ldl -lm -lpthread -lrt -lavdevice -lm -latomic -lavfilter -pthread -lm -latomic -lswscale -lm -latomic -lpostproc -lm -latomic -lavformat -lm -latomic -lz -lavcodec -lvpx -lm -lvpx -lm -lvpx -lm -lvpx -lm -pthread -lm -latomic -lz -lx264 -lswresample -lm -latomic -lavutil -pthread -lm -latomic diff --git a/cuda/cgo_static_darwin.go b/cuda/cgo_static_darwin.go index b1457ab4..a85461b9 100644 --- a/cuda/cgo_static_darwin.go +++ b/cuda/cgo_static_darwin.go @@ -5,7 +5,7 @@ package gocv // Changes here should be mirrored in contrib/cgo_static_darwin.go and cuda/cgo_static_darwin.go. /* -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo pkg-config: --static opencv4 */ import "C" diff --git a/cuda/cgo_static_windows.go b/cuda/cgo_static_windows.go index 69263af8..843fe0c0 100644 --- a/cuda/cgo_static_windows.go +++ b/cuda/cgo_static_windows.go @@ -5,8 +5,8 @@ package gocv // Changes here should be mirrored in contrib/cgo_static_windows.go and cuda/cgo_static_windows.go. /* -#cgo CXXFLAGS: --std=c++11 +#cgo CXXFLAGS: --std=c++11 -DNDEBUG #cgo CPPFLAGS: -IC:/opencv/build/install/include -#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo4110 -lopencv_tracking4110 -lopencv_superres4110 -lopencv_stitching4110 -lopencv_optflow4110 -lopencv_gapi4110 -lopencv_face4110 -lopencv_dpm4110 -lopencv_dnn_objdetect4110 -lopencv_ccalib4110 -lopencv_bioinspired4110 -lopencv_bgsegm4110 -lopencv_aruco4110 -lopencv_xobjdetect4110 -lopencv_ximgproc4110 -lopencv_xfeatures2d4110 -lopencv_videostab4110 -lopencv_video4110 -lopencv_structured_light4110 -lopencv_shape4110 -lopencv_rgbd4110 -lopencv_rapid4110 -lopencv_objdetect4110 -lopencv_mcc4110 -lopencv_highgui4110 -lopencv_datasets4110 -lopencv_calib3d4110 -lopencv_videoio4110 -lopencv_text4110 -lopencv_line_descriptor4110 -lopencv_imgcodecs4110 -lopencv_img_hash4110 -lopencv_hfs4110 -lopencv_fuzzy4110 -lopencv_features2d4110 -lopencv_dnn_superres4110 -lopencv_dnn4110 -lopencv_xphoto4110 -lopencv_wechat_qrcode4110 -lopencv_surface_matching4110 -lopencv_reg4110 -lopencv_quality4110 -lopencv_plot4110 -lopencv_photo4110 -lopencv_phase_unwrapping4110 -lopencv_ml4110 -lopencv_intensity_transform4110 -lopencv_imgproc4110 -lopencv_flann4110 -lopencv_core4110 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 +#cgo LDFLAGS: -LC:/opencv/build/install/x64/mingw/staticlib -lopencv_stereo4120 -lopencv_tracking4120 -lopencv_superres4120 -lopencv_stitching4120 -lopencv_optflow4120 -lopencv_gapi4120 -lopencv_face4120 -lopencv_dpm4120 -lopencv_dnn_objdetect4120 -lopencv_ccalib4120 -lopencv_bioinspired4120 -lopencv_bgsegm4120 -lopencv_aruco4120 -lopencv_xobjdetect4120 -lopencv_ximgproc4120 -lopencv_xfeatures2d4120 -lopencv_videostab4120 -lopencv_video4120 -lopencv_structured_light4120 -lopencv_shape4120 -lopencv_rgbd4120 -lopencv_rapid4120 -lopencv_objdetect4120 -lopencv_mcc4120 -lopencv_highgui4120 -lopencv_datasets4120 -lopencv_calib3d4120 -lopencv_videoio4120 -lopencv_text4120 -lopencv_line_descriptor4120 -lopencv_imgcodecs4120 -lopencv_img_hash4120 -lopencv_hfs4120 -lopencv_fuzzy4120 -lopencv_features2d4120 -lopencv_dnn_superres4120 -lopencv_dnn4120 -lopencv_xphoto4120 -lopencv_wechat_qrcode4120 -lopencv_surface_matching4120 -lopencv_reg4120 -lopencv_quality4120 -lopencv_plot4120 -lopencv_photo4120 -lopencv_phase_unwrapping4120 -lopencv_ml4120 -lopencv_intensity_transform4120 -lopencv_imgproc4120 -lopencv_flann4120 -lopencv_core4120 -lade -lquirc -llibprotobuf -lIlmImf -llibpng -llibopenjp2 -llibwebp -llibtiff -llibjpeg-turbo -lzlib -lkernel32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -luser32 */ import "C" diff --git a/version_test.go b/version_test.go index 2b6382ae..c6574986 100644 --- a/version_test.go +++ b/version_test.go @@ -8,7 +8,7 @@ import ( func TestVersions(t *testing.T) { ocvv := OpenCVVersion() - if !strings.Contains(ocvv, "4.11") { + if !(strings.Contains(ocvv, "4.11") || strings.Contains(ocvv, "4.12")) { t.Error("Wrong version of OpenCV:", ocvv) } diff --git a/win_build_opencv.cmd b/win_build_opencv.cmd index 816ccd93..8794dc79 100644 --- a/win_build_opencv.cmd +++ b/win_build_opencv.cmd @@ -11,18 +11,18 @@ echo. REM This is why there is no progress bar: REM https://github.com/PowerShell/PowerShell/issues/2138 -echo Downloading: opencv-4.11.0.zip [91MB] -powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://github.com/opencv/opencv/archive/4.11.0.zip -OutFile c:\opencv\opencv-4.11.0.zip" +echo Downloading: opencv-4.12.0.zip [91MB] +powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://github.com/opencv/opencv/archive/4.12.0.zip -OutFile c:\opencv\opencv-4.12.0.zip" echo Extracting... -powershell -command "$ProgressPreference = 'SilentlyContinue'; Expand-Archive -Path c:\opencv\opencv-4.11.0.zip -DestinationPath c:\opencv" -del c:\opencv\opencv-4.11.0.zip /q +powershell -command "$ProgressPreference = 'SilentlyContinue'; Expand-Archive -Path c:\opencv\opencv-4.12.0.zip -DestinationPath c:\opencv" +del c:\opencv\opencv-4.12.0.zip /q echo. -echo Downloading: opencv_contrib-4.11.0.zip [58MB] -powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://github.com/opencv/opencv_contrib/archive/4.11.0.zip -OutFile c:\opencv\opencv_contrib-4.11.0.zip" +echo Downloading: opencv_contrib-4.12.0.zip [58MB] +powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://github.com/opencv/opencv_contrib/archive/4.12.0.zip -OutFile c:\opencv\opencv_contrib-4.12.0.zip" echo Extracting... -powershell -command "$ProgressPreference = 'SilentlyContinue'; Expand-Archive -Path c:\opencv\opencv_contrib-4.11.0.zip -DestinationPath c:\opencv" -del c:\opencv\opencv_contrib-4.11.0.zip /q +powershell -command "$ProgressPreference = 'SilentlyContinue'; Expand-Archive -Path c:\opencv\opencv_contrib-4.12.0.zip -DestinationPath c:\opencv" +del c:\opencv\opencv_contrib-4.12.0.zip /q echo. echo Done with downloading and extracting sources. @@ -38,9 +38,9 @@ if [%1]==[static] ( ) else ( set enable_shared=ON ) -cmake C:\opencv\opencv-4.11.0 -G "MinGW Makefiles" -BC:\opencv\build -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH=C:\opencv\opencv_contrib-4.11.0\modules -DBUILD_SHARED_LIBS=%enable_shared% -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -Wno-dev +cmake C:\opencv\opencv-4.12.0 -G "MinGW Makefiles" -BC:\opencv\build -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH=C:\opencv\opencv_contrib-4.12.0\modules -DBUILD_SHARED_LIBS=%enable_shared% -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -Wno-dev mingw32-make -j%NUMBER_OF_PROCESSORS% mingw32-make install -rmdir c:\opencv\opencv-4.11.0 /s /q -rmdir c:\opencv\opencv_contrib-4.11.0 /s /q +rmdir c:\opencv\opencv-4.12.0 /s /q +rmdir c:\opencv\opencv_contrib-4.12.0 /s /q chdir /D %GOPATH%\src\gocv.io\x\gocv