diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py index 2464f7e7..23fe875c 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -71,7 +71,6 @@ def targets(): SndFileTarget(), VorbisTarget(), VpxTarget(), - WebpTarget(), ZlibNgTarget(), ZMusicTarget(), @@ -96,6 +95,7 @@ def targets(): VulkanHeadersTarget(), VulkanLoaderTarget(), WavPackTarget(), + WebpTarget(), XmpTarget(), # Obsolete libraries without binaries diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py index 1c785fe4..c69245c8 100644 --- a/aedi/target/library_tier1.py +++ b/aedi/target/library_tier1.py @@ -472,31 +472,6 @@ class VpxTarget(base.ConfigureMakeDependencyTarget): self.update_text_file(state.build_path / 'vpx_config.c', clean_build_config) -class WebpTarget(base.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.4.0.tar.gz', - '61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5') - - def configure(self, state: BuildState): - option_suffices = ( - 'ANIM_UTILS', 'CWEBP', 'DWEBP', 'EXTRAS', 'GIF2WEBP', 'IMG2WEBP', 'VWEBP', 'WEBPINFO', 'WEBPMUX', - ) - - 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') - - class ZlibNgTarget(base.CMakeStaticDependencyTarget): def __init__(self, name='zlib-ng'): super().__init__(name) diff --git a/aedi/target/library_tier2.py b/aedi/target/library_tier2.py index ac666249..f46f8034 100644 --- a/aedi/target/library_tier2.py +++ b/aedi/target/library_tier2.py @@ -432,6 +432,31 @@ class WavPackTarget(base.CMakeStaticDependencyTarget): super().configure(state) +class WebpTarget(base.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.4.0.tar.gz', + '61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5') + + def configure(self, state: BuildState): + option_suffices = ( + 'ANIM_UTILS', 'CWEBP', 'DWEBP', 'EXTRAS', 'GIF2WEBP', 'IMG2WEBP', 'VWEBP', 'WEBPINFO', 'WEBPMUX', + ) + + 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') + + class XmpTarget(base.ConfigureMakeStaticDependencyTarget): def __init__(self, name='xmp'): super().__init__(name)