From 84beb8033cd8a6c69d540fbec70d36a7f1e70ae8 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 17 Oct 2023 09:39:41 +0300 Subject: [PATCH] aedi: move jpeg-turbo target to tier 3 --- aedi/target/__init__.py | 2 +- aedi/target/library_tier2.py | 17 ----------------- aedi/target/library_tier3.py | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py index 240bbc86..b87d2b4e 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -80,7 +80,6 @@ def targets(): FluidSynthTarget(), FmtTarget(), InstPatchTarget(), - JpegTurboTarget(), MadTarget(), MikmodTarget(), ModPlugTarget(), @@ -106,6 +105,7 @@ def targets(): GlewTarget(), HarfBuzzTarget(), HighwayTarget(), + JpegTurboTarget(), LuaTarget(), LzmaTarget(), Sdl2TtfTarget(), diff --git a/aedi/target/library_tier2.py b/aedi/target/library_tier2.py index 4fa237b9..466f94f7 100644 --- a/aedi/target/library_tier2.py +++ b/aedi/target/library_tier2.py @@ -114,23 +114,6 @@ class InstPatchTarget(base.CMakeStaticDependencyTarget): shutil.move(str(include_subpath), include_path) -class JpegTurboTarget(base.CMakeStaticDependencyTarget): - def __init__(self, name='jpeg-turbo'): - super().__init__(name) - - def prepare_source(self, state: BuildState): - state.download_source( - 'https://downloads.sourceforge.net/project/libjpeg-turbo/3.0.0/libjpeg-turbo-3.0.0.tar.gz', - 'c77c65fcce3d33417b2e90432e7a0eb05f59a7fff884022a9d931775d583bfaa') - - def configure(self, state: BuildState): - opts = state.options - opts['ENABLE_SHARED'] = 'NO' - opts['WITH_TURBOJPEG'] = 'NO' - - super().configure(state) - - class MadTarget(base.ConfigureMakeStaticDependencyTarget): def __init__(self, name='mad'): super().__init__(name) diff --git a/aedi/target/library_tier3.py b/aedi/target/library_tier3.py index 61087522..a7ec40ad 100644 --- a/aedi/target/library_tier3.py +++ b/aedi/target/library_tier3.py @@ -250,6 +250,23 @@ class HighwayTarget(base.CMakeStaticDependencyTarget): super().configure(state) +class JpegTurboTarget(base.CMakeStaticDependencyTarget): + def __init__(self, name='jpeg-turbo'): + super().__init__(name) + + def prepare_source(self, state: BuildState): + state.download_source( + 'https://downloads.sourceforge.net/project/libjpeg-turbo/3.0.0/libjpeg-turbo-3.0.0.tar.gz', + 'c77c65fcce3d33417b2e90432e7a0eb05f59a7fff884022a9d931775d583bfaa') + + def configure(self, state: BuildState): + opts = state.options + opts['ENABLE_SHARED'] = 'NO' + opts['WITH_TURBOJPEG'] = 'NO' + + super().configure(state) + + class LuaTarget(base.MakeTarget): def __init__(self, name='lua'): super().__init__(name)