chore: sync upstream

.clang-format

@@ -21,7 +21,7 @@ AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortLambdasOnASingleLine: Inline
-AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
@@ -35,6 +35,8 @@ BraceWrapping:
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
+  AfterNamespace: true
+  AfterClass: true
 BreakBeforeBinaryOperators: None
 BreakBeforeInheritanceComma: false
 BreakInheritanceList: BeforeColon
@@ -44,7 +46,7 @@ BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: false
 CommentPragmas: '^ IWYU pragma:'
 CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
+PackConstructorInitializers: BinPack
 Cpp11BracedListStyle: false
 DerivePointerAlignment: false
 DisableFormat: false

.github/workflows/camera-test-rpicam-apps.yml

@@ -0,0 +1,49 @@
+name: Camera Tests
+
+on:
+  pull_request_target:
+    branches: [main]
+
+permissions:
+  statuses: write
+
+jobs:
+  trigger-camera-tests:
+    runs-on: [self-hosted, camera-test-bridge]
+    environment: ${{ github.event.pull_request.head.repo.full_name == github.repository && '' || 'camera-test' }}
+    timeout-minutes: 120
+    steps:
+      - name: Checkout camera_tester
+        env:
+          CAMERA_TESTER_URL: ${{ secrets.CAMERA_TESTER_URL }}
+          CAMERA_TESTER_PROJECT_ID: ${{ vars.CAMERA_TESTER_PROJECT_ID }}
+          CAMERA_TESTER_API_TOKEN: ${{ secrets.CAMERA_TESTER_API_TOKEN }}
+        run: |
+          CLONE_URL=$(curl -sf -H "PRIVATE-TOKEN: ${CAMERA_TESTER_API_TOKEN}" \
+            "${CAMERA_TESTER_URL}/api/v4/projects/${CAMERA_TESTER_PROJECT_ID}" \
+            | python3 -c "import sys, json; print(json.load(sys.stdin)['http_url_to_repo'])")
+          AUTH_URL="${CLONE_URL/https:\/\//https://oauth2:${CAMERA_TESTER_API_TOKEN}@}"
+          find . -mindepth 1 -delete 2>/dev/null || true
+          git clone --depth 1 "$AUTH_URL" .
+
+      - name: Install camera_tester
+        run: |
+          python3 -m venv .venv
+          . .venv/bin/activate
+          pip install -e .
+
+      - name: Run bridge
+        env:
+          LIBRARY: rpicam-apps
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
+          GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
+          GITHUB_BASE_REF: ${{ github.base_ref }}
+          CAMERA_TESTER_URL: ${{ secrets.CAMERA_TESTER_URL }}
+          CAMERA_TESTER_PROJECT_ID: ${{ vars.CAMERA_TESTER_PROJECT_ID }}
+          CAMERA_TESTER_TRIGGER_TOKEN: ${{ secrets.CAMERA_TESTER_TRIGGER_TOKEN }}
+          CAMERA_TESTER_API_TOKEN: ${{ secrets.CAMERA_TESTER_API_TOKEN }}
+        run: |
+          . .venv/bin/activate
+          python -m camera_tester.bridge

.github/workflows/gen_orig.yml

@@ -19,14 +19,22 @@ jobs:
           sudo cp /usr/lib/x86_64-linux-gnu/pkgconfig/{,lib}camera.pc ||:
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Generate tarball
+      - name: Generate tarballs
         run: |
           PATH="${HOME}/.local/bin:${PATH}"
+          TARBALL="rpicam-apps-${GITHUB_REF_NAME:1}.tar.xz"
           meson setup build
           meson dist --no-tests --include-subprojects -C build
-      - name: Release tarball
-        uses: softprops/action-gh-release@v1
+          if ! [ -f "build/meson-dist/$TARBALL" ]; then
+            echo "Expected tarball not found - $TARBALL"
+            echo "Does 'version' in meson.build match the tag?"
+            exit 1
+          fi
+          mv "build/meson-dist/$TARBALL" rpicam-apps_${GITHUB_REF_NAME:1}.orig.tar.xz
+      - name: Release tarballs
+        uses: softprops/action-gh-release@v2
         with:
-          files: build/meson-dist/*.tar.xz
+          files: |
+            *.tar.xz
       - if: failure()
         run: cat build/meson-logs/meson-log.txt

.github/workflows/rpicam-apps-pre-commit-checker.yml

@@ -0,0 +1,17 @@
+name: rpicam-apps pre-commit checker
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  style-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+      - name: Run pre-commit
+        uses: pre-commit/action@v3.0.1
+        with:
+          extra_args: --all-files --show-diff-on-failure