aedi: moved webp target to tier 2

webp source code is now stored inside gzdoom and raze repos
ZDoom · Apr 18, 2024 · 7e6afa6 · 7e6afa6
1 parent 75e860e
commit 7e6afa6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git 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
@@ -472,31 +472,6 @@ def clean_build_config(line: str):
         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
@@ -432,6 +432,31 @@ def configure(self, state: BuildState):
         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)