From 81e7680ca579646d3a1214c8b98e2c4335b9585e Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 11 Jul 2022 10:12:24 +0300 Subject: [PATCH] aedi: move webp to tier 3 --- aedi/target/__init__.py | 2 +- aedi/target/library_tier2.py | 27 --------------------------- aedi/target/library_tier3.py | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py index 8f3cd116..9e29def8 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -86,7 +86,6 @@ def targets(): SodiumTarget(), VulkanHeadersTarget(), VulkanLoaderTarget(), - WebpTarget(), XmpTarget(), # Obsolete libraries without binaries @@ -101,6 +100,7 @@ def targets(): Sdl2TtfTarget(), SfmlTarget(), TiffTarget(), + WebpTarget(), WxWidgetsTarget(), ZstdTarget(), diff --git a/aedi/target/library_tier2.py b/aedi/target/library_tier2.py index b7be9b29..5e8fbec7 100644 --- a/aedi/target/library_tier2.py +++ b/aedi/target/library_tier2.py @@ -385,33 +385,6 @@ class VulkanLoaderTarget(CMakeStaticDependencyTarget): super().configure(state) -class WebpTarget(CMakeStaticDependencyTarget): - def __init__(self, name='webp'): - super().__init__(name) - - def prepare_source(self, state: BuildState): - state.download_source( - 'https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.2.tar.gz', - '7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6', - patches='webp-fix-cmake') - - def configure(self, state: BuildState): - option_suffices = ( - 'ANIM_UTILS', 'CWEBP', 'DWEBP', 'EXTRAS', 'GIF2WEBP', 'IMG2WEBP', 'LIBWEBPMUX', 'VWEBP', 'WEBPINFO', - ) - - for suffix in option_suffices: - state.options[f'WEBP_BUILD_{suffix}'] = 'NO' - - super().configure(state) - - def post_build(self, state: BuildState): - super().post_build(state) - - shutil.copytree(state.install_path / 'share/WebP/cmake', state.install_path / 'lib/cmake/WebP') - self.keep_module_target(state, 'WebP::webp') - - class XmpTarget(ConfigureMakeStaticDependencyTarget): def __init__(self, name='xmp'): super().__init__(name) diff --git a/aedi/target/library_tier3.py b/aedi/target/library_tier3.py index 80a8ef5b..c8c60417 100644 --- a/aedi/target/library_tier3.py +++ b/aedi/target/library_tier3.py @@ -326,6 +326,33 @@ class TiffTarget(CMakeStaticDependencyTarget): return line +class WebpTarget(CMakeStaticDependencyTarget): + def __init__(self, name='webp'): + super().__init__(name) + + def prepare_source(self, state: BuildState): + state.download_source( + 'https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.2.tar.gz', + '7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6', + patches='webp-fix-cmake') + + def configure(self, state: BuildState): + option_suffices = ( + 'ANIM_UTILS', 'CWEBP', 'DWEBP', 'EXTRAS', 'GIF2WEBP', 'IMG2WEBP', 'LIBWEBPMUX', 'VWEBP', 'WEBPINFO', + ) + + for suffix in option_suffices: + state.options[f'WEBP_BUILD_{suffix}'] = 'NO' + + super().configure(state) + + def post_build(self, state: BuildState): + super().post_build(state) + + shutil.copytree(state.install_path / 'share/WebP/cmake', state.install_path / 'lib/cmake/WebP') + self.keep_module_target(state, 'WebP::webp') + + class WxWidgetsTarget(CMakeStaticDependencyTarget): def __init__(self, name='wxwidgets'): super().__init__(name)