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

[cairo] v2 support #12240

Merged
merged 16 commits into from
Sep 1, 2022
Merged

[cairo] v2 support #12240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5b0d226
[cairo] do not rename the parent pkg-config package
planetmarshall Aug 15, 2022
85e8ff5
[cairo] refactor and simplify package_info method
planetmarshall Aug 15, 2022
499575d
[cairo] fix v2 linting
planetmarshall Aug 15, 2022
649296e
[cairo] provide parent pkgconfig and use set_property_name
planetmarshall Aug 16, 2022
d865d22
[cairo] resolve system lib warnings
planetmarshall Aug 16, 2022
6faf10e
[cairo] v2 linting
planetmarshall Aug 17, 2022
283dfe0
Apply review suggestion
planetmarshall Aug 17, 2022
63a79fb
Apply review suggestion
planetmarshall Aug 17, 2022
d328ae8
[cairo] bump requirements versions
planetmarshall Aug 18, 2022
5c2a656
[cairo] full package mode only for static glib
planetmarshall Aug 19, 2022
e2b734a
[cairo] shared glib with static msvcrt is not supported
planetmarshall Aug 19, 2022
970914b
[cairo] restore old pkg-config file names
planetmarshall Aug 24, 2022
8d6d988
[cairo] update source method
planetmarshall Aug 24, 2022
adf4fb7
[cairo] restore main pkg-config name
planetmarshall Aug 25, 2022
9d6fb61
[cairo] fix property name typo
planetmarshall Aug 31, 2022
49787f5
[cairo] use tool_requires
planetmarshall Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 77 additions & 48 deletions recipes/cairo/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
from conans import ConanFile, AutoToolsBuildEnvironment, tools, VisualStudioBuildEnvironment
from conans.errors import ConanInvalidConfiguration
import os
import shutil

from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools import files, microsoft, scm
from conans import AutoToolsBuildEnvironment, VisualStudioBuildEnvironment
from conans import tools

planetmarshall marked this conversation as resolved.
Show resolved Hide resolved
required_conan_version = ">=1.50.0"


class CairoConan(ConanFile):
name = "cairo"
Expand Down Expand Up @@ -56,7 +62,7 @@ def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
del self.options.with_fontconfig
if self._is_msvc:
if microsoft.is_msvc(self):
del self.options.with_freetype
del self.options.with_glib
if self.settings.os != "Linux":
Expand All @@ -69,9 +75,16 @@ def configure(self):
del self.options.fPIC
del self.settings.compiler.cppstd
del self.settings.compiler.libcxx
if self._is_msvc:

def validate(self):
if microsoft.is_msvc(self):
if self.settings.build_type not in ["Debug", "Release"]:
raise ConanInvalidConfiguration("MSVC build supports only Debug or Release build type")
if self.options.get_safe("with_glib") and self.options["glib"].shared \
and microsoft.is_msvc_static_runtime(self):
raise ConanInvalidConfiguration(
"Linking shared glib with the MSVC static runtime is not supported"
)

def requirements(self):
if self.options.get_safe("with_freetype", True):
Expand All @@ -89,24 +102,19 @@ def requirements(self):

def build_requirements(self):
if self._settings_build.os == "Windows" and not tools.get_env("CONAN_BASH_PATH"):
self.build_requires("msys2/cci.latest")
if not self._is_msvc:
self.build_requires("libtool/2.4.6")
self.build_requires("pkgconf/1.7.4")
self.build_requires("gtk-doc-stub/cci.20181216")

@property
def _is_msvc(self):
return self.settings.compiler == "Visual Studio"
self.tool_requires("msys2/cci.latest")
if not microsoft.is_msvc(self):
self.tool_requires("libtool/2.4.6")
self.tool_requires("pkgconf/1.7.4")
self.tool_requires("gtk-doc-stub/cci.20181216")

def source(self):
tools.get(**self.conan_data["sources"][self.version],
files.get(self, **self.conan_data["sources"][self.version],
destination=self._source_subfolder, strip_root=True)

def build(self):
for patch in self.conan_data.get("patches", {}).get(self.version, []):
tools.patch(**patch)
if self._is_msvc:
files.apply_conandata_patches(self)
if microsoft.is_msvc(self):
self._build_msvc()
else:
self._build_configure()
Expand All @@ -115,13 +123,13 @@ def _build_msvc(self):
with tools.chdir(self._source_subfolder):
# https://cairographics.org/end_to_end_build_for_win32/
win32_common = os.path.join("build", "Makefile.win32.common")
tools.replace_in_file(win32_common, "-MD ", "-%s " % self.settings.compiler.runtime)
tools.replace_in_file(win32_common, "-MDd ", "-%s " % self.settings.compiler.runtime)
tools.replace_in_file(win32_common, "$(ZLIB_PATH)/lib/zlib1.lib",
files.replace_in_file(self, win32_common, "-MD ", f"-{self.settings.compiler.runtime} ")
files.replace_in_file(self, win32_common, "-MDd ", f"-{self.settings.compiler.runtime} ")
files.replace_in_file(self, win32_common, "$(ZLIB_PATH)/lib/zlib1.lib",
self.deps_cpp_info["zlib"].libs[0] + ".lib")
tools.replace_in_file(win32_common, "$(LIBPNG_PATH)/lib/libpng16.lib",
files.replace_in_file(self, win32_common, "$(LIBPNG_PATH)/lib/libpng16.lib",
self.deps_cpp_info["libpng"].libs[0] + ".lib")
tools.replace_in_file(win32_common, "$(FREETYPE_PATH)/lib/freetype.lib",
files.replace_in_file(self, win32_common, "$(FREETYPE_PATH)/lib/freetype.lib",
self.deps_cpp_info["freetype"].libs[0] + ".lib")
with tools.vcvars(self.settings):
env_msvc = VisualStudioBuildEnvironment(self)
Expand All @@ -130,13 +138,13 @@ def _build_msvc(self):
env_build = AutoToolsBuildEnvironment(self)
args=[
"-f", "Makefile.win32",
"CFG={}".format(str(self.settings.build_type).lower()),
f"CFG={str(self.settings.build_type).lower()}",
"CAIRO_HAS_FC_FONT=0",
"ZLIB_PATH={}".format(self.deps_cpp_info["zlib"].rootpath),
"LIBPNG_PATH={}".format(self.deps_cpp_info["libpng"].rootpath),
"PIXMAN_PATH={}".format(self.deps_cpp_info["pixman"].rootpath),
"FREETYPE_PATH={}".format(self.deps_cpp_info["freetype"].rootpath),
"GOBJECT_PATH={}".format(self.deps_cpp_info["glib"].rootpath)
f"ZLIB_PATH={self.deps_cpp_info['zlib'].rootpath}",
f"LIBPNG_PATH={self.deps_cpp_info['libpng'].rootpath}",
f"PIXMAN_PATH={self.deps_cpp_info['pixman'].rootpath}",
f"FREETYPE_PATH={self.deps_cpp_info['freetype'].rootpath}",
f"GOBJECT_PATH={self.deps_cpp_info['glib'].rootpath}"
]

env_build.make(args=args)
Expand All @@ -146,18 +154,20 @@ def _configure_autotools(self):
if self._autotools:
return self._autotools

def boolean(value):
return "yes" if value else "no"
Comment on lines +157 to +158
Copy link
Contributor

Choose a reason for hiding this comment

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

yes_no lambda was more elegant I believe, why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Rejected by the linter ( PEP-8 - E731 in Flake8 ).

As for the naming, I think boolean is a better name for a function than yes_no.


self._autotools = AutoToolsBuildEnvironment(self, win_bash=tools.os_info.is_windows)
yes_no = lambda v: "yes" if v else "no"
configure_args = [
"--datarootdir={}".format(tools.unix_path(os.path.join(self.package_folder, "res"))),
"--enable-ft={}".format(yes_no(self.options.with_freetype)),
"--enable-gobject={}".format(yes_no(self.options.with_glib)),
"--enable-fc={}".format(yes_no(self.options.get_safe("with_fontconfig"))),
"--enable-xlib={}".format(yes_no(self.options.get_safe("with_xlib"))),
"--enable-xlib_xrender={}".format(yes_no(self.options.get_safe("with_xlib_xrender"))),
"--enable-xcb={}".format(yes_no(self.options.get_safe("xcb"))),
"--enable-shared={}".format(yes_no(self.options.shared)),
"--enable-static={}".format(yes_no(not self.options.shared)),
f"--datarootdir={tools.unix_path(os.path.join(self.package_folder, 'res'))}",
f"--enable-ft={boolean(self.options.with_freetype)}",
f"--enable-gobject={boolean(self.options.with_glib)}",
f"--enable-fc={boolean(self.options.get_safe('with_fontconfig'))}",
f"--enable-xlib={boolean(self.options.get_safe('with_xlib'))}",
f"--enable-xlib_xrender={boolean(self.options.get_safe('with_xlib_xrender'))}",
f"--enable-xcb={boolean(self.options.get_safe('xcb'))}",
f"--enable-shared={boolean(self.options.shared)}",
f"--enable-static={boolean(not self.options.shared)}",
"--disable-gtk-doc",
]
if self.settings.compiler in ["gcc", "clang", "apple-clang"]:
Expand All @@ -170,10 +180,10 @@ def _configure_autotools(self):
def _build_configure(self):
with tools.chdir(self._source_subfolder):
# disable build of test suite
tools.replace_in_file(os.path.join("test", "Makefile.am"), "noinst_PROGRAMS = cairo-test-suite$(EXEEXT)",
files.replace_in_file(self, os.path.join("test", "Makefile.am"), "noinst_PROGRAMS = cairo-test-suite$(EXEEXT)",
"")
if self.options.with_freetype:
tools.replace_in_file(os.path.join(self.source_folder, self._source_subfolder, "src", "cairo-ft-font.c"),
files.replace_in_file(self, os.path.join(self.source_folder, self._source_subfolder, "src", "cairo-ft-font.c"),
"#if HAVE_UNISTD_H", "#ifdef HAVE_UNISTD_H")

tools.touch(os.path.join("boilerplate", "Makefile.am.features"))
Expand All @@ -182,7 +192,7 @@ def _build_configure(self):

with tools.environment_append({"GTKDOCIZE": "echo"}):
self.run(
"{} -fiv".format(tools.get_env("AUTORECONF")),
f"{tools.get_env('AUTORECONF')} -fiv",
run_environment=True,
win_bash=tools.os_info.is_windows,
)
Expand All @@ -191,11 +201,11 @@ def _build_configure(self):

def package(self):
self.copy(pattern="LICENSE", dst="licenses", src=self._source_subfolder)
if self._is_msvc:
if microsoft.is_msvc(self):
src = os.path.join(self._source_subfolder, "src")
cairo_gobject = os.path.join(self._source_subfolder, "util", "cairo-gobject")
inc = os.path.join("include", "cairo")
self.copy(pattern="cairo-version.h", dst=inc, src=(src if tools.Version(self.version) >= "1.17.4" else self._source_subfolder))
self.copy(pattern="cairo-version.h", dst=inc, src=(src if scm.Version(self.version) >= "1.17.4" else self._source_subfolder))
self.copy(pattern="cairo-features.h", dst=inc, src=src)
self.copy(pattern="cairo.h", dst=inc, src=src)
self.copy(pattern="cairo-deprecated.h", dst=inc, src=src)
Expand All @@ -222,14 +232,18 @@ def package(self):
tools.remove_files_by_mask(self.package_folder, "*.la")

self.copy("COPYING*", src=self._source_subfolder, dst="licenses", keep_path=False)
tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig"))

files.rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))

def package_info(self):
self.cpp_info.set_property("pkg_config_name", "cairo-all-do-no-use")
self.cpp_info.names["pkg_config"] = "cairo-all-do-not-use"

self.cpp_info.components["cairo_"].set_property("pkg_config_name", "cairo")
self.cpp_info.components["cairo_"].names["pkg_config"] = "cairo"
planetmarshall marked this conversation as resolved.
Show resolved Hide resolved
self.cpp_info.components["cairo_"].libs = ["cairo"]
self.cpp_info.components["cairo_"].includedirs.insert(0, os.path.join("include", "cairo"))
self.cpp_info.components["cairo_"].requires = ["pixman::pixman", "libpng::libpng", "zlib::zlib"]

if self.options.get_safe("with_freetype", True):
self.cpp_info.components["cairo_"].requires.append("freetype::freetype")

Expand All @@ -242,8 +256,9 @@ def package_info(self):
self.cpp_info.components["cairo_"].requires.extend(["glib::gobject-2.0", "glib::glib-2.0"])
if self.options.with_fontconfig:
self.cpp_info.components["cairo_"].requires.append("fontconfig::fontconfig")

if self.settings.os == "Linux":
self.cpp_info.components["cairo_"].system_libs = ["pthread"]
self.cpp_info.components["cairo_"].system_libs = ["pthread", "rt"]
self.cpp_info.components["cairo_"].cflags = ["-pthread"]
self.cpp_info.components["cairo_"].cxxflags = ["-pthread"]
if self.options.with_xcb:
Expand All @@ -252,36 +267,50 @@ def package_info(self):
self.cpp_info.components["cairo_"].requires.extend(["xorg::xcb-render"])
if self.options.with_xlib:
self.cpp_info.components["cairo_"].requires.extend(["xorg::x11", "xorg::xext"])

if tools.is_apple_os(self.settings.os):
self.cpp_info.components["cairo_"].frameworks.append("CoreGraphics")


if self.settings.os == "Windows":
self.cpp_info.components["cairo-win32"].set_property("pkg_config_name", "cairo-win32")
planetmarshall marked this conversation as resolved.
Show resolved Hide resolved
self.cpp_info.components["cairo-win32"].names["pkg_config"] = "cairo-win32"
self.cpp_info.components["cairo-win32"].requires = ["cairo_", "pixman::pixman", "libpng::libpng"]

if self.options.get_safe("with_glib", True):
self.cpp_info.components["cairo-gobject"].set_property("pkg_config_name", "cairo-gobject")
self.cpp_info.components["cairo-gobject"].names["pkg_config"] = "cairo-gobject"
self.cpp_info.components["cairo-gobject"].libs = ["cairo-gobject"]
self.cpp_info.components["cairo-gobject"].requires = ["cairo_", "glib::gobject-2.0", "glib::glib-2.0"]
if self.settings.os != "Windows":
if self.options.with_fontconfig:
self.cpp_info.components["cairo-fc"].set_property("pkg_config_name", "cairo-fc")
self.cpp_info.components["cairo-fc"].names["pkg_config"] = "cairo-fc"
self.cpp_info.components["cairo-fc"].requires = ["cairo_", "fontconfig::fontconfig"]
if self.options.get_safe("with_freetype", True):
self.cpp_info.components["cairo-ft"].set_property("pkg_config_name", "cairo-ft")
self.cpp_info.components["cairo-ft"].names["pkg_config"] = "cairo-ft"
self.cpp_info.components["cairo-ft"].requires = ["cairo_", "freetype::freetype"]

self.cpp_info.components["cairo-pdf"].set_property("pkg_config_name", "cairo-pdf")
self.cpp_info.components["cairo-pdf"].names["pkg_config"] = "cairo-pdf"
self.cpp_info.components["cairo-pdf"].requires = ["cairo_", "zlib::zlib"]

if self.settings.os == "Linux":
if self.options.with_xlib:
self.cpp_info.components["cairo-xlib"].set_property("pkg_config_name", "cairo-xlib")
self.cpp_info.components["cairo-xlib"].names["pkg_config"] = "cairo-xlib"
self.cpp_info.components["cairo-xlib"].requires = ["cairo_", "xorg::x11", "xorg::xext"]

if tools.is_apple_os(self.settings.os):
self.cpp_info.components["cairo-quartz"].set_property("pkg_config_name", "cairo-quartz")
self.cpp_info.components["cairo-quartz"].names["pkg_config"] = "cairo-quartz"
self.cpp_info.components["cairo-quartz"].requires = ["cairo_"]
self.cpp_info.components["cairo-quartz"].frameworks.extend(["CoreFoundation", "CoreGraphics"])
self.cpp_info.components["cairo-quartz"].frameworks.extend(["CoreFoundation", "CoreGraphics", "ApplicationServices"])

self.cpp_info.components["cairo-quartz-font"].set_property("pkg_config_name", "cairo-quartz-font")
self.cpp_info.components["cairo-quartz-font"].names["pkg_config"] = "cairo-quartz-font"
self.cpp_info.components["cairo-quartz-font"].requires = ["cairo_"]

def package_id(self):
if self.options.get_safe("with_glib") and not self.options["glib"].shared:
self.info.requires["glib"].full_package_mode()
Loading