Skip to content

Fix on fedora #318

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.

Sign up for GitHub

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

Open
billsix wants to merge 4 commits into
base: develop-splitrock
Choose a base branch
from
+5 −3
Open

Fix on fedora #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b1eac2
fix build dependencies in instructions for Fedora
billsix Jul 31, 2026
25a4628
The ExtractAssets target ran `torch o2r baserom.z64` without -u, so the
billsix Aug 1, 2026
d11f951
core1/graphics_thread: fix post-import freeze from OSMesg high-byte g…
billsix Aug 1, 2026
a9fc964
shortened comments per request from JeodC
billsix Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,8 @@ add_custom_target(
ExtractAssets
DEPENDS TorchExternal
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND ${TORCH_EXECUTABLE} o2r baserom.z64
# [port] Stamp bk.o2r with the project version so VerifyArchiveVersion() accepts it; without -u it reads as {0,0,0} and re-extracts every launch.
COMMAND ${TORCH_EXECUTABLE} o2r baserom.z64 -u ${PROJECT_VERSION}
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/bk.o2r" "${CMAKE_BINARY_DIR}/bk.o2r"
)

Expand Down
2 changes: 1 addition & 1 deletion docs/BUILDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ pacman -S clang git cmake ninja lsb-release sdl2 libpng libzip nlohmann-json tin
#### Fedora
```sh
# using gcc
dnf install gcc gcc-c++ git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools nlohmann-json-devel tinyxml2-devel spdlog-devel boost-devel libogg-devel libvorbis-devel
dnf install gcc gcc-c++ git cmake ninja-build lsb_release SDL2-devel SDL2_net SDL2_net-devel libpng-devel libzip-devel libzip-tools nlohmann-json-devel tinyxml2-devel spdlog-devel boost-devel libogg-devel libvorbis-devel

@JeodC JeodC Aug 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The clang variant needs these as well. I believe SDL2_net-devel pulls the runtime lib itself, so you can drop the bare SDL2_net from both lines if you'd rather keep them short.


# or using clang
dnf install clang git cmake ninja-build lsb_release SDL2-devel libpng-devel libzip-devel libzip-tools nlohmann-json-devel tinyxml2-devel spdlog-devel boost-devel libogg-devel libvorbis-devel
Expand Down
3 changes: 2 additions & 1 deletion src/core1/graphics_thread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,8 @@ void thread5_entry(void *arg) {
}
ThreadWatchdog_Beat(WATCHDOG_THREAD5); // [port] one beat per serviced message
thread5_checkAndExecutePreNMI();
if ((uintptr_t)msg.ptr < 100) {
// [port] OSMesg is an 8-byte union and OS_MESG_32 leaves its high bytes garbage, so discriminate on .data32 (the event code), not the full .ptr, which mis-read events as task pointers and dropped SP events (the post-import freeze).

@JeodC JeodC Aug 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Could you wrap this to the file's ~120 col style, and trim it to the mechanism?

if (msg.data32 < 100) {
if (msg.data32 == THREAD5_MESSAGE_EVENT_SYNC) { thread5_handleSyncEvent(); }
else if (msg.data32 == THREAD5_MESSAGE_EVENT_VI_RETRACE) { thread5_handleVIRetraceEvent(); }
else if (msg.data32 == THREAD5_MESSAGE_EVENT_DP) { thread5_handleDPEvent(); }
Expand Down