Merge remote-tracking branch 'origin/main' into fuckit

# Conflicts:
#	.github/workflows/linux-build.yml

Author: nicolasnoble

.github/scripts/create-app.sh

@@ -40,6 +40,9 @@ cp pcsx-redux.icns ${APPROOT}/Contents/Resources/AppIcon.icns
 # Remove source images that were used to create the app icon.
 rm -rfv ${APPROOT}/Contents/Resources/share/icons
 
+# Remove temporary image files
+rm -rfv pcsx-redux.iconset pcsx-redux.icns
+
 # Create the required Info.plist and version.plist files
 # with the minimum information.
 PlistBuddy ${APPROOT}/Contents/Info.plist -c "add CFBundleDisplayName string ${APP}"
@@ -54,6 +57,8 @@ PlistBuddy ${APPROOT}/Contents/Info.plist -c "add CFBundleInfoDictionaryVersion
 PlistBuddy ${APPROOT}/Contents/Info.plist -c "add CFBundleName string ${APP}"
 PlistBuddy ${APPROOT}/Contents/Info.plist -c "add CFBundlePackageType string APPL"
 PlistBuddy ${APPROOT}/Contents/Info.plist -c "add NSHumanReadableCopyright string Copyright PCSX-Redux Authors"
+PlistBuddy ${APPROOT}/Contents/Info.plist -c "add LSApplicationCategoryType string public.app-category.games"
+PlistBuddy ${APPROOT}/Contents/Info.plist -c "add LSSupportsGameMode bool true"
 
 PlistBuddy ${APPROOT}/Contents/Info.plist -c "add LSMinimumSystemVersion string 10.15"
 

.github/workflows/linux-aur.yml

@@ -13,15 +13,20 @@ jobs:
       image: archlinux:latest
     steps:
       - name: Install dependencies
-        run: | 
+        run: |
           pacman -Syu --noconfirm --needed capstone curl ffmpeg freetype2 glfw libuv sdl2 zlib git make pkg-config sudo base-devel pacman-contrib
+      - uses: actions/checkout@v3
+        with:
+          set-safe-directory: true
       - name: Create builduser
         run: |
           useradd builduser -m
           passwd -d builduser
       - name: Build AUR Package
         run: |
-          git clone https://aur.archlinux.org/pcsx-redux-git.git
-          chown -R builduser:builduser pcsx-redux-git
-          cd pcsx-redux-git
+          mkdir /build
+          git clone https://aur.archlinux.org/pcsx-redux-git.git /build/pcsx-redux-git
+          chown -R builduser:builduser /build
+          cd /build/pcsx-redux-git
+          sed -i s,git+https://github.com/grumpycoders/pcsx-redux.git,git+file://$GITHUB_WORKSPACE#commit=$GITHUB_SHA,g PKGBUILD
           sudo -u builduser makepkg

.github/workflows/linux-build.yml

@@ -11,6 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/grumpycoders/pcsx-redux-build:latest
+      options: --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined
       env:
         TEST_RESULTS: /tmp/test-results
     steps:
@@ -45,6 +46,7 @@ jobs:
           npx @appdistrib/cli buildid > buildid.json
           git config --global --add safe.directory /__w/pcsx-redux/pcsx-redux
           make install install-openbios DESTDIR=AppDir/usr
+          sed -i s:/usr/bin/:: AppDir/usr/share/applications/pcsx-redux.desktop
           echo '{' > version.json
           echo '  "version": "'`git rev-parse HEAD | cut -c 1-8`'",' >> version.json
           echo '  "buildId": '`jq -r .buildid buildid.json`',' >> version.json
@@ -62,7 +64,8 @@ jobs:
           echo '  ]' >> version.json
           echo '}' >> version.json
           cp version.json AppDir/usr/share/pcsx-redux/resources
-          appimage-builder --skip-tests
+          linuxdeploy -v 3 --appdir=AppDir -e AppDir/usr/bin/pcsx-redux -d AppDir/usr/share/applications/pcsx-redux.desktop -i AppDir/usr/share/icons/hicolor/256x256/apps/pcsx-redux.png -o appimage
+          mv PCSX-Redux-x86_64.AppImage PCSX-Redux-HEAD-x86_64.AppImage
       - run: |
           make -C src/mips/openbios clean
           make -C src/mips/tests -j 2 PCSX_TESTS=true

.github/workflows/linux-toolchain.yml

@@ -26,4 +26,4 @@ jobs:
       - name: Build OpenBIOS with it
         run: make -C src/mips/openbios -j 6 all
       - name: Build psyqo examples with it
-        run: for d in src/mips/psyqo/examples/* src/mips/psyqo-paths/examples/* src/mips/psyqo-lua/examples/* ; do make -C $d -j 6 all TEST=true ; done
+        run: for d in src/mips/psyqo/examples/* src/mips/psyqo-paths/examples/* src/mips/psyqo-lua/examples/*; do if [ -d "$d" ]; then make -C "$d" -j 6 all TEST=true; fi; done

.github/workflows/macos-toolchain.yml

@@ -19,9 +19,11 @@ jobs:
     - uses: n1hility/cancel-previous-runs@v2
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
+    - name: install dependencies
+      run: brew install --verbose nikitabobko/tap/brew-install-path
     - name: build mips binutils
-      run: brew install ./tools/macos-mips/mipsel-none-elf-binutils.rb --debug
+      run: brew install-path --verbose ./tools/macos-mips/mipsel-none-elf-binutils.rb
     - name: build mips gcc
-      run: brew install ./tools/macos-mips/mipsel-none-elf-gcc.rb --debug
+      run: brew install-path --verbose ./tools/macos-mips/mipsel-none-elf-gcc.rb
     - name: build openbios
       run: make -C ./src/mips/openbios

.gitignore

@@ -58,7 +58,7 @@ fb.bat
 
 # macos files
 .DS_store
-
+PCSX-Redux.app
 
 # Savestate files
 *.sstate

Makefile

@@ -270,7 +270,9 @@ install-openbios: openbios
 appimage:
 	rm -rf AppDir
 	DESTDIR=AppDir/usr $(MAKE) $(MAKEOPTS) install
-	appimage-builder --skip-tests
+	sed -i s:/usr/bin/:: AppDir/usr/share/applications/pcsx-redux.desktop
+	linuxdeploy -v 3 --appdir=AppDir -e AppDir/usr/bin/pcsx-redux -d AppDir/usr/share/applications/pcsx-redux.desktop -i AppDir/usr/share/icons/hicolor/256x256/apps/pcsx-redux.png -o appimage
+	mv PCSX-Redux-x86_64.AppImage PCSX-Redux-HEAD-x86_64.AppImage
 
 ifeq ($(CROSS),arm64)
 third_party/luajit/src/libluajit.a:

README.md

@@ -130,8 +130,9 @@ You need MacOS Catalina or later with the latest XCode to build, as well as a fe
 
 Compiling OpenBIOS will require a mips compiler, that you can generate using the following commands:
 ```bash
-brew install ./tools/macos-mips/mipsel-none-elf-binutils.rb
-brew install ./tools/macos-mips/mipsel-none-elf-gcc.rb
+brew install nikitabobko/tap/brew-install-path
+brew install-path ./tools/macos-mips/mipsel-none-elf-binutils.rb
+brew install-path ./tools/macos-mips/mipsel-none-elf-gcc.rb
 ```
 
 Then, you can compile OpenBIOS using `make -C ./src/mips/openbios`.

dockermake-cross.sh

@@ -7,4 +7,4 @@ ROOT=$(pwd)
 cd $CWD
 
 docker pull ghcr.io/grumpycoders/pcsx-redux-build-cross:latest
-docker run --rm --env-file ${ROOT}/cross-env.list -i -w/project${CWD#$ROOT} -v "${ROOT}:/project" -u `id -u`:`id -g` ghcr.io/grumpycoders/pcsx-redux-build-cross make CROSS=arm64 $@
+docker run --rm --env-file ${ROOT}/cross-env.list -i -w/project${CWD#$ROOT} -v "${ROOT}:/project" -u `id -u`:`id -g` --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined ghcr.io/grumpycoders/pcsx-redux-build-cross make CROSS=arm64 $@

dockermake.sh

@@ -7,4 +7,4 @@ ROOT=$(pwd)
 cd $CWD
 
 docker pull ghcr.io/grumpycoders/pcsx-redux-build:latest
-docker run --rm --env-file ${ROOT}/env.list -i -w/project${CWD#$ROOT} -v "${ROOT}:/project" -u `id -u`:`id -g` ghcr.io/grumpycoders/pcsx-redux-build:latest make $@
+docker run --rm --env-file ${ROOT}/env.list -i -w/project${CWD#$ROOT} -v "${ROOT}:/project" -u `id -u`:`id -g` --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined ghcr.io/grumpycoders/pcsx-redux-build:latest make $@