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

leptonica: use libpng version range, bump deps, remove old versions #23134

Merged
merged 5 commits into from
Jul 1, 2024
Merged

leptonica: use libpng version range, bump deps, remove old versions #23134

merged 5 commits into from
Jul 1, 2024

Conversation

mayeut
Copy link
Contributor

@mayeut mayeut commented Mar 17, 2024 •
edited
Loading

Specify library name and version: leptonica/all

All versions used in cci have been kept (1.83.1 & 1.82.0).
Keeping the 3 latest minor versions.

@ghost ghost mentioned this pull request Mar 17, 2024
Closed
@prince-chrismc prince-chrismc mentioned this pull request Mar 17, 2024
Open
@conan-center-bot

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions
Copy link
Contributor

Hooks produced the following warnings for commit 1628606
leptonica/1.80.0@#5d272e44bafa3f9c27c2087e2957cbc6 
post_package(): WARN: [APPLE RELOCATABLE SHARED LIBS (KB-H077)] install_name dir of these shared libs is not @rpath: libleptonica.dylib, libleptonica.5.4.0.dylib, libleptonica.1.80.0.dylib
leptonica/1.79.0@#234223559da2062824e9a2e03bdb3632 
post_package(): WARN: [APPLE RELOCATABLE SHARED LIBS (KB-H077)] install_name dir of these shared libs is not @rpath: libleptonica.dylib, libleptonica.1.79.0.dylib, libleptonica.5.3.0.dylib
leptonica/1.78.0@#f1e58439beb566dd07b8922d1d734c74 
post_package(): WARN: [APPLE RELOCATABLE SHARED LIBS (KB-H077)] install_name dir of these shared libs is not @rpath: libleptonica.dylib, libleptonica.1.78.0.dylib, libleptonica.5.3.0.dylib

@mayeut mayeut changed the title leptonica: use libpng version range, bump deps leptonica: use libpng version range, bump deps, remove old versions Mar 18, 2024
@conan-center-bot

This comment has been minimized.

Sign in to view
@ghost ghost mentioned this pull request Mar 25, 2024
Open
3 tasks
AbrilRBS
AbrilRBS reviewed Apr 1, 2024
View reviewed changes
recipes/leptonica/all/conanfile.py
if self.options.with_tiff:
self.requires("libtiff/4.6.0")
if self.options.with_openjpeg:
self.requires("openjpeg/2.5.0")
self.requires("openjpeg/2.5.2")
Copy link
Member

Choose a reason for hiding this comment

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

This'd create conflicts with every other recipe that depends on openjpeg, as those are stuck on .0 for now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

opencv has moved to 2.5.2, leptonica is only used by tesseract which is only used by opencv so we might as well update this no ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@RubenRBS, do you need more information ?

Copy link
Member

Choose a reason for hiding this comment

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

No, sorry for the delay, will try to push this one forward :)

@conan-center-bot

This comment has been minimized.

Sign in to view
@ghost ghost mentioned this pull request May 3, 2024
Merged
3 tasks
@conan-center-bot

This comment has been minimized.

Sign in to view
@AbrilRBS AbrilRBS self-assigned this Jun 6, 2024
uilianries
uilianries approved these changes Jul 1, 2024
View reviewed changes
Copy link
Member

@uilianries uilianries left a comment

Choose a reason for hiding this comment

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

I'm fine with the possible conflict with openjpeg, because, by default, leptonica used libjpeg. Users still can use replace_requires to enforce a specific version of openjpeg in case needed.

recipes/leptonica/all/conandata.yml
Copy link
Member

Choose a reason for hiding this comment

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

Only tesseract is consuming leptonica/1.83.1 and 1.82.0. Looking good removing old versions.

@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 6 (c0db2ae8d394497060d47919a49614fbd1bf0673):

  • leptonica/1.83.1:
    All packages built successfully! (All logs)

  • leptonica/1.82.0:
    All packages built successfully! (All logs)

  • leptonica/1.81.0:
    All packages built successfully! (All logs)

Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 5 (c0db2ae8d394497060d47919a49614fbd1bf0673):

  • leptonica/1.83.1:
    All packages built successfully! (All logs)

  • leptonica/1.82.0:
    All packages built successfully! (All logs)

  • leptonica/1.81.0:
    All packages built successfully! (All logs)

@conan-center-bot conan-center-bot merged commit b897f57 into conan-io:master Jul 1, 2024
24 checks passed
@mayeut mayeut deleted the leptonica-bump-deps branch July 1, 2024 19:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@valgur valgur valgur approved these changes

@uilianries uilianries uilianries approved these changes

@AbrilRBS AbrilRBS AbrilRBS approved these changes

@jcar87 jcar87 Awaiting requested review from jcar87

@danimtb danimtb Awaiting requested review from danimtb

Assignees

@AbrilRBS AbrilRBS

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mayeut @conan-center-bot @valgur @uilianries @AbrilRBS