Merge pull request #1840 from shimat/linux_packages

Linux: portable manylinux build, vcpkg for Linux, slim profile expansion

Author: shimat

.devcontainer/manylinux/Dockerfile

@@ -0,0 +1,31 @@
+FROM quay.io/pypa/manylinux_2_28_x86_64
+
+USER root
+
+# Same tools as CI workflow (manylinux.yml) + GitHub CLI
+RUN dnf install -y \
+    git \
+    zip \
+    unzip \
+    nasm \
+    yasm \
+    pkg-config \
+    ninja-build \
+    kernel-headers \
+    perl-IPC-Cmd \
+    perl-Time-Piece \
+    gtk3-devel \
+    && dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo \
+    && dnf install -y gh \
+    && dnf clean all
+
+# vcpkg bootstrap (package install is done later via postCreateCommand
+# using /work/vcpkg.json from the mounted workspace)
+RUN git clone --filter=blob:none --depth=1 https://github.com/microsoft/vcpkg.git /opt/vcpkg \
+    && /opt/vcpkg/bootstrap-vcpkg.sh -disableMetrics
+
+# .NET SDK 10 — builds and runs net8.0 targets (SDK cross-targeting)
+RUN curl -fsSL https://dot.net/v1/dotnet-install.sh \
+    | bash -s -- --channel 10.0 --install-dir /usr/local/dotnet
+ENV PATH="${PATH}:/usr/local/dotnet"
+ENV DOTNET_ROOT=/usr/local/dotnet

.devcontainer/manylinux/build_extern.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+# build_extern.sh — first-time setup inside the manylinux_2_28 devcontainer.
+# Called automatically by postCreateCommand when the container is first created.
+# Safe to re-run manually; each step is skipped if its output already exists.
+#
+# Steps:
+#   1. vcpkg install (x64-linux-static)
+#   2. Static FFmpeg
+#   3. OpenCV (full, static, with contrib)
+#
+# OpenCvSharpExtern is intentionally NOT built here — run the VS Code task
+# "Build OpenCvSharpExtern" (Ctrl+Shift+B) or build_opencvsharpextern.sh manually.
+
+set -euxo pipefail
+
+# ---------------------------------------------------------------------------
+# 1. vcpkg packages
+# ---------------------------------------------------------------------------
+/opt/vcpkg/vcpkg install \
+    --triplet x64-linux-static \
+    --overlay-triplets=/work/cmake/triplets \
+    --x-install-root=/opt/vcpkg-installed
+
+# ---------------------------------------------------------------------------
+# 2. Static FFmpeg (skipped if already built)
+# ---------------------------------------------------------------------------
+bash /work/docker/manylinux/build_static_deps.sh
+
+# ---------------------------------------------------------------------------
+# 3. OpenCV (full, static)
+# ---------------------------------------------------------------------------
+if [[ ! -f /opt/opencv_artifacts/lib64/pkgconfig/opencv4.pc ]] && \
+   [[ ! -f /opt/opencv_artifacts/lib/pkgconfig/opencv4.pc ]]; then
+    cmake \
+        -G Ninja \
+        -C /work/cmake/opencv_build_options.cmake \
+        -S /work/opencv \
+        -B /tmp/opencv-build \
+        -D OPENCV_EXTRA_MODULES_PATH=/work/opencv_contrib/modules \
+        -D CMAKE_INSTALL_PREFIX=/opt/opencv_artifacts \
+        -D CMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake \
+        -D VCPKG_TARGET_TRIPLET=x64-linux-static \
+        -D VCPKG_INSTALLED_DIR=/opt/vcpkg-installed \
+        -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \
+        -D CMAKE_PREFIX_PATH="/opt/vcpkg-installed/x64-linux-static;/opt/ffmpeg" \
+        -D BUILD_JPEG=OFF \
+        -D BUILD_PNG=OFF \
+        -D BUILD_TIFF=OFF \
+        -D BUILD_WEBP=OFF \
+        -D BUILD_ZLIB=ON \
+        -D WITH_TBB=OFF \
+        -D WITH_OPENEXR=OFF \
+        -D WITH_JASPER=OFF
+    cmake --build /tmp/opencv-build -j4
+    cmake --install /tmp/opencv-build
+    rm -rf /tmp/opencv-build
+fi

.devcontainer/manylinux/build_opencvsharpextern.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# build_opencvsharpextern.sh — configure & build OpenCvSharpExtern inside the
+# manylinux_2_28 devcontainer.  Run directly or via the VS Code task
+# "Build OpenCvSharpExtern" (Ctrl+Shift+B).
+#
+# Output: /work/src/build/OpenCvSharpExtern/libOpenCvSharpExtern.so
+
+set -euxo pipefail
+
+cmake \
+    -G Ninja \
+    -S /work/src \
+    -B /work/src/build \
+    -D CMAKE_BUILD_TYPE=Release \
+    -D CMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake \
+    -D VCPKG_TARGET_TRIPLET=x64-linux-static \
+    -D VCPKG_INSTALLED_DIR=/opt/vcpkg-installed \
+    -D OpenCV_DIR=/opt/opencv_artifacts/lib64/cmake/opencv4 \
+    -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \
+    "-D CMAKE_PREFIX_PATH=/opt/opencv_artifacts;/opt/ffmpeg;/opt/vcpkg-installed/x64-linux-static" \
+    "-D ZLIB_LIBRARY=/opt/vcpkg-installed/x64-linux-static/lib/libz.a" \
+    "-D ZLIB_INCLUDE_DIR=/opt/vcpkg-installed/x64-linux-static/include" \
+    "-D CMAKE_SHARED_LINKER_FLAGS=-L/opt/vcpkg-installed/x64-linux-static/lib"
+
+cmake --build /work/src/build -j4

.devcontainer/manylinux/devcontainer.json

@@ -0,0 +1,43 @@
+// Dev container that reproduces the manylinux_2_28 CI build environment.
+// Workspace is bind-mounted at /work. All build caches live inside the container.
+//
+// On first container creation, postCreateCommand runs build_extern.sh which does:
+//   1. vcpkg install (x64-linux-static)
+//   2. Static FFmpeg build
+//   3. OpenCV full build  -> /opt/opencv_artifacts/
+//   4. OpenCvSharpExtern build -> /work/src/build/
+//
+// To run the OCR test after setup:
+//   cd /work/test/OpenCvSharp.Tests
+//   cp /work/src/build/OpenCvSharpExtern/libOpenCvSharpExtern.so .
+//   LD_LIBRARY_PATH=. dotnet test OpenCvSharp.Tests.csproj -c Release -f net8.0 \
+//       --filter "FullyQualifiedName~OCRTesseractTest"
+{
+    "name": "manylinux_2_28 (build)",
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+
+    // Mount the workspace at /work — same path as CI (GITHUB_WORKSPACE → /work)
+    "workspaceMount": "source=${localWorkspaceFolder},target=/work,type=bind,consistency=cached",
+    "workspaceFolder": "/work",
+
+    "remoteUser": "root",
+
+    // First-time setup: vcpkg install -> FFmpeg -> OpenCV -> OpenCvSharpExtern
+    // Safe to re-run manually: bash /work/.devcontainer/manylinux/build_extern.sh
+    "postCreateCommand": "bash /work/.devcontainer/manylinux/build_extern.sh",
+
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-vscode.cpptools",
+                "ms-vscode.cmake-tools",
+                "timonwong.shellcheck"
+            ],
+            "settings": {
+                "terminal.integrated.defaultProfile.linux": "bash"
+            }
+        }
+    }
+}

.dockerignore

@@ -0,0 +1,14 @@
+# Exclude everything by default; only allow what the Dockerfile COPYs.
+**
+
+# OpenCvSharp managed and native sources
+!src/
+src/build*/
+src/uwpOpenCvSharpExtern/
+
+# cmake option files needed by Dockerfiles
+!cmake/opencv_build_options.cmake
+!cmake/opencv_build_options_slim.cmake
+
+# Test projects
+!test/

.github/copilot-instructions.md

@@ -4,10 +4,28 @@ All source files in this repository use **UTF-8 with BOM** (`EF BB BF`).
 
 When creating or editing files, always save them as UTF-8 with BOM. This applies to `.cs`, `.csproj`, `.yml`, `.md`, `.json`, and all other text files.
 
-Do **not** save files as UTF-8 without BOM, ANSI, or Shift-JIS — doing so will corrupt Japanese content and break Visual Studio / MSBuild tooling.
+**Exception — Linux tooling files: use UTF-8 without BOM.**
+The following file types are processed by Linux tools (Docker, bash, VS Code Dev Containers) that do not tolerate a BOM and must be saved **without** BOM:
+- `Dockerfile` and any file named `*.Dockerfile`
+- Shell scripts (`.sh`)
+- `devcontainer.json` and all files under `.devcontainer/`
+
+Do **not** save files as UTF-8 without BOM, ANSI, or Shift-JIS — doing so will corrupt Japanese content and break Visual Studio / MSBuild tooling (for the files above that require BOM).
+
+### Editing workflow requirement
+
+Maintain correct encoding **during each edit/create step** — do not correct it in a follow-up step.
+
+Do not rely on a final "bulk conversion/check" step at the end of the task.
+
+**Important:** The `create_file` tool does **not** interpret `\uFEFF` in the content string as BOM bytes — it writes the literal six characters `\uFEFF`. Never place `\uFEFF` (or any Unicode escape for U+FEFF) directly in the `content` parameter. Instead, create the file first (BOM-free), then immediately apply the PowerShell conversion command below for files that require BOM.
 
 ### Verification
 
+Do not run the verification/conversion commands on every edit by default.
+Prevent encoding issues through edit/create operations that preserve UTF-8 BOM.
+Run the commands below only when preservation cannot be guaranteed or when troubleshooting is required.
+
 ```powershell
 # Check whether a file has UTF-8 BOM
 $b = [System.IO.File]::ReadAllBytes("path\to\file")

.github/workflows/docker-test-ubuntu.yml

@@ -3,14 +3,18 @@ name: Docker Test
 on:
   pull_request:
     types: [synchronize, opened]
+  push:
+    branches:
+      - main
 
 env:
   DEBIAN_FRONTEND: noninteractive
   OPENCV_VERSION: 4.13.0
-  DOCKER_BUILD_CONTEXT: ./docker/ubuntu24-dotnet10-opencv4.13.0
+  DOCKER_BUILD_CONTEXT_FULL: ./docker/ubuntu24-dotnet10-opencv4.13.0
+  DOCKER_BUILD_CONTEXT_SLIM: ./docker/ubuntu24-dotnet10-opencv4.13.0-slim
 
 jobs:
-  build:
+  build_full:
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
@@ -19,15 +23,37 @@ jobs:
 
       - uses: docker/setup-buildx-action@v3
 
-      - name: Build with Docker
+      - name: Build with Docker (full)
         uses: docker/build-push-action@v6
         with:
-          context: ${{ env.DOCKER_BUILD_CONTEXT }}
+          context: .
+          file: ${{ env.DOCKER_BUILD_CONTEXT_FULL }}/Dockerfile
           build-args: |
             OPENCV_VERSION=${{ env.OPENCV_VERSION }}
-            OPENCVSHARP_REF=${{ github.head_ref || github.ref_name }}
           outputs: type=docker,name=shimat/ubuntu24-dotnet10-opencv4.13.0:latest
           cache-from: |
-            type=gha,scope=${{ github.ref_name }}
-            type=gha,scope=main
-          cache-to: type=gha,mode=min,scope=${{ github.ref_name }}
+            type=gha,scope=full-${{ github.ref_name }}
+            type=gha,scope=full-main
+          cache-to: type=gha,mode=min,scope=full-${{ github.ref_name }}
+
+  build_slim:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Build with Docker (slim)
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ${{ env.DOCKER_BUILD_CONTEXT_SLIM }}/Dockerfile
+          build-args: |
+            OPENCV_VERSION=${{ env.OPENCV_VERSION }}
+          outputs: type=docker,name=shimat/ubuntu24-dotnet10-opencv4.13.0-slim:latest
+          cache-from: |
+            type=gha,scope=slim-${{ github.ref_name }}
+            type=gha,scope=slim-main
+          cache-to: type=gha,mode=min,scope=slim-${{ github.ref_name }}

.github/workflows/linux-arm.yml

@@ -10,6 +10,7 @@ on:
 env:
   DEBIAN_FRONTEND: noninteractive
   OPENCV_VERSION: 4.13.0
+  CACHE_VERSION: "2"
 
 jobs:
   build:
@@ -46,7 +47,8 @@ jobs:
             libopencore-amrnb-dev \
             libopencore-amrwb-dev \
             libx264-dev \
-            libtesseract-dev 
+            libtesseract-dev \
+            ninja-build
 
       - name: Restore OpenCV cache
         id: opencv-cache
@@ -55,19 +57,40 @@ jobs:
           path: |
             ${{ github.workspace }}/opencv_artifacts/include
             ${{ github.workspace }}/opencv_artifacts/lib
-          key: opencv-arm-${{ env.OPENCV_VERSION }}-${{ hashFiles('.github/workflows/linux-arm.yml') }}
-          restore-keys: |
-            opencv-arm-${{ env.OPENCV_VERSION }}-
+          key: opencv-arm-v${{ env.CACHE_VERSION }}-${{ env.OPENCV_VERSION }}-${{ hashFiles('cmake/opencv_build_options.cmake', '.github/workflows/linux-arm.yml') }}
 
-      - name: Build OpenCV
+      - name: Configure OpenCV
         if: steps.opencv-cache.outputs.cache-hit != 'true'
         run: |
           cmake \
+            -G Ninja \
             -C cmake/opencv_build_options.cmake \
             -S opencv \
             -B opencv/build \
             -D OPENCV_EXTRA_MODULES_PATH=${GITHUB_WORKSPACE}/opencv_contrib/modules \
-            -D CMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_artifacts
+            -D CMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_artifacts \
+            2>&1 | tee /tmp/opencv-configure.log
+
+      - name: Verify OpenCV cmake features
+        if: steps.opencv-cache.outputs.cache-hit != 'true'
+        run: |
+          log=/tmp/opencv-configure.log
+          fail=0
+          for feature in Tesseract FFMPEG JPEG PNG TIFF WEBP; do
+            val=$(grep -E "^--\s+${feature}:\s+" "$log" | tail -1 | sed -E "s/^.*${feature}:[[:space:]]+//")
+            if [[ -n "$val" ]] && [[ "$val" != NO* ]]; then
+              echo "OK: $feature = $val"
+            else
+              echo "MISSING or DISABLED: $feature"
+              grep -iE "${feature}" "$log" | tail -3 || true
+              fail=1
+            fi
+          done
+          [ "$fail" -eq 0 ]
+
+      - name: Build OpenCV
+        if: steps.opencv-cache.outputs.cache-hit != 'true'
+        run: |
           cmake --build opencv/build -j 3
           cmake --install opencv/build
           sudo ldconfig
@@ -80,11 +103,12 @@ jobs:
           path: |
             ${{ github.workspace }}/opencv_artifacts/include
             ${{ github.workspace }}/opencv_artifacts/lib
-          key: opencv-arm-${{ env.OPENCV_VERSION }}
+          key: opencv-arm-v${{ env.CACHE_VERSION }}-${{ env.OPENCV_VERSION }}-${{ hashFiles('cmake/opencv_build_options.cmake', '.github/workflows/linux-arm.yml') }}
 
       - name: Build OpenCvSharpExtern
         run: |
           cmake \
+            -G Ninja \
             -S src \
             -B src/build \
             -D CMAKE_BUILD_TYPE=Release \
@@ -105,7 +129,7 @@ jobs:
       - name: Install .NET
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '10.0.x'
 
       - name: Create NuGet package
         env: 
@@ -129,8 +153,8 @@ jobs:
       - name: Test
         run: |
           cd ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests
-          dotnet build -c Release -f net8.0
-          cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net8.0/
+          dotnet build -c Release -f net10.0
+          cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net10.0/
           cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/
           sudo cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.so /usr/lib/
-          LD_LIBRARY_PATH=. dotnet test OpenCvSharp.Tests.csproj -c Release -f net8.0 --runtime linux-arm64 --logger "trx;LogFileName=test-results.trx" < /dev/null
+          LD_LIBRARY_PATH=. dotnet test OpenCvSharp.Tests.csproj -c Release -f net10.0 --runtime linux-arm64 --logger "trx;LogFileName=test-results.trx" < /dev/null