Emulation Station: update to 2.11.2 #46412
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
namgo
changed the title
namgo
force-pushed
the
namgo/EmulationStation-Fix-Unfound-Files
branch
from
80e0048
to
98a47fc
Compare
|
So this package currently ships /usr/lib/libpugixml.a which libSavitar (3mf loader) also provides. pugixml has a known conflict with both of these packages. How should I proceed? |
|
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Testing the changes
Local build testing
Seems to compile on armv6l.
The changes were tested exclusively on x86_64-glibc.
This change MAY break for other libs/arch's as it removes the patch to include ctime since the upstream adds time.h, if that happens I'll restore the patch - it seemed to work fine as I was testing it without the patch.
I imported RetroPie/EmulationStation#618 as was recommended by RetroPie/EmulationStation#819 with the intention being able to find installed data-files outside of the user's home directory.
The other change I made was to add files from the installer that typically go to a user's $HOME into /usr/share/EmulationStation/ to work with the patch.
This is intended to address #44861 .
In working with the patch, I bumped the version which might not have been necessary. If that should make a separate PR in the future please let me know.