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

[merge conflicts] update libchdr based on latest upstream #163

Closed
wants to merge 5 commits into from
Closed

[merge conflicts] update libchdr based on latest upstream #163

wants to merge 5 commits into from

Conversation

negativeExponent
Copy link
Contributor

May (or may not) fix a few chd-related issues listed below. It doesn't hurt if doesn't fix in any case:

#157
#129
#80

Related libchdr update that fixes at least 1 issue:
libretro/pcsx_rearmed@9c659ff

Related issue with regards to dependency resync:
rtissera/libchdr#24

@negativeExponent negativeExponent deleted the update_libchdr branch September 18, 2020 18:12
@negativeExponent negativeExponent restored the update_libchdr branch September 22, 2020 00:55
@negativeExponent negativeExponent marked this pull request as draft September 22, 2020 01:27
@negativeExponent negativeExponent changed the title update libchdr based on latest upstream [wip] update libchdr based on latest upstream Sep 22, 2020
@inactive123 inactive123 reopened this Oct 7, 2020
@inactive123
Copy link
Contributor

inactive123 commented Oct 7, 2020

@negativeExponent Do not close this. I very much want to merge this but we will first have to make sure that libchdr on both RetroArch and this repo are on the same page. Have some patience please.

And again, if there are issues, let's talk about it in DM. As it is, closing issues like this here is just going to be inconveniencing users in the end. I really think there has been some big misunderstanding here and I'm willing to work it out over DM.

@negativeExponent
Copy link
Contributor Author

due to structure changes on upstream, this is probably irrelevant to merge unless updated.

@negativeExponent
Copy link
Contributor Author

negativeExponent commented Oct 22, 2020

update to latest upstream changes, but retains folder structure and filename changes to still comply to current layout

NOTE: dependencies not updated.

@negativeExponent
Copy link
Contributor Author

im discontinuing this. im gettng merge conflicts now.

@negativeExponent negativeExponent changed the title [wip] update libchdr based on latest upstream [merge conflicts] update libchdr based on latest upstream Nov 1, 2020
@inactive123
Copy link
Contributor

@negativeExponent No worries, @rtissera will make sure libchdr in this and other cores gets updated

@inactive123
Copy link
Contributor

@rtissera can you fix this up?

@inactive123
Copy link
Contributor

Or should it be closed?

@negativeExponent
Copy link
Contributor Author

this is outdated. and core already have merge latest deps and libchdr.

closing this then to avoid confusion.

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.

None yet

2 participants