Merge pull request #24 from Vladush/feature/opencv-upgrade-static

feat: upgrade OpenCV to 4.12.0 static and cache builds

Author: Vladush

.dockerignore

@@ -6,3 +6,7 @@ build_*
 .cache
 compile_commands.json
 .clang-format
+opencv_static
+cmake-build-*
+.idea
+.vscode

.github/workflows/ci.yml

@@ -61,9 +61,27 @@ jobs:
             libjsoncpp-dev nlohmann-json3-dev v4l-utils \
             libgtest-dev devscripts debhelper dh-cmake
 
+      - name: Cache OpenCV Static
+        id: cache-opencv
+        uses: actions/cache@v4
+        with:
+          path: opencv_static
+          key: ${{ runner.os }}-${{ runner.arch }}-opencv-4.12.0-static-rev1
+
+      - name: Build OpenCV Static
+        if: steps.cache-opencv.outputs.cache-hit != 'true'
+        run: |
+          chmod +x scripts/build_opencv.sh
+          ./scripts/build_opencv.sh
+
       - name: Download models
         run: ./scripts/download_models.sh
 
+      - name: Install models to system
+        run: |
+          sudo mkdir -p /usr/share/linuxcampam/models
+          sudo cp models/*.onnx /usr/share/linuxcampam/models/
+
       - name: Configure
         run: cmake -B build -DCMAKE_BUILD_TYPE=Release
 
@@ -95,13 +113,44 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y \
-            build-essential cmake clang libopencv-dev libpam0g-dev \
-            libjsoncpp-dev nlohmann-json3-dev v4l-utils
+            build-essential cmake libopencv-dev libpam0g-dev \
+            libjsoncpp-dev nlohmann-json3-dev v4l-utils \
+            libgtest-dev devscripts debhelper dh-cmake
+
+      - name: Cache OpenCV Static
+        id: cache-opencv
+        uses: actions/cache@v4
+        with:
+          path: opencv_static
+          key: ${{ runner.os }}-${{ runner.arch }}-opencv-4.12.0-static-clang-rev1
+
+      - name: Build OpenCV Static
+        if: steps.cache-opencv.outputs.cache-hit != 'true'
+        env:
+          CC: clang
+          CXX: clang++
+        run: |
+          chmod +x scripts/build_opencv.sh
+          ./scripts/build_opencv.sh
+
+      - name: Download models
+        run: ./scripts/download_models.sh
+
+      - name: Install models to system
+        run: |
+          sudo mkdir -p /usr/share/linuxcampam/models
+          sudo cp models/*.onnx /usr/share/linuxcampam/models/
 
       - name: Configure
-        run: cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
+        env:
+          CC: clang
+          CXX: clang++
+        run: cmake -B build -DCMAKE_BUILD_TYPE=Release
 
       - name: Build
+        env:
+          CC: clang
+          CXX: clang++
         run: cmake --build build -j$(nproc)
 
       - name: Test
@@ -121,9 +170,27 @@ jobs:
             libjsoncpp-dev nlohmann-json3-dev v4l-utils \
             libgtest-dev devscripts debhelper dh-cmake
 
+      - name: Cache OpenCV Static
+        id: cache-opencv
+        uses: actions/cache@v4
+        with:
+          path: opencv_static
+          key: ${{ runner.os }}-${{ runner.arch }}-opencv-4.12.0-static-rev1
+
+      - name: Build OpenCV Static
+        if: steps.cache-opencv.outputs.cache-hit != 'true'
+        run: |
+          chmod +x scripts/build_opencv.sh
+          ./scripts/build_opencv.sh
+
       - name: Download models
         run: ./scripts/download_models.sh
 
+      - name: Install models to system
+        run: |
+          sudo mkdir -p /usr/share/linuxcampam/models
+          sudo cp models/*.onnx /usr/share/linuxcampam/models/
+
       - name: Configure
         run: cmake -B build -DCMAKE_BUILD_TYPE=Release
 

.gitignore

@@ -62,3 +62,12 @@ models/
 # Python
 __pycache__/
 *.pyc
+
+# Logs
+*.log
+
+# OpenCV (Local build artifacts)
+opencv_static/
+opencv_build/
+opencv-*/
+downloads/

CHANGELOG.md

@@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Faster First Login**: AI models are now pre-loaded when the service starts, rather than waiting for the first user to walk by.
 - **Hardened Validation**: Switched input validation from regex to a strict character-allowlist loop. This isn't visible to users, but it removes a potential ReDoS attack vector and makes path traversal protection bulletproof.
 
+## [0.9.7] - 2026-01-25
+
+### Improved in 0.9.7
+
+- **Upgraded AI Model**: Switched to `YuNet 2023mar` for better face detection accuracy, especially with smaller faces and difficult angles.
+- **Dynamic Resolution**: Removed fixed resizing (320x320) for face detection. The engine now uses the camera's native resolution, which significantly improves detection performance on IR cameras with non-square aspect ratios.
+- **Static Linking**: Upgraded to **OpenCV 4.12.0** (statically linked), removing runtime dependencies and potential conflicts.
+- **Hardware Strategy**: Prioritized **OpenCL 1.2+** as the universal accelerator (AMD/Intel/NVIDIA) to keep the package lightweight (~15MB). Native CUDA/OpenVINO backends are disabled to avoid massive binary bloat (~200MB+), with OpenCL providing near-native performance.
+
 ## [0.9.6] - 2026-01-07
 
 ### Added in 0.9.6

CMakeLists.txt

@@ -1,7 +1,25 @@
 cmake_minimum_required(VERSION 3.14)
-project(LinuxCamPAM VERSION 0.9.6 LANGUAGES C CXX)
+project(LinuxCamPAM VERSION 0.9.7 LANGUAGES C CXX)
+
+# --- Versioning with Git Hash ---
+find_package(Git)
+if(GIT_FOUND)
+    execute_process(
+        COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+        OUTPUT_VARIABLE GIT_HASH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+endif()
+
+if(GIT_HASH)
+    set(FULL_VERSION "${PROJECT_VERSION}+g${GIT_HASH}")
+else()
+    string(TIMESTAMP BUILD_DATE "%Y%m%d")
+    set(FULL_VERSION "${PROJECT_VERSION}+dev${BUILD_DATE}")
+endif()
 
-add_compile_definitions(LINUXCAMPAM_VERSION="${PROJECT_VERSION}")
+add_compile_definitions(LINUXCAMPAM_VERSION="${FULL_VERSION}")
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -25,6 +43,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
 endif()
 
 # --- Dependencies ---
+if(EXISTS "${CMAKE_SOURCE_DIR}/opencv_static/lib/cmake/opencv4")
+    set(OpenCV_DIR "${CMAKE_SOURCE_DIR}/opencv_static/lib/cmake/opencv4")
+endif()
 find_package(OpenCV REQUIRED COMPONENTS core videoio imgproc dnn objdetect photo)
 find_package(Threads REQUIRED)
 
@@ -48,34 +69,31 @@ configure_file(${CMAKE_SOURCE_DIR}/config/config.ini ${CMAKE_BINARY_DIR}/config.
 
 # PAM Module
 add_library(pam_linuxcampam SHARED src/pam/pam_linuxcampam.cpp)
-target_include_directories(pam_linuxcampam PRIVATE include ${PAM_INCLUDE_DIR})
+target_include_directories(pam_linuxcampam PRIVATE include src/common ${PAM_INCLUDE_DIR})
 target_link_libraries(pam_linuxcampam PRIVATE ${PAM_LIBRARY})
 set_target_properties(pam_linuxcampam PROPERTIES PREFIX "") # pam_ modules often don't want strict lib prefix, though standard is usually ok. PAM expects filename to match config.
 
-# Auth Service
-add_executable(linuxcampamd
-    src/service/main.cpp
+# Service Core Library (Shared between Service and Tests)
+add_library(service_core STATIC
     src/service/auth_engine.cpp
-    src/service/auth_engine.hpp
     src/service/camera.cpp
-    src/service/camera.hpp
     src/service/config.cpp
-    src/service/config.hpp
     src/service/utils.cpp
 )
-target_include_directories(linuxcampamd PRIVATE include ${OpenCV_INCLUDE_DIRS})
-target_link_libraries(linuxcampamd PRIVATE 
+target_include_directories(service_core PUBLIC include src src/common ${OpenCV_INCLUDE_DIRS})
+target_link_libraries(service_core PUBLIC 
     ${OpenCV_LIBS} 
     Threads::Threads
     stdc++fs
 )
 
 if(nlohmann_json_FOUND)
-    target_link_libraries(linuxcampamd PRIVATE nlohmann_json::nlohmann_json)
+    target_link_libraries(service_core PUBLIC nlohmann_json::nlohmann_json)
 endif()
-# Always include local include dir for vendored headers
-target_include_directories(linuxcampamd PRIVATE include)
 
+# Auth Service
+add_executable(linuxcampamd src/service/main.cpp)
+target_link_libraries(linuxcampamd PRIVATE service_core)
 
 # CLI Tool
 add_executable(linuxcampam src/cli/main.cpp)
@@ -86,36 +104,57 @@ target_link_libraries(linuxcampam PRIVATE stdc++fs)
 add_executable(check_opencl src/tools/check_opencl.cpp)
 target_link_libraries(check_opencl PRIVATE ${OpenCV_LIBS})
 
+# --- Testing ---
 # --- Testing ---
 enable_testing()
-find_package(GTest)
 
-if(GTest_FOUND)
+include(FetchContent)
+# Handle DOWNLOAD_EXTRACT_TIMESTAMP for CMake 3.24+
+set(GTEST_DOWNLOAD_ARGS "")
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+  set(GTEST_DOWNLOAD_ARGS DOWNLOAD_EXTRACT_TIMESTAMP TRUE)
+endif()
+
+FetchContent_Declare(
+  googletest
+  URL https://github.com/google/googletest/archive/refs/tags/v1.14.0.zip
+  ${GTEST_DOWNLOAD_ARGS}
+)
+
+# Fix for CMP0135 warning in CMake 3.24+
+if(POLICY CMP0135)
+  cmake_policy(SET CMP0135 NEW)
+  # CMake 3.24+ requires explicit timestamp handling for consistency
+  set(FETCHCONTENT_UPDATES_DISCONNECTED_GOOGLETEST ON)
+endif()
+# Prevent overriding the parent project's compiler/linker settings
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+# Disable installation of GoogleTest to prevent conflicts with system packages
+set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
+set(INSTALL_GMOCK OFF CACHE BOOL "" FORCE)
+
+FetchContent_MakeAvailable(googletest)
+
+if(TARGET gtest)
     add_executable(linuxcampam_tests
         tests/main.cpp
         tests/test_auth_config.cpp
         tests/test_model_version.cpp
         tests/test_embeddings.cpp
         tests/test_security.cpp
         tests/test_stability.cpp
-        tests/test_stability.cpp
-        src/service/auth_engine.cpp
-        src/service/camera.cpp
-        src/service/config.cpp
-        src/service/utils.cpp
+        tests/test_camera_detection.cpp
+        tests/test_config_detection.cpp
+        tests/test_auth_logic.cpp
+        tests/test_protocol.cpp
     )
-    # We need to compile auth_engine.cpp without main(), which is fine since main is in main.cpp.
-    # However, auth_engine might have dependencies.
-    target_include_directories(linuxcampam_tests PRIVATE include)
+    
+    # We link against the service_core library to test internal logic without 
+    # duplicating compilation units or pulling in the main service entry point.
     target_link_libraries(linuxcampam_tests PRIVATE 
-        GTest::GTest GTest::Main 
-        ${OpenCV_LIBS} 
-        Threads::Threads
-        stdc++fs
+        gtest gtest_main gmock
+        service_core
     )
-    if(nlohmann_json_FOUND)
-        target_link_libraries(linuxcampam_tests PRIVATE nlohmann_json::nlohmann_json)
-    endif()
 
     add_test(NAME UnitTests COMMAND linuxcampam_tests)
 endif()
@@ -136,14 +175,17 @@ install(FILES ${CMAKE_SOURCE_DIR}/config/config.ini
     DESTINATION /etc/linuxcampam
 )
 
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/models/
+    DESTINATION /usr/share/linuxcampam/models
+    FILES_MATCHING PATTERN "*.onnx"
+)
+
 install(FILES ${CMAKE_SOURCE_DIR}/config/linuxcampam_pam_profile
     DESTINATION /usr/share/pam-configs
     RENAME linuxcampam
 )
 
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/models
-    DESTINATION /etc/linuxcampam
-)
+
 
 install(FILES ${CMAKE_SOURCE_DIR}/scripts/linuxcampam.service
     DESTINATION /lib/systemd/system
@@ -168,8 +210,9 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Vladimir Orlinski")
 
 set(CPACK_GENERATOR "DEB")
 # Runtime dependencies (not -dev packages) for Ubuntu 24.04
-# OpenCV 4.6 runtime libs, PAM, and utilities
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libopencv-core406t64, libopencv-imgproc406t64, libopencv-objdetect406t64, libopencv-dnn406t64, libopencv-videoio406t64, libopencv-photo406t64, libpam0g, libpam-runtime, v4l-utils, systemd")
+# Runtime dependencies (not -dev packages) for Ubuntu 24.04
+# OpenCV is statically linked, so we don't need libopencv-* packages
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libpam0g, libpam-runtime, v4l-utils, systemd, libgfortran5, libatlas3-base")
 
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/debian/postinst")
 

CONTRIBUTING.md

@@ -30,6 +30,10 @@ See the [README.md](README.md) for full installation instructions.
 ### Quick Build for Devs
 
 ```bash
+# 1. Build Static Dependencies (Required once)
+./scripts/build_opencv.sh
+
+# 2. Build Project
 mkdir build && cd build
 cmake .. -DENABLE_TESTING=ON
 make