From a6cebb7313b13bec7131afcc3980ce1121073c79 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 26 Jun 2021 10:29:02 +0300 Subject: [PATCH] aedi: wxwidgets 3.0.5.1 target it's incomplete (at least wx-config should be patched) because of missing webview library when building for arm64 target needs to be upgraded to the latest development version 3.1.x as stable 3.0.x doesn't offer webview on arm64 --- aedi/target/__init__.py | 1 + aedi/target/library_tier2.py | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py index e6cf6880..a9d4c259 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -92,6 +92,7 @@ def targets(): SodiumTarget(), TiffTarget(), WebpTarget(), + WxWidgetsTarget(), ZstdTarget(), # Tools diff --git a/aedi/target/library_tier2.py b/aedi/target/library_tier2.py index 48551d47..8668cf3c 100644 --- a/aedi/target/library_tier2.py +++ b/aedi/target/library_tier2.py @@ -608,6 +608,32 @@ class WebpTarget(CMakeStaticDependencyTarget): self.keep_module_target(state, 'WebP::webp') +class WxWidgetsTarget(ConfigureMakeStaticDependencyTarget): + def __init__(self, name='wxwidgets'): + super().__init__(name) + + def prepare_source(self, state: BuildState): + state.download_source( + 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.5.1/wxWidgets-3.0.5.1.tar.bz2', + '440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807', + patches='wxwidgets-fix-configure') + + def configure(self, state: BuildState): + opts = self.options + opts['--disable-shared'] = None + opts['--with-macosx-sdk'] = state.sdk_path() + opts['--with-macosx-version-min'] = state.os_version() + opts['--with-libpng'] = 'sys' + opts['--with-libtiff'] = 'sys' + opts['--without-sdl'] = None + opts['--without-subdirs'] = None + + super().configure(state) + + def detect(self, state: BuildState) -> bool: + return os.path.exists(state.source + 'wx-config.in') + + class ZstdTarget(CMakeStaticDependencyTarget): def __init__(self, name='zstd'): super().__init__(name)