Improve pkg-config file generation

[kmilos]

No description provided.

[ghost]

👇 Click on the image for a new way to code review

• Make big changes easier — review code in small groups of related files

• Know where to start — see the whole change at a glance

• Take a code tour — explore the change with an interactive tour

• Make comments and review — all fully sync’ed with github

  Try it now!

Legend

[codecov]

Codecov Report

Merging #2471 (15f0119) into main (a87c59b) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #2471   +/-   ##
=======================================
  Coverage   62.11%   62.11%           
=======================================
  Files         121      121           
  Lines       22819    22819           
  Branches    11209    11209           
=======================================
  Hits        14173    14173           
  Misses       6439     6439           
  Partials     2207     2207           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

[neheb]

my meson PR produces

prefix=/usr/local
includedir=${prefix}/include
libdir=${prefix}/lib64

Name: exiv2
Description: Exif/IPTC/Xmp C++ metadata library and tools plus ICC Profiles, Previews and more.
URL: https://exiv2.org
Version: 1.0.0
Requires.private: INIReader, libbrotlidec, libcurl, zlib
Libs: -L${libdir} -lexiv2
Cflags: -I${includedir}

I assume it's similar here?

[kmilos]

Thanks for comparing and letting me know @neheb!

Indeed, there are further two things I'll need to fix: no need for further dependencies (inih and libbrotlicommon; they'll get pulled in by the respective .pc files), and comma delimited list instead of space delimited.

I'm also surprised I don't see iconv nor expat in your list...

[kmilos]

I am now getting (on Windows, MSYS2 UCRT64):

prefix=/ucrt64
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include

Name: exiv2
Description: Exif/IPTC/Xmp C++ metadata library and tools plus ICC Profiles, Previews and more.
Version: 1.0.0.9
URL: https://exiv2.org
Requires.private: INIReader, expat, iconv, libbrotlidec, libcurl, zlib
Libs: -L${libdir} -lexiv2
Libs.private: -lexiv2-xmp -lintl
Cflags: -I${includedir}

[neheb]

Iconv is libc iconv. Meson does not need to add. I’ll check expat.

[kmilos]

Iconv is libc iconv

I though this was for intl only, but now I see also for iconv, will fix that as well...

Also, I think our own exiv2-xmp should be on the Libs.private list, no? (If not using the external XMP SDK.)

[kmilos]

Luckily we require CMake 3.11 anyway, so I also removed our custom module: https://cmake.org/cmake/help/latest/module/FindIconv.html

[neheb]

Expat is not implemented in meson as it’s simpler. I might look into this.

[neheb]

Windows:

prefix=/usr/local
includedir=${prefix}/include
libdir=${prefix}/lib

Name: exiv2
Description: Exif/IPTC/Xmp C++ metadata library and tools plus ICC Profiles, Previews and more.
URL: https://exiv2.org
Version: 1.0.0
Requires.private: INIReader, libbrotlidec, libcurl, zlib
Libs: -L${libdir} -lexiv2
Libs.private: -lws2_32 -liconv -lintl
Cflags: -I${includedir}

[kmilos]

Hm, I have iconv.pc on MSYS2...

[neheb]

On meson I check for it no matter the OS. Probably non Windows with CMake.

Pull request has been modified.

[kmilos]

Yep, MSYS2 was an exception rather than the rule, so converted iconv to Libs.private as well now.

[eli-schwartz]

Expat is not implemented in meson as it’s simpler. I might look into this.

expat provides a canonical pkg-config file so there's no need for Meson to implement an override.

[neheb]

no I meant in the PR. I've since implemented it.