Skip to content
Snippets Groups Projects

Use system openjpeg2 library

Merged Soren Stoutner requested to merge (removed):master into master
All threads resolved!

Upstream added the ability to use the system openjpeg2 library instead of an embedded version, but it is disabled by default.

This commit includes a patch to edit the pdfium.gni file to enable the desired option. I must admit that I am not very familiar with the .gni architecture, so someone might know of a way to use a build flag to achieve the same results without the need for a patch.

Merge request reports

Merged by Dmitry ShachnevDmitry Shachnev 2 years ago (Jan 30, 2023 7:24pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • so someone might know of a way to use a build flag to achieve the same results without the need for a patch

    I see that src/core/config/linux.pri has lines like these:

        qtConfig(webengine-system-libevent): gn_args += use_system_libevent=true
        qtConfig(webengine-system-libwebp):  gn_args += use_system_libwebp=true
        qtConfig(webengine-system-libxml2):  gn_args += use_system_libxml=true use_system_libxslt=true
        qtConfig(webengine-system-libvpx):   gn_args += use_system_libvpx=true

    But it doesn't have such a line for openjpeg, unfortunately. So a patch is currently unavoidable. Although, if you decide to patch linux.pri, that patch will be forwardable upstream.

  • Soren Stoutner resolved all threads

    resolved all threads

  • Soren Stoutner added 1 commit

    added 1 commit

    • fca3ee40 - Rebase openjpeg2 patch to support upstreaming.

    Compare with previous version

  • Soren Stoutner added 1 commit

    added 1 commit

    • c39647c8 - Force a build failure if openjpeg2 development libraries are missing.

    Compare with previous version

  • added 1 commit

    • 23283dbc - Force a build failure if openjpeg2 development libraries are missing.

    Compare with previous version

  • Author Maintainer

    Adding the arg to debian/rules to prevent building if there is a problem is a good idea. I am doing a test build now to make sure I haven't introduced any typos (which I did with the first version of my last commit) and will commit it once it finishes without errors.

    I would like to submit it upstream myself. I don't have a problem signing a CLA, and I would like to establish a relationship with upstream.

  • Author Maintainer

    This should now be ready for review.

  • Author Maintainer

    Thanks.

  • Soren Stoutner resolved all threads

    resolved all threads

  • Please register or sign in to reply
    Loading