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

CHD support (credits to @SleepyMan and @siddhartha77 too) #4314

Merged
merged 4 commits into from
Mar 23, 2021
Merged

CHD support (credits to @SleepyMan and @siddhartha77 too) #4314

merged 4 commits into from
Mar 23, 2021

Conversation

rtissera
Copy link
Contributor

This PR tries to resolve remaining issues on #4045 and @siddhartha77 work in order to finally get CHD support in.

@rtissera rtissera changed the title CHD support (merging @SleepyMan and CHD support (credits to @SleepyMan and @siddhartha77 too) Mar 21, 2021
@liberodark
Copy link

Thank you for this pr.

@rtissera
Copy link
Contributor Author

(hopefully) fixed the remaining clang issue upstream with rtissera/libchdr@0b6d663
Can someone relaunch the CI or should I do a dummy commit ?

@rtissera
Copy link
Contributor Author

sorry for all the noise on this PR, I had issues reproducing locally some of your CI scenarios.
Let me know if you can squash and merge or want me to manually redo a "clean" PR from scratch.

@lightningterror
Copy link
Contributor

Would be nice to properly rebase the branch with latest master.

Also name the commits properly with prefixes included.

@rtissera
Copy link
Contributor Author

@lightningterror let me know if you need another rebase or if it's clean enough to be merged.

@lightningterror
Copy link
Contributor

I'd squash the last commit with the previous 2 ones.

@rtissera
Copy link
Contributor Author

@lightningterror Sure no problem for the squash, can you do it or should I ?

@lightningterror
Copy link
Contributor

You can do it.

@rtissera
Copy link
Contributor Author

@lightningterror done, good to go ?

@Florin9doi
Copy link
Contributor

Closes #2584, closes #4045

@refractionpcsx2
Copy link
Member

refractionpcsx2 commented Mar 23, 2021

@rtissera sorry can you fix the conflicts? Thanks

@refractionpcsx2 refractionpcsx2 added this to the Release 1.8 milestone Mar 23, 2021
@rtissera
Copy link
Contributor Author

@refractionpcsx2 sure no problem will fix later today

@rtissera
Copy link
Contributor Author

@refractionpcsx2 rebased on master with fixed conflicts

@refractionpcsx2
Copy link
Member

Awesome, thanks, now we can merge :)

@refractionpcsx2 refractionpcsx2 merged commit b436898 into PCSX2:master Mar 23, 2021
@matoro
Copy link

matoro commented Mar 23, 2021

Hello, is there going to be an option to use the system version of this new library instead of the submodule one, like yaml-cpp?

@tony971
Copy link

tony971 commented Mar 24, 2021

CHD files are not listed as options under "Boot ISO"

@refractionpcsx2
Copy link
Member

refractionpcsx2 commented Mar 24, 2021

CHD files are not listed as options under "Boot ISO"

Boot ISO is the same thing. We can rename it "Boot Image" if it really bothers you.

@tony971
Copy link

tony971 commented Mar 24, 2021

CHD files are not listed as options under "Boot ISO"

Boot ISO is the same thing. We can rename it "Boot Image" if it really bothers you.

I didn't communicate effectively enough. If you go to "Boot ISO", it won't find chd files. It's not one of the available options.

@refractionpcsx2
Copy link
Member

refractionpcsx2 commented Mar 24, 2021

If you're using a buildbot build, they are out of date, for some reason it isn't building, so CHD isn't available in those builds yet. we are working on it.

if you need a build you can join our discord, there is one posted in the #dev-builds channel

@tony971
Copy link

tony971 commented Mar 24, 2021

The latest buildbot is bc477e1. That looks to be the head.

@refractionpcsx2
Copy link
Member

The latest buildbot is bc477e1. That looks to be the head.

no, the last buildbot build is dated 2021-03-15 13:16:20, which is from before the CHD stuff.

You can't go off what's on the PCSX2 page, that lists every commit regardless, you need to go actually on to the buildbot to see the correct build.

@RedDevilus
Copy link
Contributor

Orphis buildbots (1.7-1149):
image

Actual latest from github (1.7-1154):
image

@tony971
Copy link

tony971 commented Mar 24, 2021

Yep, PEBCAK. Sorry for wasting your time.

@refractionpcsx2
Copy link
Member

No problems, you're not the first who's been confused.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.