diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py index e773c2e4..240bbc86 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -60,7 +60,6 @@ def targets(): GlibTarget(), IconvTarget(), IntlTarget(), - JpegTurboTarget(), LameTarget(), MoltenVKTarget(), Mpg123Target(), @@ -81,6 +80,7 @@ def targets(): FluidSynthTarget(), FmtTarget(), InstPatchTarget(), + JpegTurboTarget(), MadTarget(), MikmodTarget(), ModPlugTarget(), diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py index 459d4112..a067f109 100644 --- a/aedi/target/library_tier1.py +++ b/aedi/target/library_tier1.py @@ -190,23 +190,6 @@ def post_build(self, state: BuildState): self.install(state, state.options) -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 LameTarget(base.ConfigureMakeStaticDependencyTarget): def __init__(self, name='lame'): super().__init__(name) diff --git a/aedi/target/library_tier2.py b/aedi/target/library_tier2.py index 8a19acc0..030dce3c 100644 --- a/aedi/target/library_tier2.py +++ b/aedi/target/library_tier2.py @@ -114,6 +114,23 @@ def post_build(self, state: BuildState): 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)