diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-01-25 20:34:24 +0530 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2023-01-27 03:57:42 +0000 |
| commit | 5f9a8ecf126ac88233405f280075dd068a24ff57 (patch) | |
| tree | e88996048637953991ec68a8d552c59fd5114637 | |
| parent | 0125d92c5cf0b7ea6917428c6bfe29a686b276a8 (diff) | |
gobject-introspection.recipe: Bump to 1.74.0
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1087>
| -rw-r--r-- | cerbero/build/build.py | 12 | ||||
| -rw-r--r-- | recipes/gobject-introspection.recipe | 36 |
2 files changed, 10 insertions, 38 deletions
diff --git a/cerbero/build/build.py b/cerbero/build/build.py index 9b89dfc6..8fa9abd8 100644 --- a/cerbero/build/build.py +++ b/cerbero/build/build.py @@ -811,11 +811,13 @@ class Meson (Build, ModifyEnvBase) : # get the type of the option type_regex = "type\s*:\s*'(?P<type>[^']+)'" ty = re.search (type_regex, option, re.MULTILINE) - if ty and ty.group('type') in ('feature', 'boolean'): - opt_type = ty.group('type') - break - else: - raise FatalError('Unable to detect type of option {!r}'.format(opt_name)) + if ty: + if ty.group('type') in ('feature', 'boolean'): + opt_type = ty.group('type') + break + elif ty.group('type') == 'string': + break + raise FatalError('Unable to detect type of option {!r}'.format(opt_name)) if opt_name and opt_type: value = getattr(self.config.variants, variant_name) if variant_name else False self.meson_options[opt_name] = self._get_option_value(opt_type, value) diff --git a/recipes/gobject-introspection.recipe b/recipes/gobject-introspection.recipe index ef6dab43..1a5673b8 100644 --- a/recipes/gobject-introspection.recipe +++ b/recipes/gobject-introspection.recipe @@ -4,27 +4,14 @@ import sys class Recipe(recipe.Recipe): name = 'gobject-introspection' - version = '1.56.1' + version = '1.74.0' stype = SourceType.TARBALL + btype = BuildType.MESON url = 'gnome://' - tarball_checksum = '5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b' + tarball_checksum = '347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653' licenses = [License.LGPLv2Plus] licenses_bins = [License.GPLv2Plus] - configure_options = '--with-python=python3' deps = ['glib'] - patches = [ - # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 - name + '/0001-giscanner-Fix-shared-library-name-with-Meson-on-macO.patch', - # Taken from upstream, remove on bump - # https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/73 - name + '/0002-Fix-non-libtool-build.patch', - # Taken from upstream, remove on bump - # https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/38 - name + '/0003-giscanner-Fix-shared-library-name-with-Meson-on-macO.patch', - # Taken from upstream, remove on bump - # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/194 - name + '/0001-Drop-deprecated-xml.etree.ElementTree.Element.getchi.patch', - ] files_bins = ['g-ir-annotation-tool', 'g-ir-compiler', 'g-ir-doc-tool', 'g-ir-generate', 'g-ir-scanner'] files_libs = ['libgirepository-1.0'] @@ -81,20 +68,3 @@ class Recipe(recipe.Recipe): 'lib/pkgconfig/gobject-introspection-no-export-1.0.pc', 'share/gobject-introspection-1.0' ] - - # TODO: catch the share/man stuff like man1/g-ir* ? - async def configure(self): - if self.config.target_platform in [Platform.IOS, Platform.DARWIN]: - if self.config.target_arch == Architecture.ARM64: - arch = 'arm64' - elif Architecture.is_arm(self.config.target_arch): - arch = 'arm' - elif self.config.target_arch == Architecture.X86: - arch = 'i386' - else: - arch = self.config.target_arch - makefilein = os.path.join (self.build_dir, 'Makefile.in') - replacements = {'glib-2.0/include/glibconfig.h': - 'glib-2.0/include/%s/glibconfig.h' % arch} - shell.replace(makefilein, replacements) - await super(Recipe, self).configure() |