zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2024-11-10 06:31:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

aedi: move zlib-ng to tier 2

Browse source 
zmusic before 1.1.13 was the last target that required zlib
This commit is contained in:
alexey.lysiuk 2024-04-28 13:57:33 +03:00
parent 37d62c369f
commit d7483cffb4
3 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aedi/target/__init__.py
View file

@ -71,7 +71,6 @@ def targets():
SndFileTarget(),
VorbisTarget(),
VpxTarget(),
ZlibNgTarget(),
ZMusicTarget(),
# Libraries needed for other targets
@ -97,6 +96,7 @@ def targets():
WavPackTarget(),
WebpTarget(),
XmpTarget(),
ZlibNgTarget(),
# Obsolete libraries without binaries
BrotliTarget(),

23
aedi/target/library_tier1.py
View file

@ -472,29 +472,6 @@ class VpxTarget(base.ConfigureMakeDependencyTarget):
self.update_text_file(state.build_path / 'vpx_config.c', clean_build_config)
class ZlibNgTarget(base.CMakeStaticDependencyTarget):
def __init__(self, name='zlib-ng'):
super().__init__(name)
def prepare_source(self, state: BuildState):
state.download_source(
'https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.1.6.tar.gz',
'a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2')
def detect(self, state: BuildState) -> bool:
return state.has_source_file('zlib-ng.h')
def configure(self, state: BuildState):
opts = state.options
opts['WITH_GTEST'] = 'NO'
opts['WITH_SANITIZER'] = 'NO'
opts['ZLIB_COMPAT'] = 'YES'
opts['ZLIB_ENABLE_TESTS'] = 'NO'
opts['ZLIBNG_ENABLE_TESTS'] = 'NO'
super().configure(state)
class ZMusicTarget(base.CMakeStaticDependencyTarget):
def __init__(self, name='zmusic'):
super().__init__(name)

23
aedi/target/library_tier2.py
View file

@ -472,3 +472,26 @@ class XmpTarget(base.ConfigureMakeStaticDependencyTarget):
def configure(self, state: BuildState):
state.options['--enable-static'] = None
super().configure(state)
class ZlibNgTarget(base.CMakeStaticDependencyTarget):
def __init__(self, name='zlib-ng'):
super().__init__(name)
def prepare_source(self, state: BuildState):
state.download_source(
'https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.1.6.tar.gz',
'a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2')
def detect(self, state: BuildState) -> bool:
return state.has_source_file('zlib-ng.h')
def configure(self, state: BuildState):
opts = state.options
opts['WITH_GTEST'] = 'NO'
opts['WITH_SANITIZER'] = 'NO'
opts['ZLIB_COMPAT'] = 'YES'
opts['ZLIB_ENABLE_TESTS'] = 'NO'
opts['ZLIBNG_ENABLE_TESTS'] = 'NO'
super().configure(state)