Switch wolfssl to external registry and update build config (#735)

* Switch wolfssl to external registry and update build config

Removed the local wolfssl overlay port and updated vcpkg-configuration.json to use an external registry for wolfssl and libpng. Updated vcpkg triplets to add -fvisibility flags for better symbol visibility control. Modified the GitHub Actions workflow to use a custom vcpkg binary cache and removed NuGet credential setup steps. Also updated .gitignore to exclude the removed overlay-ports directory.

* Update build-project.yaml

* Update vcpkg-configuration.json

* Update OpenCV4 features in vcpkg.json and config

Removed 'opencv4' from the custom registry in vcpkg-configuration.json and added specific image format features (jpeg, png, tiff, webp) to the opencv4 package in vcpkg.json. This ensures OpenCV is built with support for these formats.

Author: umireon

.github/workflows/build-project.yaml

@@ -26,10 +26,9 @@ on:
 
 permissions:
   contents: read
-  packages: read
 
 env:
-  VCPKG_BINARY_SOURCES: "clear;nuget,https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json,read"
+  VCPKG_BINARY_SOURCES: "clear;http,https://vcpkg-obs.kaito.tokyo/{name}/{version}/{sha}"
   VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
 
 jobs:
@@ -170,19 +169,6 @@ jobs:
       - name: Bootstrap vcpkg
         working-directory: ${{ env.VCPKG_ROOT }}
         run: ./bootstrap-vcpkg.sh
-      
-      - name: Install mono
-        run: brew install mono
-
-      - name: "Setup NuGet Credentials"
-        run: |
-          NUGET_PATH="$($VCPKG_ROOT/vcpkg fetch nuget | tail -n1)"
-          mono "$NUGET_PATH" sources add \
-            -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" \
-            -StorePasswordInClearText \
-            -Name "GitHub" \
-            -UserName "${{ github.repository_owner }}" \
-            -Password "${{ secrets.GITHUB_TOKEN }}"
 
       - name: "Install dependencies from vcpkg"
         run: ".github/scripts/install-vcpkg-macos.bash"
@@ -276,21 +262,6 @@ jobs:
       - name: Bootstrap vcpkg
         working-directory: ${{ env.VCPKG_ROOT }}
         run: ./bootstrap-vcpkg.sh
-      
-      - name: Install mono
-        run: sudo apt-get -y install mono-devel
-
-      - name: "Setup NuGet Credentials"
-        run: |
-          NUGET_PATH="$($VCPKG_ROOT/vcpkg fetch nuget | tail -n1)"
-          mono "$NUGET_PATH" sources add \
-            -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" \
-            -StorePasswordInClearText \
-            -Name "GitHub" \
-            -UserName "${{ github.repository_owner }}" \
-            -Password "${{ secrets.GITHUB_TOKEN }}"
-          mono "$NUGET_PATH" setapikey "${{ secrets.GITHUB_TOKEN }}" \
-            -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
 
       - name: "Install dependencies from vcpkg"
         run: "$VCPKG_ROOT/vcpkg install --triplet x64-linux-obs"
@@ -376,20 +347,6 @@ jobs:
         run: |
           .\bootstrap-vcpkg.bat
 
-      - name: "Setup NuGet Credentials on Windows"
-        shell: pwsh
-        run: |
-          $NUGET_EXE_PATH = & "${{ env.VCPKG_ROOT }}/vcpkg" fetch nuget | Select-Object -Last 1
-          
-          & $NUGET_EXE_PATH sources add `
-            -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" `
-            -StorePasswordInClearText `
-            -Name "GitHub" `
-            -UserName "${{ github.repository_owner }}" `
-            -Password "${{ secrets.GITHUB_TOKEN }}"
-          & $NUGET_EXE_PATH setapikey "${{ secrets.GITHUB_TOKEN }}" `
-            -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
-
       - name: "Install dependencies from vcpkg"
         shell: bash
         run: "$VCPKG_ROOT/vcpkg install --triplet x64-windows-static-md-obs"
@@ -456,20 +413,6 @@ jobs:
         run: |
           .\bootstrap-vcpkg.bat
 
-      - name: "Setup NuGet Credentials on Windows"
-        shell: pwsh
-        run: |
-          $NUGET_EXE_PATH = & "${{ env.VCPKG_ROOT }}/vcpkg" fetch nuget | Select-Object -Last 1
-          
-          & $NUGET_EXE_PATH sources add `
-            -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" `
-            -StorePasswordInClearText `
-            -Name "GitHub" `
-            -UserName "${{ github.repository_owner }}" `
-            -Password "${{ secrets.GITHUB_TOKEN }}"
-          & $NUGET_EXE_PATH setapikey "${{ secrets.GITHUB_TOKEN }}" `
-            -Source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
-
       - name: "Install dependencies from vcpkg"
         shell: bash
         run: "$VCPKG_ROOT/vcpkg install --triplet x64-windows-static-md-obs"

.gitignore

@@ -9,7 +9,6 @@
 !/docs
 !/pages
 !/src
-!/vcpkg-overlay-ports
 !/vcpkg-triplets
 !.clang-format
 !.cmake-format.json

vcpkg-configuration.json

@@ -2,11 +2,19 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
   "default-registry": {
     "kind": "git",
-    "baseline": "b27f6bfad367d64f8f0f3296351c5d246e182bb4",
+    "baseline": "cfcbdb245f1179a5a493890a0b69531d66969e62",
     "repository": "https://github.com/microsoft/vcpkg"
   },
-  "overlay-ports": [
-    "./vcpkg-overlay-ports"
+  "registries": [
+    {
+      "kind": "git",
+      "baseline": "901fdb51caca7b97a3fb37810642dc28631ece49",
+      "repository": "https://github.com/kaito-tokyo/vcpkg-obs-kaito-tokyo",
+      "packages": [
+        "libpng",
+        "wolfssl"
+      ]
+    }
   ],
   "overlay-triplets": [
     "./vcpkg-triplets"

vcpkg-overlay-ports/wolfssl/portfile.cmake

@@ -6,3 +6,5 @@ set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
 set(VCPKG_OSX_ARCHITECTURES arm64)
 
 set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")
+set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -fvisibility=hidden")
+set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")

vcpkg-overlay-ports/wolfssl/vcpkg.json

@@ -4,5 +4,5 @@ set(VCPKG_LIBRARY_LINKAGE static)
 
 set(VCPKG_CMAKE_SYSTEM_NAME Linux)
 
-set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -mavx2")
-set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -mavx2")
+set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -mavx2 -fvisibility=hidden")
+set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -mavx2 -fvisibility=hidden -fvisibility-inlines-hidden")

vcpkg-triplets/arm64-osx-obs.cmake

@@ -6,5 +6,5 @@ set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
 set(VCPKG_OSX_ARCHITECTURES x86_64)
 
 set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")
-set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -mavx2")
-set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -mavx2")
+set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -mavx2 -fvisibility=hidden")
+set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -mavx2 -fvisibility=hidden -fvisibility-inlines-hidden")

vcpkg-triplets/x64-linux-obs.cmake

@@ -19,7 +19,13 @@
     },
     {
       "name": "opencv4",
-      "default-features": false
+      "default-features": false,
+      "features": [
+        "jpeg",
+        "png",
+        "tiff",
+        "webp"
+      ]
     }
   ]
 }