From 8684d62c31f68bc89ec9c9c081dc9ba32f19f02c Mon Sep 17 00:00:00 2001 From: Samuel <36420837+Samueru-sama@users.noreply.github.com> Date: Sat, 25 Oct 2025 01:25:22 -0400 Subject: [PATCH 1/4] use common packages instead (#24) --- get-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/get-dependencies.sh b/get-dependencies.sh index 911ce33..a833aee 100644 --- a/get-dependencies.sh +++ b/get-dependencies.sh @@ -38,7 +38,7 @@ echo "Installing debloated packages..." echo "---------------------------------------------------------------" wget --retry-connrefused --tries=30 "$EXTRA_PACKAGES" -O ./get-debloated-pkgs.sh chmod +x ./get-debloated-pkgs.sh -./get-debloated-pkgs.sh --add-mesa gtk3-mini opus-mini libxml2-mini gdk-pixbuf2-mini +./get-debloated-pkgs.sh --add-common # Make librashader echo "Making extra dependencies..." From 243b45b5ca1cc1ee0bf258aced1971f770de71f2 Mon Sep 17 00:00:00 2001 From: Samuel <36420837+Samueru-sama@users.noreply.github.com> Date: Wed, 29 Oct 2025 04:28:22 -0400 Subject: [PATCH 2/4] update ares build process (#26) * update build process * `ARES_BUNDLE_SHADERS=ON` * should not be needed anymore * add `libretro-shaders-slang` --- ares-appimage.sh | 21 ++++++------------- get-dependencies.sh | 50 ++++++++++++++++++++++----------------------- 2 files changed, 31 insertions(+), 40 deletions(-) diff --git a/ares-appimage.sh b/ares-appimage.sh index 61e273f..38adeed 100644 --- a/ares-appimage.sh +++ b/ares-appimage.sh @@ -24,21 +24,17 @@ fi # BUILD ARES ( cd ./ares - - # backport fix from aur package - sed -i \ - "s/virtual auto saveName() -> string { return pak->attribute(\"name\"); }/virtual auto saveName() -> string { return name(); }/g" \ - ./mia/pak/pak.hpp - mkdir ./build cd ./build cmake .. -G Ninja \ -W no-dev \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_CCACHE=ON \ + -D CMAKE_BUILD_TYPE=Release \ + -D ENABLE_CCACHE=ON \ + -D ARES_BUNDLE_SHADERS=ON \ + -D ARES_BUILD_LOCAL=OFF \ -D CMAKE_INSTALL_PREFIX="/usr" \ - -D ARES_BUILD_OFFICIAL=YES \ - -D ARES_SKIP_DEPS=ON \ + -D ARES_BUILD_OFFICIAL=YES  \ + -D ARES_SKIP_DEPS=ON \ --fresh cmake --build . -j"$(nproc)" cmake --install . @@ -58,11 +54,6 @@ export ICON=/usr/share/icons/hicolor/256x256/apps/ares.png export DEPLOY_OPENGL=1 export DEPLOY_PIPEWIRE=1 -# "fix" xvfb-run failing to kill the process in aarch64 -if [ "$ARCH" = "aarch64" ]; then - sed -i 's#kill $XVFBPID#kill $XVFBPID || true#' "$(command -v xvfb-run)" -fi - # ADD LIBRARIES wget --retry-connrefused --tries=30 "$SHARUN" -O ./quick-sharun chmod +x ./quick-sharun diff --git a/get-dependencies.sh b/get-dependencies.sh index a833aee..fa8b0c7 100644 --- a/get-dependencies.sh +++ b/get-dependencies.sh @@ -6,31 +6,31 @@ EXTRA_PACKAGES="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImage echo "Installing dependencies..." echo "---------------------------------------------------------------" pacman -Syu --noconfirm \ - base-devel \ - cmake \ - ccache \ - curl \ - gcc-libs \ - git \ - gtk3 \ - libao \ - libdecor \ - libpulse \ - libretro-shaders \ - libx11 \ - libxrandr \ - libxss \ - ninja \ - openal \ - pipewire-audio \ - pkgconf \ - pulseaudio \ - pulseaudio-alsa \ - rust \ - sdl3 \ - wget \ - xorg-server-xvfb \ - zlib \ + base-devel \ + cmake \ + ccache \ + curl \ + gcc-libs \ + git \ + gtk3 \ + libao \ + libdecor \ + libpulse \ + libretro-shaders-slang \ + libx11 \ + libxrandr \ + libxss \ + ninja \ + openal \ + pipewire-audio \ + pkgconf \ + pulseaudio \ + pulseaudio-alsa \ + rust \ + sdl3 \ + wget \ + xorg-server-xvfb \ + zlib \ zsync From 4d8bc60d38b8bf80b23d41a04da071d89e15b095 Mon Sep 17 00:00:00 2001 From: Samuel <36420837+Samueru-sama@users.noreply.github.com> Date: Thu, 6 Nov 2025 10:44:42 -0400 Subject: [PATCH 3/4] simplify appimage creation (#27) --- ares-appimage.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ares-appimage.sh b/ares-appimage.sh index 38adeed..57298d6 100644 --- a/ares-appimage.sh +++ b/ares-appimage.sh @@ -44,9 +44,8 @@ rm -rf ./ares [ -n "$VERSION" ] && echo "$VERSION" > ~/version # NOW MAKE APPIMAGE -URUNTIME="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/uruntime2appimage.sh" SHARUN="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/quick-sharun.sh" - +export OUTPUT_APPIMAGE=1 export ADD_HOOKS="self-updater.bg.hook" export OUTNAME=ares-"$VERSION"-anylinux-"$ARCH".AppImage export DESKTOP=/usr/share/applications/ares.desktop @@ -59,11 +58,6 @@ wget --retry-connrefused --tries=30 "$SHARUN" -O ./quick-sharun chmod +x ./quick-sharun ./quick-sharun /usr/bin/ares /usr/bin/sourcery -# turn appdir into appimage -wget --retry-connrefused --tries=30 "$URUNTIME" -O ./uruntime2appimage -chmod +x ./uruntime2appimage -./uruntime2appimage - mkdir -p ./dist mv -v ./*.AppImage* ./dist From a2576d5f5d7fa62048ce58fc98b3ea800da09d5d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Nov 2025 16:15:43 +0000 Subject: [PATCH 4/4] chore(deps): update actions/upload-artifact action to v5 --- .github/workflows/nightly.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7927a55..b0b7709 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -55,13 +55,13 @@ jobs: echo "APP_VERSION=$(cat ~/version)" >> "${GITHUB_ENV}" - name: Upload artifact - uses: actions/upload-artifact@v4.6.2 + uses: actions/upload-artifact@v5.0.0 with: name: AppImage-${{ matrix.arch }} path: 'dist' - name: Upload version file - uses: actions/upload-artifact@v4.6.2 + uses: actions/upload-artifact@v5.0.0 with: name: version path: ~/version diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1cd98c2..8713321 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,13 +49,13 @@ jobs: run: chmod +x ./ares-appimage.sh && ./ares-appimage.sh - name: Upload artifact - uses: actions/upload-artifact@v4.6.2 + uses: actions/upload-artifact@v5.0.0 with: name: AppImage-${{ matrix.arch }} path: 'dist' - name: Upload version file - uses: actions/upload-artifact@v4.6.2 + uses: actions/upload-artifact@v5.0.0 with: name: version path: ~/version