Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ares to v143 #53

Merged
merged 10 commits into from
Feb 21, 2025
Merged

Update ares to v143 #53

merged 10 commits into from
Feb 21, 2025

Conversation

BlueInterlude
Copy link
Contributor

@BlueInterlude BlueInterlude commented Feb 18, 2025

  • Update ares to v143
    • Updated buildsystem:
      • Added cmake-ninja to build ares
      • Added module to build Librashader
      • Added module to download shaders from libretro
      • Added module to install the metainfo file
    • Added README with instructions on how to update the cargo-sources.json file for Librashader
    • Added ares-paths.patch to temporarily fix Flatpak not locating the database or shaders folders

Supercedes #43, #51 and #55

Closes #36, #49, #50, and #52

EDIT:

@flathubbot
Copy link
Contributor

Started test build 181719

@flathubbot
Copy link
Contributor

Build 181719 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/164908/dev.ares.ares.flatpakref

@BlueInterlude
Copy link
Contributor Author

@ghisvail

Since the ares Flatpak v142 has some broken functionality (everything that uses the database folder doesn't work, including NES and SNES games) along with shaders not working, it'd be good to either temporarily revert the Flatpak to 141 or review and get this PR merged.

* Updated buildsystem:
    * Added cmake-ninja to build ares
    * Added module to build librashader
    * Added module to download shaders from libretro
    * Added module to install the metainfo file
* Added README with instructions on how to update the `cargo-sources.json` file for Librashader
* Added `ares-paths.patch` to temporarily fix Flatpak not locating the database or shaders folders
    * Working with upstream ares developers for a better resolution, until then use this patch file
@flathubbot
Copy link
Contributor

Started test build 181729

@flathubbot
Copy link
Contributor

Build 181729 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/164923/dev.ares.ares.flatpakref

@flathubbot
Copy link
Contributor

Started test build 181731

@flathubbot
Copy link
Contributor

Build 181731 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/164925/dev.ares.ares.flatpakref

@flathubbot
Copy link
Contributor

Started test build 181734

@flathubbot
Copy link
Contributor

Build 181734 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/164928/dev.ares.ares.flatpakref

@flathubbot
Copy link
Contributor

Started test build 181735

@flathubbot
Copy link
Contributor

Build 181735 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/164929/dev.ares.ares.flatpakref

@flathubbot
Copy link
Contributor

Started test build 181759

@flathubbot
Copy link
Contributor

Build 181759 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/164953/dev.ares.ares.flatpakref

Copy link
Collaborator

@ghisvail ghisvail left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The diff issue on the manifest file needs fixing to finalize the review.

@ghisvail
Copy link
Collaborator

This branch also needs rebasing.

@ghisvail
Copy link
Collaborator

Thanks for looking into it and giving detailed explanations of what's going on. Very much appreciated.

@BlueInterlude
Copy link
Contributor Author

Thanks for looking into it and giving detailed explanations of what's going on. Very much appreciated.

No problem! Should be good to go now.

@flathubbot
Copy link
Contributor

Started test build 181855

@flathubbot
Copy link
Contributor

Build 181855 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/165050/dev.ares.ares.flatpakref

@Mastergatto
Copy link

For this flatpak I suggest to pick also this commit ares-emulator/ares@54c898f that fixes a serious bug in v143 affecting game saves.

@BlueInterlude
Copy link
Contributor Author

For this flatpak I suggest to pick also this commit ares-emulator/ares@54c898f that fixes a serious bug in v143 affecting game saves.

Thank you for the heads up! I updated the manifest to point to that commit instead.

@flathubbot
Copy link
Contributor

Started test build 181904

@flathubbot
Copy link
Contributor

Build 181904 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/165100/dev.ares.ares.flatpakref

@ghisvail
Copy link
Collaborator

I would like this PR to stick to what's required to update to v143.

What @Mastergatto suggested should eventually go to a separate PR following this one, and only include the patch corresponding to the commit.

In general, it is bad practice to package git snapshots since other features in development may still be in flux and not considered stable yet. So either we wait for v144 or include the patch corresponding to 54c898f. That being said if this fix is that serious, it should be a good reason to convince upstream to release a new stable version.

Copy link
Collaborator

@ghisvail ghisvail left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than reverting the source for ares to stable archives, LGTM.

@flathubbot
Copy link
Contributor

Started test build 182088

@flathubbot
Copy link
Contributor

Build 182088 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/165285/dev.ares.ares.flatpakref

@ghisvail ghisvail merged commit 3866911 into flathub:master Feb 21, 2025
1 check passed
@BlueInterlude BlueInterlude deleted the cmake-ares branch February 21, 2025 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing librashader
4 participants