Skip to content

Commit

Permalink
aedi: move zlib-ng to tier 2
Browse files Browse the repository at this point in the history
zmusic before 1.1.13 was the last target that required zlib
  • Loading branch information
alexey-lysiuk committed Apr 28, 2024
1 parent 37d62c3 commit d7483cf
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion aedi/target/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ def targets():
SndFileTarget(),
VorbisTarget(),
VpxTarget(),
ZlibNgTarget(),
ZMusicTarget(),

# Libraries needed for other targets
Expand All @@ -97,6 +96,7 @@ def targets():
WavPackTarget(),
WebpTarget(),
XmpTarget(),
ZlibNgTarget(),

# Obsolete libraries without binaries
BrotliTarget(),
Expand Down
23 changes: 0 additions & 23 deletions aedi/target/library_tier1.py
Original file line number Diff line number Diff line change
Expand Up @@ -472,29 +472,6 @@ def clean_build_config(line: str):
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)
Expand Down
23 changes: 23 additions & 0 deletions aedi/target/library_tier2.py
Original file line number Diff line number Diff line change
Expand Up @@ -472,3 +472,26 @@ def detect(self, state: BuildState) -> bool:
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)

0 comments on commit d7483cf

Please sign in to comment.