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.

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

Jump to bottom

CMake: search for shared minizip-ng as minizip #11439

Merged
merged 1 commit into from Jan 14, 2023
Merged

CMake: search for shared minizip-ng as minizip #11439

merged 1 commit into from Jan 14, 2023

Conversation

SuperSamus
Copy link
Contributor

The pkgconfig file for minizip-ng is minizip.pc.cmakein.

@SuperSamus
CMake: search for shared minizip-ng as minizip
2929742 
The pkgconfig file for `minizip-ng` is `minizip.pc.cmakein`.
@delroth
Copy link
Member

delroth commented Jan 14, 2023

@dolphin-emu-bot rebuild

@delroth delroth merged commit 5538583 into dolphin-emu:master Jan 14, 2023
@SuperSamus SuperSamus deleted the patch-1 branch January 14, 2023 15:18
@SuperSamus
Copy link
Contributor Author

SuperSamus commented Jul 22, 2023 •
edited

So, I think this needs to be reverted? I'm not understanding the situation.

To recap:

  • By default, minizip-ng exposes an option to add a suffix. It is off by default (as MZ_COMPAT is on by default).
  • After I made this PR, minizip-ng 4.0.0 was released. Some distros updated to it, then shortly after enabled the suffix -ng.
    • Arch and NixOS did it, for instance.
    • Fedora didn't yet, but it's still on 3.x.

So... what to do? Update the submodule on Dolphin and revert this PR?
EDIT: It's not included as a submodule.

@SuperSamus SuperSamus mentioned this pull request Jul 27, 2023
Closed
@Medard22 Medard22 mentioned this pull request Aug 4, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
2 participants
@SuperSamus @delroth