leptonica: add version 1.83.0 #14864

theirix · 2022-12-21T08:36:04Z

Specify library name and version: leptonica/1.83.0

There is one moment I don't fully understand. Upstream uses find_package(GIF) which seems to be totally fine.
But Conan generators create a bunch of giflib-* files so the find_package doesn't find them but picks up a system include path /Library/Frameworks/UnixImageIO.framework/Headers. Using find_package(GIFLIB) fixes the problem.

Recent giflib changes do not change a cmake_file_name property. If it is not changed, why doesn't it work?

I've read the contributing guidelines.
I've followed the PEP8 style guides for Python code in the recipes.
I've used the latest Conan client version.
I've tried at least one configuration locally with the conan-center hook activated.

I am not sure if it is correct but otherwise find_package(GIF) picks up system framework not the generate `giflib*` cmake files

SpaceIm · 2022-12-21T10:13:56Z

There is one moment I don't fully understand. Upstream uses find_package(GIF) which seems to be totally fine. But Conan generators create a bunch of giflib-* files so the find_package doesn't find them but picks up a system include path /Library/Frameworks/UnixImageIO.framework/Headers. Using find_package(GIFLIB) fixes the problem.

Recent giflib changes do not change a cmake_file_name property. If it is not changed, why doesn't it work?

Can't reproduce this issue with conan 1.55.0

recipes/leptonica/all/conandata.yml

Co-authored-by: SpaceIm <[email protected]>

This reverts commit ccab369.

theirix · 2022-12-21T10:57:56Z

There is one moment I don't fully understand. Upstream uses find_package(GIF) which seems to be totally fine. But Conan generators create a bunch of giflib-* files so the find_package doesn't find them but picks up a system include path /Library/Frameworks/UnixImageIO.framework/Headers. Using find_package(GIFLIB) fixes the problem.

Removed the local cache, FindGIF.cmake appeared and now GIF can be found by find_package in the default module mode. False alarm, removed workaround.

recipes/leptonica/all/conanfile.py

SpaceIm · 2022-12-22T10:03:58Z

recipes/leptonica/all/conanfile.py

+            # pkgconfig is prefered to CMake. Disable pkgconfig so only CMake is used
+            replace_in_file(self, cmakelists, "pkg_check_modules(JP2K libopenjp2>=2.0 QUIET)", "")


Surprising. This recipe has pkgconfig in build requirements when openjpeg option is enabled, and pkgconfig files are generated by PkgConfigDeps, so why would it fail without this patch? I can try to test but AFAIR it was working fine.

I've tested and previous patch works like a charm, openjpeg is always found & injected in 1.82.0

Yes, my bad. Previously openjpeg was located using pkgconfig. So hardcoded openjpeg's version paths do not affect already found openjpeg.

Why I have moved to cmake-only openjpeg is to fix MSVC build (I don't have a clue why it is failed). 1.83.0 and pre-1.83.0 Leptonica have different resolution order for openjpeg: pkg-config then cmake vs cmake vs pkg-config. I think it is easier for us just to use CMake. How do you think?

theirix · 2022-12-22T11:51:43Z

By the way, "ERROR: Package 'zlib/1.2.13' not resolved: Unable to find 'zlib/1.2.13' in remotes" in a Conan v2 automatic comment seems strange.

conan-center-bot · 2022-12-31T11:03:27Z

Conan v1 pipeline

All green in build 9 (82ae5a3114527f460b284f5cb96bcce995d775ad):

leptonica/1.81.0@:
All packages built successfully! (All logs)
leptonica/1.82.0@:
All packages built successfully! (All logs)
leptonica/1.78.0@:
All packages built successfully! (All logs)
leptonica/1.83.0@:
All packages built successfully! (All logs)
leptonica/1.79.0@:
All packages built successfully! (All logs)
leptonica/1.80.0@:
All packages built successfully! (All logs)

Conan v2 pipeline (informative, not required for merge)

Failure in build 9 (82ae5a3114527f460b284f5cb96bcce995d775ad):

leptonica/1.82.0@:
CI failed to create some packages (All logs)

Logs for packageID null:

[settings]
arch=x86_64
build_type=Release
compiler=gcc
compiler.libcxx=libstdc++11
compiler.version=11
os=Linux
[options]
*/*:shared=False

********************************************************************************
conan install --require=leptonica/1.82.0@#9ea34e3708ea0a0b480f5c9247c51836 --build=leptonica/1.82.0 -pr:h /home/conan/w/prod-v2/BuildSingleReference/8154/cdae46f0-ffe6-4ab4-8bb7-f3d76538c2ae/profile_linux_11_libstdcpp11_gcc_release_64.-shared-False.txt -c:h tools.system.package_manager:mode=install -c:h tools.system.package_manager:sudo=True -pr:b /home/conan/w/prod-v2/BuildSingleReference/8154/cdae46f0-ffe6-4ab4-8bb7-f3d76538c2ae/profile_linux_11_libstdcpp11_gcc_release_64.-shared-False.txt -c:b tools.system.package_manager:mode=install -c:b tools.system.package_manager:sudo=True
********************************************************************************

-------- Input profiles --------
Profile host:
[settings]
arch=x86_64
build_type=Release
compiler=gcc
compiler.libcxx=libstdc++11
compiler.version=11
os=Linux
[options]
*/*:shared=False
[conf]
tools.system.package_manager:mode=install
tools.system.package_manager:sudo=True

Profile build:
[settings]
arch=x86_64
build_type=Release
compiler=gcc
compiler.libcxx=libstdc++11
compiler.version=11
os=Linux
[options]
*/*:shared=False
[conf]
tools.system.package_manager:mode=install
tools.system.package_manager:sudo=True


-------- Computing dependency graph --------
zlib/1.2.13: Not found in local cache, looking in remotes...
zlib/1.2.13: Checking remote: conan-center-v2
zlib/1.2.13: Checking remote: c3i_PR-v2-14864
Graph root
    virtual
Requirements
    leptonica/1.82.0#9ea34e3708ea0a0b480f5c9247c51836 - Cache
Graph error
    Package 'zlib/1.2.13' not resolved: Unable to find 'zlib/1.2.13' in remotes

-------- Computing necessary packages --------
ERROR: Package 'zlib/1.2.13' not resolved: Unable to find 'zlib/1.2.13' in remotes

leptonica/1.83.0@:
Didn't run or was cancelled before finishing
leptonica/1.80.0@:
Didn't run or was cancelled before finishing
leptonica/1.81.0@:
Didn't run or was cancelled before finishing
leptonica/1.78.0@:
Didn't run or was cancelled before finishing
leptonica/1.79.0@:
Didn't run or was cancelled before finishing

^{Note: To save resources, CI tries to finish as soon as an error is found. For this reason you might find that not all the references have been launched or not all the configurations for a given reference. Also, take into account that we cannot guarantee the order of execution as it depends on CI workload and workers availability.}

prince-chrismc · 2023-01-25T05:42:41Z

recipes/leptonica/all/conanfile.py

@@ -139,47 +133,69 @@ def _patch_sources(self):
        replace_in_file(self, cmakelists_src, "${GIF_LIBRARIES}", "GIF::GIF")
        if not self.options.with_gif:
            replace_in_file(self, cmakelists_src, "if (GIF_LIBRARIES)", "if(0)")
-            replace_in_file(self, cmake_configure, "if (GIF_FOUND)", "if(0)")
+            if Version(self.version) >= "1.83.0":
+                replace_in_file(self, cmake_configure, "if(GIF_FOUND)", "if(0)")


I would love to see patches for this project in the future 🙏

* Add leptonica 1.83.0 * Modernize with rm_safe * Add new options for libwebp and openjpeg from 1.83.0 * Fix whitespaces in inline patching for 1.83.0 * Consolidate handling webp, openjpeg options * Use find_package(GIFLIB) I am not sure if it is correct but otherwise find_package(GIF) picks up system framework not the generate `giflib*` cmake files * Add required fields to yaml * Update patch metadata Co-authored-by: SpaceIm <[email protected]> * Revert "Use find_package(GIFLIB)" This reverts commit ccab369. * Use openjpeg 2.4.0 for Leptonica older thatn 1.83.0 * Improve patching for 1.82.0 * Try to link to target openjp2 * Prefer CMake for openjpeg * Fix patching pkg_check_modules for older versions * Always depend on latest openjpeg * Bump libpng dependency Co-authored-by: SpaceIm <[email protected]>

This reverts commit 5ddac4f. This is being reverted because the options to turn off different graphic packages don't work (WEBP, etc.).

Revert "(conan-io#14864) leptonica: add version 1.83.0"

theirix added 7 commits December 21, 2022 11:28

Add leptonica 1.83.0

8a049ef

Modernize with rm_safe

680c86e

Add new options for libwebp and openjpeg from 1.83.0

afdd5dd

Fix whitespaces in inline patching for 1.83.0

abed4de

Consolidate handling webp, openjpeg options

44481b6

Use find_package(GIFLIB)

ccab369

I am not sure if it is correct but otherwise find_package(GIF) picks up system framework not the generate `giflib*` cmake files

Add required fields to yaml

a7e6711

github-actions bot mentioned this pull request Dec 21, 2022

Pull Requests Ready to be Reviewed prince-chrismc/conan-center-index-pending-review#1

Open

conan-center-bot added the Failed label Dec 21, 2022

This comment has been minimized.

Sign in to view

SpaceIm reviewed Dec 21, 2022

View reviewed changes

recipes/leptonica/all/conandata.yml Outdated Show resolved Hide resolved

theirix and others added 2 commits December 21, 2022 13:57

Update patch metadata

70c954f

Co-authored-by: SpaceIm <[email protected]>

Revert "Use find_package(GIFLIB)"

41ee149

This reverts commit ccab369.

This comment has been minimized.

Sign in to view

theirix added 3 commits December 21, 2022 21:43

Use openjpeg 2.4.0 for Leptonica older thatn 1.83.0

e055c41

Improve patching for 1.82.0

85adf72

Try to link to target openjp2

2ba033f

SpaceIm reviewed Dec 21, 2022

View reviewed changes

recipes/leptonica/all/conanfile.py Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

Prefer CMake for openjpeg

5615073

This comment has been minimized.

Sign in to view

SpaceIm reviewed Dec 22, 2022

View reviewed changes

Fix patching pkg_check_modules for older versions

5f49683

This comment has been minimized.

Sign in to view

This was referenced Dec 24, 2022

Updatable recipes qchateau/conan-center-bot#1

Open

[request] Updatable recipes #3470

Closed

danimtb previously approved these changes Dec 27, 2022

View reviewed changes

Always depend on latest openjpeg

5e7bef4

theirix dismissed danimtb’s stale review via 5e7bef4 December 27, 2022 13:47

Bump libpng dependency

82ae5a3

theirix requested a review from SpaceIm January 3, 2023 15:05

ericLemanissier mentioned this pull request Jan 6, 2023

[service] Incorrect Failed label on PRs #15130

Closed

prince-chrismc removed the Failed label Jan 15, 2023

uilianries approved these changes Jan 20, 2023

View reviewed changes

StellaSmith approved these changes Jan 20, 2023

View reviewed changes

prince-chrismc reviewed Jan 25, 2023

View reviewed changes

prince-chrismc approved these changes Jan 25, 2023

View reviewed changes

conan-center-bot merged commit 5ddac4f into conan-io:master Jan 25, 2023

datalogics-kam mentioned this pull request Apr 5, 2023

[package] leptonica/1.82.0: Doesn't patch sources if WEBP or other graphic formats turned off #16906

Closed

datalogics-robb pushed a commit to datalogics-robb/conan-center-index that referenced this pull request May 4, 2023

Merge pull request conan-io#40 from saharay/revert-leptonica-1.83

a823f36

Revert "(conan-io#14864) leptonica: add version 1.83.0"

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

leptonica: add version 1.83.0 #14864

leptonica: add version 1.83.0 #14864

Uh oh!

theirix commented Dec 21, 2022

Uh oh!

This comment has been minimized.

SpaceIm commented Dec 21, 2022

Uh oh!

Uh oh!

theirix commented Dec 21, 2022

Uh oh!

This comment has been minimized.

Uh oh!

This comment has been minimized.

This comment has been minimized.

SpaceIm Dec 22, 2022

Uh oh!

SpaceIm Dec 22, 2022 •

edited

Loading

Uh oh!

theirix Dec 22, 2022

Uh oh!

theirix commented Dec 22, 2022

Uh oh!

This comment has been minimized.

conan-center-bot commented Dec 31, 2022

Uh oh!

prince-chrismc Jan 25, 2023

Uh oh!

Uh oh!

		# pkgconfig is prefered to CMake. Disable pkgconfig so only CMake is used
		replace_in_file(self, cmakelists, "pkg_check_modules(JP2K libopenjp2>=2.0 QUIET)", "")

leptonica: add version 1.83.0 #14864

leptonica: add version 1.83.0 #14864

Uh oh!

Conversation

theirix commented Dec 21, 2022

Uh oh!

This comment has been minimized.

SpaceIm commented Dec 21, 2022

Uh oh!

Uh oh!

theirix commented Dec 21, 2022

Uh oh!

This comment has been minimized.

Uh oh!

This comment has been minimized.

This comment has been minimized.

SpaceIm Dec 22, 2022

Choose a reason for hiding this comment

Uh oh!

SpaceIm Dec 22, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

theirix Dec 22, 2022

Choose a reason for hiding this comment

Uh oh!

theirix commented Dec 22, 2022

Uh oh!

This comment has been minimized.

conan-center-bot commented Dec 31, 2022

Conan v1 pipeline

Conan v2 pipeline (informative, not required for merge)

Uh oh!

prince-chrismc Jan 25, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

SpaceIm Dec 22, 2022 •

edited

Loading