Skip to content

lr-hatari: fix core build due to upstream changes - #4228

Open
cmitu wants to merge 2 commits into
RetroPie:masterfrom
cmitu:lr-hatari-2014
Open

lr-hatari: fix core build due to upstream changes#4228
cmitu wants to merge 2 commits into
RetroPie:masterfrom
cmitu:lr-hatari-2014

Conversation

@cmitu

@cmitu cmitu commented Sep 6, 2026

Copy link
Copy Markdown
Contributor

Upstream started incorporating the latest Hatari version into the core and renamed the previouos core version to hatari2014. Until the merge is complete and stable, use the old version, now in a separate branch.

Modified the build to:

  • use the CAPSIMG variables that are now part of the upstream makefile, instead of using our own
  • update our patch to exclude our link/include flags for CAPSIMG in the makefile and fix the core name
  • use -rpath linker option to have the core .so library search for the campsimg library in the install folder (similar to how the standalone emulator build recipe does). This alows us to get rid of the configure modifications to emulators.cfg for setting LD_LIBRARY_PATH

Notes:

  • I have a version for the new core in https://github.com/cmitu/RetroPie-Setup/tree/lr-hatari--4, but I noticed there are a few issues opened for it, that's why I kept the 'old' source of the core in these modifications. We might use it in the future and rename this module to lr-hatari2014.
  • The branch name is correct, the upstream repo mis-spelled hatari when creating the 2014 branch.

Upstream started incorporating the latest Hatari version into the core and renamed the previouos core version to `hatari2014`.
Until the merge is complete and stable, use the old version, now in a separate branch.

Modified the build to:
 - use the CAPSIMG variables that are now part of the upstream `makefile`, instead of using our own
 - update our patch to exclude our link/include flags for CAPSIMG in the `makefile` and fix the core name
 - use `-rpath` linker option to have the core `.so` library search for the `campsimg` library in the install folder (similar to how the standalone emulator build recipe does). This alows us to get rid of the `configure` modifications to `emulators.cfg` for setting `LD_LIBRARY_PATH`
@cmitu
cmitu marked this pull request as draft September 6, 2026 17:19
@cmitu

cmitu commented Sep 6, 2026

Copy link
Copy Markdown
Contributor Author

I've set the PR to draft for now, since our patch may have to be modified again, pending some upstream changes.

Upstream started incorporating the latest Hatari version into the core and renamed the previouos core version to `hatari2014`.
Until the merge is complete and stable, use the old version, now in a separate branch.

Modified the build to:
 - use the CAPSIMG variables that are now part of the upstream `makefile`, instead of using our own (C|LD)FLAGS
 - remove our patch since upstream added similar changes to the source to solve the type conflict that caused build issues and the makefile changes are no longer needed
 - make the core name configurable by modifying the `makefile`'s _TARGET_NAME_ variable, so it can be changes at build time.
 - use `-rpath` linker option to have the core `.so` library search for the `campsimg` library in the install folder (similar to how the standalone emulator build recipe does). This alows us to get rid of the `configure` modifications to `emulators.cfg` for setting `LD_LIBRARY_PATH`
@cmitu
cmitu marked this pull request as ready for review September 7, 2026 04:19
@cmitu

cmitu commented Sep 7, 2026

Copy link
Copy Markdown
Contributor Author

OK, reworked the patch, taking into account latest libretro branch changes, and removed our patch entirely. Edited the PR's description to match the commit changes.

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.

1 participant