Merge remote-tracking branch 'upstream/master' into merge-upstream

.gitattributes

@@ -15,10 +15,7 @@ src/external/* -diff linguist-vendored
 src/midiprogram.h -diff linguist-vendored
 src/midisequencer.* -diff linguist-vendored
 src/midisynth.* -diff linguist-vendored
-src/picojson.h -diff linguist-vendored
 CMakePresets.json -diff linguist-generated
-builds/android/app/src/main/java/org/libsdl/app/SDL*.java -diff linguist-vendored
+builds/android/app/src/main/java/org/libsdl/app/*.java -diff linguist-vendored
 builds/android/app/src/main/java/org/libsdl/app/SDLActivity.java diff
-builds/android/app/src/main/java/org/libsdl/app/SDLSurface.java diff
-builds/android/app/src/main/java/org/libsdl/app/HID*.java -diff linguist-vendored
 src/generated/* -diff linguist-generated

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: monthly
+    labels:
+      - "Building"
+    #reviewers:
+    #  - carstene1ns
+    commit-message:
+      prefix: "CI"

.github/gcc_comment_matcher.json

@@ -0,0 +1,17 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "gcc-problem-matcher",
+            "pattern": [
+                {
+                    "regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "message": 5
+                }
+            ]
+        }
+    ]
+}

.github/labeler.yml

@@ -0,0 +1,98 @@
+#
+# See https://github.com/actions/labeler
+# and workflows/pr_labels.yml for reference
+#
+
+Building:
+- changed-files:
+  - any-glob-to-any-file:
+    - .github/**
+    - CMakeLists.txt
+    - builds/**
+    - '!builds/android/app/**'
+    - Makefile.am
+    - configure.ac
+
+Documentation:
+- changed-files:
+  - any-glob-to-any-file:
+    - docs/**
+    - '**/*.md'
+    - '**/*.adoc'
+    - src/docmain.h
+    - '**/Doxyfile*'
+    - resources/unix/*.metainfo.xml
+
+Tests:
+- changed-files:
+  - any-glob-to-any-file: [ tests/** ]
+
+Window/Scenes:
+- changed-files:
+  - any-glob-to-any-file: [ src/**/window_*, src/**/scene_* ]
+
+# misc
+
+Audio:
+- changed-files:
+  - any-glob-to-any-file: [ src/**/*audio* ]
+
+FileFinder:
+- changed-files:
+  - any-glob-to-any-file: [ src/**/filefinder*, src/**/filesystem* ]
+
+Fonts:
+- changed-files:
+  - any-glob-to-any-file:
+    - resources/exfont.png
+    - resources/ttyp0/**
+    - resources/shinonome/**
+    - resources/wenquanyi/**
+    - src/**/*font*
+    - src/generated/bitmapfont_*
+
+MIDI:
+- changed-files:
+  - any-glob-to-any-file: [ src/**/*midi* ]
+
+# platforms
+
+3DS:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/3ds/**, resources/3ds/** ]
+
+Android:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/android/**, builds/android/app/** ]
+
+Emscripten:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/emscripten/**, resources/emscripten/** ]
+
+libretro:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/libretro/** ]
+
+macOS:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/macos/**, resources/macos/** ]
+
+PSVita:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/psvita/**, resources/psvita/** ]
+
+Switch:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/switch/**, resources/switch/** ]
+
+Wii:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/wii/**, resources/wii/** ]
+
+WiiU:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/wiiu/**, resources/wiiu/** ]
+
+Win32:
+- changed-files:
+  - any-glob-to-any-file: [ src/platform/windows/**, resources/windows/** ]

.github/workflows/pr_labels.yml

@@ -0,0 +1,27 @@
+name: "Label Pull Requests"
+on:
+  pull_request_target:
+    types: [opened, ready_for_review]
+
+jobs:
+  update:
+    permissions:
+      contents: read
+      pull-requests: write
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+        with:
+           # pull_request_target is run under forks, use main repo source
+           fetch-depth: 0
+           repository: EasyRPG/Player
+           ref: master
+
+      - name: Update labels
+        uses: actions/labeler@v5
+        with:
+          sync-labels: true
+          dot: true

.github/workflows/stable-compilation.yml

@@ -42,9 +42,10 @@ jobs:
           apt-get update
           apt-get install -yqq --no-install-recommends --no-install-suggests \
             ca-certificates build-essential cmake ninja-build git \
-            libicu-dev libexpat1-dev libsdl2-dev libpng-dev libpixman-1-dev \
-            libfmt-dev libfreetype6-dev libharfbuzz-dev libmpg123-dev \
-            libsndfile-dev libvorbis-dev libopusfile-dev libspeexdsp-dev \
+            libicu-dev libexpat1-dev libinih-dev nlohmann-json3-dev \
+            libsdl2-dev libpng-dev libpixman-1-dev libfmt-dev \
+            libfreetype6-dev libharfbuzz-dev libmpg123-dev libsndfile-dev \
+            libvorbis-dev libopusfile-dev libspeexdsp-dev \
             libdrm-dev libgbm-dev # only needed for sdl2 on debian 11
 
       - name: Clone Repository
@@ -56,6 +57,9 @@ jobs:
         with:
           ref: ${{ github.event.inputs.git-ref }}
 
+      - name: Use gcc problem matcher
+        run: echo "::add-matcher::.github/gcc_comment_matcher.json"
+
       - name: Compile
         run: |
           VER="(GA, `date +%Y-%m-%d`)"