Apra-Labs · joiskash · May 20, 2025 · May 20, 2025 · May 21, 2025 · May 21, 2025
diff --git a/.github/workflows/CI-Linux-CUDA-Docker.yml b/.github/workflows/CI-Linux-CUDA-Docker.yml
@@ -25,7 +25,7 @@ jobs:
   linux-cuda-docker-build-no-test:
     uses: ./.github/workflows/build-test-lin-container.yml
     with:
-      runner: 'ubuntu-20.04'
+      runner: 'ubuntu-22.04'
       flav: Linux-Cuda
       is-selfhosted: false      
       cuda: 'ON'

diff --git a/.github/workflows/CI-Linux-NoCUDA.yml b/.github/workflows/CI-Linux-NoCUDA.yml
@@ -13,7 +13,7 @@ jobs:
   linux-nocuda-build-test:
     uses: ./.github/workflows/build-test-lin.yml
     with:
-      runner: 'ubuntu-20.04'
+      runner: 'ubuntu-22.04'
       flav: Linux
       is-selfhosted: false
       cuda: 'OFF'

diff --git a/.github/workflows/build-test-lin-wsl.yml b/.github/workflows/build-test-lin-wsl.yml
@@ -78,7 +78,7 @@ jobs:
     - name: Prepare WSL Image
       uses: Vampire/setup-wsl@v1
       with:
-        distribution: Ubuntu-20.04
+        distribution: Ubuntu-22.04
     - name: Prepare builder
       run: |
         ${{ inputs.prep-cmd }} 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -72,6 +72,7 @@
         "xstring": "cpp",
         "xtr1common": "cpp",
         "xtree": "cpp",
-        "xutility": "cpp"
+        "xutility": "cpp",
+        "filesystem": "cpp"
     }
 }
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
@@ -17,6 +17,7 @@ ENDIF(ENABLE_LINUX)
 IF(ENABLE_WINDOWS)
 	add_compile_definitions(WINDOWS)
 	set(VCPKG_TARGET_TRIPLET "x64-windows" CACHE STRING "x64-windows")
+	set(VCPKG_PLATFORM_TOOLSET "v143" CACHE STRING "v143" FORCE)
 ENDIF(ENABLE_WINDOWS)
 
 IF(ENABLE_ARM64)
@@ -510,7 +511,7 @@ ENDIF(ENABLE_LINUX)
 add_library(aprapipes STATIC ${SOURCE})
 
 link_directories(${GTK3_LIBRARY_DIRS})
-
+message(STATUS "Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}")
 target_include_directories ( aprapipes PRIVATE 
 	${JETSON_MULTIMEDIA_LIB_INCLUDE}
 	${GTK3_INCLUDE_DIRS}

diff --git a/base/test/archivespacemanager_tests.cpp b/base/test/archivespacemanager_tests.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem/operations.hpp>
 #include "ExternalSourceModule.h"
 #include "ExternalSinkModule.h"
 #include "ArchiveSpaceManager.h"

diff --git a/base/test/test_utils.cpp b/base/test/test_utils.cpp
@@ -4,8 +4,8 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/test/framework.hpp>
 #include "iostream"
-#include <boost/filesystem.hpp>
-#include <fstream>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/fstream.hpp>
 
 #ifndef SAFE_DELETE_ARRAY
 #define SAFE_DELETE_ARRAY(p) \

diff --git a/base/vcpkg-configuration.json b/base/vcpkg-configuration.json
@@ -7,13 +7,5 @@
     "kind": "git",
     "repository": "https://github.com/Apra-Labs/vcpkg.git",
     "baseline": "a1c6d4f053281b8e961c24a0035903f5f9d66329"
-  },
-  "registries": [
-    {
-      "kind": "git",
-      "repository": "https://github.com/Apra-Labs/vcpkg.git",
-      "baseline": "29a017687d56121cb9d200a7dc519c0de2c78a4a",
-      "packages": [ "boost*", "boost-*"]
-    }
-  ]
+  }
 }
diff --git a/base/vcpkg.json b/base/vcpkg.json
@@ -53,6 +53,8 @@
     "boost-test",
     "boost-iostreams",
     "boost-dll",
+    "boost-format",
+    "boost-foreach",
     "nu-book-zxing-cpp",
     "liblzma",
     "bzip2",

diff --git a/build_scripts/build_dependencies_windows_no_cuda.ps1 b/build_scripts/build_dependencies_windows_no_cuda.ps1
@@ -5,13 +5,13 @@ iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/in
 
 # Enable feature and install dependencies
 choco feature enable -n allowEmptyChecksums
-choco install 7zip git python3 cmake pkgconfiglite doxygen.portable graphviz -y
+choco install 7zip git python3 pkgconfiglite doxygen.portable graphviz -y
 
 # Install required Python packages
 pip3 install ninja
 pip3 install meson
 
 # Install cmake
-pip3 install cmake --upgrade
+pip3 install cmake==3.30.0
 
 Write-Host "Dependencies verified and installed successfully."
diff --git a/thirdparty/custom-overlay/whisper/portfile.cmake b/thirdparty/custom-overlay/whisper/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Apra-Labs/whisper.cpp
-    REF c3bff0d121e2af823344939643d64a27e4a76ea2 #v1.5.4
-    SHA512 d51a32c91340d2b9f18bf5221e134e57a0259bc3a1c803ef427adc6e3de5f54c556232cd4ef070b9c07f93968efd942a61cfe311c2cbca013a928f0eb8055e6f  # This is a temporary value. We will modify this value in the next section.
+    REF 779050a5edfb47f115cd1c1c1e010b1c533bf174 #v1.5.4
+    SHA512 fe354506c7377a7a6a783caccd09f1b9333394ada5046fadc77a51b1e2442089b73fcb730cea2ec82d31d205f47426349aa5e6206f294727341a829f90c127bf  # This is a temporary value. We will modify this value in the next section.
     HEAD_REF kj/add-Config-for-vcpkg
     PATCHES "fix-for-arm64.patch"
 )
@@ -19,7 +19,6 @@ if("cuda" IN_LIST FEATURES)
   set(WHISPER_CUBLAS ON)
 endif()
 
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE