eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

[cmake] update CI deps, feat: sirit CI + new CI spec #2655

Merged
crueter merged 9 commits from update-deps into master 2025-10-04 09:27:14 +02:00
Conversation 3 Commits 9 Files changed 13 +340 -293
crueter commented 2025-10-03 04:32:14 +02:00
Owner
Copy link

Updates sirit to our fork's latest version w/ SPIRV Headers included
(end goal is to remove spirv-headers entirely, as spirv-tools-ci should
include them inline as well)

Adds a sirit CI on our fork for all platforms (saves a bit of compile
time)

My CI spec has changed a little bit, and now there is no need for an
additional CMake file after the initial CMakeLists.txt (since targets
are now global imported). Plus, UNIX amd64 now has the amd64 suffix like
aarch64 and windows

Updates SDL2 to 2.32.10 and OpenSSL to 3.6.0

Finally, on Solaris all CI packages (sans FFmpeg) are now built with OmniOS, which
should in theory be fully compatible with OpenIndiana (our recommended
Sun-based target) but obviously will need testing

Need testing:

  • Make sure I didn't nuke shader emission
  • Make sure FreeBSD, OpenBSD, and OpenIndiana work fine with bundled
    sirit (check linking especially)
  • Make sure SDL2, OpenSSL work with OpenIndiana now
  • SDL2 on all platforms (input, etc)

Signed-off-by: crueter crueter@eden-emu.dev

Updates sirit to our fork's latest version w/ SPIRV Headers included (end goal is to remove spirv-headers entirely, as spirv-tools-ci should include them inline as well) Adds a sirit CI on our fork for all platforms (saves a bit of compile time) My CI spec has changed a little bit, and now there is no need for an additional CMake file after the initial CMakeLists.txt (since targets are now global imported). Plus, UNIX amd64 now has the amd64 suffix like aarch64 and windows Updates SDL2 to 2.32.10 and OpenSSL to 3.6.0 Finally, on Solaris all CI packages (sans FFmpeg) are now built with OmniOS, which should in theory be fully compatible with OpenIndiana (our recommended Sun-based target) but obviously will need testing Need testing: - [ ] Make sure I didn't nuke shader emission - [ ] Make sure FreeBSD, OpenBSD, and OpenIndiana work fine with bundled sirit (check linking especially) - [ ] Make sure SDL2, OpenSSL work with OpenIndiana now - [ ] SDL2 on all platforms (input, etc) Signed-off-by: crueter <crueter@eden-emu.dev>
crueter added 1 commit 2025-10-03 04:32:14 +02:00
[cmake] update CI deps, feat: sirit CI + new CI spec
Some checks failed
eden-license / license-header (pull_request) Failing after 22s
Details
22099e7877 
Updates sirit to our fork's latest version w/ SPIRV Headers included
(end goal is to remove spirv-headers entirely, as spirv-tools-ci should
include them inline as well)

Adds a sirit CI on our fork for all platforms (saves a bit of compile
time)

My CI spec has changed a little bit, and now there is no need for an
additional CMake file after the initial CMakeLists.txt (since targets
are now global imported). Plus, UNIX amd64 now has the amd64 suffix like
aarch64 and windows

Updates SDL2 to 2.32.10 and OpenSSL to 3.6.0

Finally, on Solaris all CI packages (sans FFmpeg) are now built with OmniOS, which
should in theory be fully compatible with OpenIndiana (our recommended
Sun-based target) but obviously will need testing

Need testing:
- [ ] Make sure I didn't nuke shader emission
- [ ] Make sure FreeBSD, OpenBSD, and OpenIndiana work fine with bundled
  sirit (check linking especially)
- [ ] Make sure SDL2, OpenSSL work with OpenIndiana now
- [ ] SDL2 on all platforms (input, etc)

Signed-off-by: crueter <crueter@eden-emu.dev>
requested reviews from Lizzie, CamilleLaVey, Maufeat, MrPurple666, MaranBr 2025-10-03 04:32:14 +02:00
DraVee commented 2025-10-03 05:44:30 +02:00
Member
Copy link

As part of tagging all versions, shouldn't we tag android too? (Of course if it isn't too much work)

As part of tagging all versions, shouldn't we tag android too? (Of course if it isn't too much work)
crueter commented 2025-10-03 06:20:15 +02:00
Author
Owner
Copy link

@DraVee wrote in #2655 (comment):

As part of tagging all versions, shouldn't we tag android too? (Of course if it isn't too much work)

wdym tagging all versions

@DraVee wrote in https://git.eden-emu.dev/eden-emu/eden/pulls/2655#issuecomment-5777: > As part of tagging all versions, shouldn't we tag android too? (Of course if it isn't too much work) wdym tagging all versions
MaranBr force-pushed update-deps from 22099e7877 to 3048ea8787 2025-10-04 02:57:21 +02:00 Compare
MaranBr approved these changes 2025-10-04 02:57:41 +02:00
Dismissed
crueter changed title from [cmake] update CI deps, feat: sirit CI + new CI spec to WIP: [cmake] update CI deps, feat: sirit CI + new CI spec 2025-10-04 02:57:54 +02:00
crueter added 1 commit 2025-10-04 03:38:38 +02:00
[cmake] enforce sirit::sirit
Some checks failed
eden-license / license-header (pull_request) Failing after 25s
Details
95b0fac1f9 
Signed-off-by: crueter <crueter@eden-emu.dev>
crueter dismissed MaranBr's review 2025-10-04 03:38:38 +02:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

crueter added 1 commit 2025-10-04 04:09:46 +02:00
[cmake] update sirit to 1.0.1, fix oaknut
Some checks failed
eden-license / license-header (pull_request) Failing after 25s
Details
b87f446221 
Signed-off-by: crueter <crueter@eden-emu.dev>
crueter added 1 commit 2025-10-04 04:24:33 +02:00
also force spirv headers if CPMUTIL_FORCE_BUNDLED is on
Some checks failed
eden-license / license-header (pull_request) Failing after 24s
Details
b7b284ae30 
Signed-off-by: crueter <crueter@eden-emu.dev>
crueter added 1 commit 2025-10-04 05:48:25 +02:00
remove unneeded frozen pkg
Some checks failed
eden-license / license-header (pull_request) Failing after 24s
Details
e64a83f040 
Signed-off-by: crueter <crueter@eden-emu.dev>
crueter added 1 commit 2025-10-04 05:51:51 +02:00
oops
Some checks failed
eden-license / license-header (pull_request) Failing after 25s
Details
80a8f954ee 
Signed-off-by: crueter <crueter@eden-emu.dev>
crueter added 1 commit 2025-10-04 06:46:44 +02:00
[cmake] fix OpenIndiana, move root stuff to externals
Some checks failed
eden-license / license-header (pull_request) Failing after 24s
Details
8701e0dda0 
Moves a bunch of stuff that some platforms don't package to externals.
And fixes OpenIndiana since it also happens to not have some of these
packages

Signed-off-by: crueter <crueter@eden-emu.dev>
crueter added 1 commit 2025-10-04 07:25:37 +02:00
fix catch2, sun again
Some checks failed
eden-license / license-header (pull_request) Failing after 24s
Details
e1833e8447 
Signed-off-by: crueter <crueter@eden-emu.dev>
crueter added 1 commit 2025-10-04 08:14:52 +02:00
fix discord-rpc
Some checks failed
eden-license / license-header (pull_request) Failing after 24s
Details
e72888ebb8 
Signed-off-by: crueter <crueter@eden-emu.dev>
crueter changed title from WIP: [cmake] update CI deps, feat: sirit CI + new CI spec to [cmake] update CI deps, feat: sirit CI + new CI spec 2025-10-04 09:27:09 +02:00
requested review from MaranBr 2025-10-04 09:27:09 +02:00
crueter merged commit 83730cd4c1 into master 2025-10-04 09:27:14 +02:00
crueter deleted branch update-deps 2025-10-04 09:27:14 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Lizzie
CamilleLaVey
Maufeat
MrPurple666
MaranBr
Labels
Clear labels   
android

Specific to android platform

  
audio

   
bug

Something is not working

  
ci

For changes to the ci/building

  
confirmed

Used when testers confirm a bug is reported and it is reproducable.

  
core

For core changes to the emulator

  
desktop

Specific to desktop PCs, handhelds, etc.

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
frontend

Frontend changes

  
fw

Changes related to firmware

  
git

For enhancements or changes regarding git.

  
graphics

   
loader

For changes to any of the loader implementations

  
nv gpu

For use with changes that involve the emulator GPU and any services.

  
ui
No labels
android
audio
bug
ci
confirmed
core
desktop
duplicate
enhancement
frontend
fw
git
graphics
loader
nv gpu
ui
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: eden-emu/eden#2655
No description provided.
Delete branch "update-deps"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?