Merge with upstream

.editorconfig

@@ -11,7 +11,7 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.{sh,rb,js,yml,yaml,adoc}]
+[{*.{sh,rb,js,yml,yaml,adoc},configure}]
 indent_style = space
 indent_size = 2
 

.gitattributes

@@ -6,16 +6,30 @@
 *.py      text
 *.rb      text
 *.sh      text
-*.ac      text
-*.am      text
+*.bat     text eol=crlf
 
+# external sources
 tests/doctest.h -diff linguist-vendored
-builds/autoconf/m4/ax_*.m4 -diff linguist-vendored
 src/external/* -diff linguist-vendored
 src/midiprogram.h -diff linguist-vendored
 src/midisequencer.* -diff linguist-vendored
 src/midisynth.* -diff linguist-vendored
 CMakePresets.json -diff linguist-generated
-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
 src/generated/* -diff linguist-generated
+
+.gitattributes export-ignore
+.gitignore export-ignore
+/.github/ export-ignore
+/.tx/ export-ignore
+.editorconfig export-ignore
+/builds/cmake/.git-hash export-subst
+
+#TODO? .gitmodules export-ignore
+#TODO? /builds/libretro/ export-ignore
+
+#TODO: Android is usually built from git, but maybe keep it (e.g. f-droid)?
+/builds/android/ export-ignore
+/builds/flatpak/ export-ignore
+/builds/snap/ export-ignore
+/builds/release-helper.sh export-ignore
+/builds/make-dist.sh export-ignore

.github/config.markdownlint-cli2.jsonc

@@ -0,0 +1,8 @@
+{
+	"config": {
+		// MD012/no-multiple-blanks : Allow 2 consecutive blank lines
+		"no-multiple-blanks": {
+			"maximum": 2
+		}
+	}
+}

.github/workflows/compile-test.yml

@@ -0,0 +1,70 @@
+name: Compile Test
+
+on:
+  push:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref  }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  check:
+    name: check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -yqq --no-install-recommends --no-install-suggests \
+            build-essential cmake ninja-build git ca-certificates ccache
+          sudo pip3 install meson
+
+      - uses: actions/checkout@v6
+      - name: Checkout buildscripts
+        uses: actions/checkout@v6
+        with:
+          repository: EasyRPG/buildscripts
+          path: buildscripts
+
+      - name: Get buildscripts commit hash
+        id: buildscripts-hash
+        working-directory: buildscripts
+        run: |
+          echo "hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Cache Emscripten toolchain and libraries
+        id: cache
+        uses: actions/cache@v5
+        with:
+          path: |
+            buildscripts/emscripten/emsdk-portable
+            buildscripts/emscripten/bin
+            buildscripts/emscripten/lib
+            buildscripts/emscripten/include
+          key: easyrpg-emscripten-${{ steps.buildscripts-hash.outputs.hash }}-${{ runner.os }}
+          restore-keys: |
+            easyrpg-emscripten-${{ steps.buildscripts-hash.outputs.hash }}-
+            easyrpg-emscripten-
+
+      - name: Install Player dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: bash 0_build_everything.sh
+        working-directory: buildscripts/emscripten
+        env:
+          BUILD_LIBLCF: "1"
+
+      - run: cmake --preset yno-simd-release
+        env:
+          EASYRPG_BUILDSCRIPTS: "${{ github.workspace }}/buildscripts"
+      - run: cmake --build --preset yno-simd-release
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: easyrpg-player-wasm
+          path: build/yno-simd-release/*.{html,js,wasm}
+          if-no-files-found: warn

.github/workflows/linter.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -19,7 +19,7 @@ jobs:
           pip install yamllint
           pip install cmakelint
 
-      - uses: tj-actions/changed-files@v46
+      - uses: tj-actions/changed-files@v47
         if: '!cancelled()'
         id: changed-files-yaml
         with:
@@ -33,7 +33,7 @@ jobs:
             ${{ steps.changed-files-yaml.outputs.all_changed_files }}
           # we often have extra long lines, so relaxing the check (from 80)
 
-      - uses: tj-actions/changed-files@v46
+      - uses: tj-actions/changed-files@v47
         if: '!cancelled()'
         id: changed-files-cmake
         with:
@@ -48,15 +48,16 @@ jobs:
           # we often have extra long lines, so relaxing the check (from 80)
           # also do not warn about tabstops
 
-      - uses: tj-actions/changed-files@v46
+      - uses: tj-actions/changed-files@v47
         if: '!cancelled()'
         id: changed-files-md
         with:
           files: '**/*.md'
           separator: ","
       - name: Lint Markdown files
         if: steps.changed-files-md.outputs.any_changed == 'true'
-        uses: DavidAnson/markdownlint-cli2-action@v20
+        uses: DavidAnson/markdownlint-cli2-action@v23
         with:
+          config: '.github/config.markdownlint-cli2.jsonc'
           globs: ${{ steps.changed-files-md.outputs.all_changed_files }}
           separator: ","

.github/workflows/pr_labels.yml

@@ -5,6 +5,7 @@ on:
 
 jobs:
   update:
+    if: false
     permissions:
       contents: read
       pull-requests: write
@@ -13,15 +14,15 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         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
+        uses: actions/labeler@v6
         with:
           sync-labels: true
           dot: true

.github/workflows/stable-compilation.yml

@@ -19,6 +19,7 @@ defaults:
 
 jobs:
   docker:
+    if: false
     name: ${{ matrix.image }} (${{ matrix.os.arch }})
     runs-on: ${{ matrix.os.name }}
     container:
@@ -61,10 +62,10 @@ jobs:
             libdrm-dev libgbm-dev # only needed for sdl2 on debian 11
 
       - name: Clone Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         if: github.event.inputs.git-ref == ''
       - name: Clone Repository (with custom ref)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         if: github.event.inputs.git-ref != ''
         with:
           ref: ${{ github.event.inputs.git-ref }}
@@ -78,6 +79,7 @@ jobs:
           cmake -G Ninja -B build . \
             -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \
             -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wdeprecated -fsanitize=address,undefined" \
+            -DPLAYER_TARGET_PLATFORM=SDL2 \
             -DPLAYER_BUILD_LIBLCF=ON -DPLAYER_VERSION_APPEND="$VER"
           cmake --build build
 

.gitignore

@@ -1,5 +1,3 @@
-/bin/
-/Makefile
 /easyrpg-player
 /Player.app
 *.a
@@ -9,34 +7,8 @@
 *.orig
 *.bak
 
-# autotools
-/autom4te.cache/
-/easyrpg-player-*/
-/.libs/
-.deps/
-/_deps
-Makefile.in
-aclocal.m4
-config.h
-config.h.in
-config.status
-configure
-libtool
-/builds/autoconf/aux/
-/builds/autoconf/m4/*.m4
-!/builds/autoconf/m4/ax_*.m4
-!/builds/autoconf/m4/with_pkg.m4
-stamp-h1
-.dirstamp
-*.la
-*.lo
-/output
-/utils
-/directorytree
-/.version-append
-/.version-git
-
 # cmake
+/Makefile
 CMakeFiles/
 CMakeScripts/
 CMakeCache.txt
@@ -89,10 +61,10 @@ build/
 # test/run artifacts
 easyrpg_log.txt
 /*.log
-/*.trs
 Testing/
 
 # distribution archives
+/easyrpg-player-*/
 easyrpg-player-*.tar.*
 *.zip
 
@@ -110,13 +82,13 @@ __MACOSX
 /RelWithDebInfo/
 /*.build/
 
-# legacy
+# legacy, used for PLAYER_BUILD_LIBLCF
 /lib/liblcf/
-.buildconfig
 
 # Android
 *.iml
 local.properties
+*.aar
 
 # libretro
 easyrpg_libretro.*
@@ -140,6 +112,10 @@ eboot.bin
 *.vpk
 *.velf
 
+# ps4
+*.prx
+*.sprx
+
 # flatpak
 /.flatpak-builder