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

mupdf: pre update cleanups #1791

Merged
merged 4 commits into from
May 31, 2024

Conversation

benoit-pierre
Copy link
Contributor

@benoit-pierre benoit-pierre commented May 20, 2024

There's one minor fix (correct fz_recognize_image_format's prototype), but mostly tweak some patches to make updating easier (e.g. reduce conflicts), and trim FFI cdecls to keep only the declarations we need.


This change is Reviewable

Copy link
Member

@Frenzie Frenzie left a comment

Choose a reason for hiding this comment

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

Preferably for after #1750?

@benoit-pierre
Copy link
Contributor Author

Yes (will conflict in thirdparty/mupdf/CMakeLists.txt).

- fix `fz_recognize_image_format` prototype: need at least
  12 bytes to be able to probe for a possible WebP image
- fix ICC support flag check
- flag WebP support so it can be disabled
- flag the feature so it can be disabled
- tweak patch to make it easier to update (reduce conflicts)
@Frenzie
Copy link
Member

Frenzie commented May 29, 2024

Ready to merge or would you rather wait until there's a nightly with all the other changes out first?

@benoit-pierre
Copy link
Contributor Author

Up to you, I have the MuPDF update and the leptonica+tesseract+libk2pfopt updates ready.

@benoit-pierre
Copy link
Contributor Author

I mean, this can be merged without waiting, but wait for a nightly or 2 before the proper updates?

@Frenzie
Copy link
Member

Frenzie commented May 29, 2024

I've manually triggered a pipeline run speed up the process a little. If everything seems fine I'll merge some more things here but indeed let's wait with the actual update a couple of days.

@benoit-pierre
Copy link
Contributor Author

Welp, it did not take long: https://gitlab.com/koreader/nightly-builds/-/jobs/6973852572.

@benoit-pierre
Copy link
Contributor Author

OK, fix incoming (need to remove -ffile-prefix-map=/home/ko/koreader-base/= like pocketbook).

@Frenzie
Copy link
Member

Frenzie commented May 29, 2024

Welp, it did not take long: https://gitlab.com/koreader/nightly-builds/-/jobs/6973852572.

Nobody expects the Spanishlegacy inquisition! (Or at least I didn't.)

@Frenzie Frenzie merged commit 6747469 into koreader:master May 31, 2024
1 check passed
@benoit-pierre benoit-pierre deleted the pr/pre_update_mupdf_cleanups branch May 31, 2024 21:31
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