diff options
| author |   Andreas Müller <schnitzeltony@gmail.com> | 2021-12-31 18:29:56 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2022-01-05 08:17:18 -0800 |
| commit | 9f4b8346a9bc2a1f201e9517fe8575ab86831c1d (patch) | |
| tree | 020d96231686fb4d356186b8a9beabbdca419075 | |
| parent | c8936b7da8172c95e97e8defc6e4306ce2184bcb (diff) | |
| download | meta-openembedded-contrib-9f4b8346a9bc2a1f201e9517fe8575ab86831c1d.tar.gz | |
gsound: upgrade 1.0.2 -> 1.0.3 / build with meson
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/gsound/gsound/0001-Set-vapidir.patch | 28 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb (renamed from meta-gnome/recipes-gnome/gsound/gsound_1.0.2.bb) | 7 |
2 files changed, 3 insertions, 32 deletions
diff --git a/meta-gnome/recipes-gnome/gsound/gsound/0001-Set-vapidir.patch b/meta-gnome/recipes-gnome/gsound/gsound/0001-Set-vapidir.patch deleted file mode 100644 index ffccfd56f2..0000000000 --- a/meta-gnome/recipes-gnome/gsound/gsound/0001-Set-vapidir.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0a790273aca3ba07dfa6d2f61e3aaa7157c1a3bb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 20 Mar 2021 09:22:18 -0700 -Subject: [PATCH] Set vapidir - -Use parentheses instead of braces, it makes automake and perl happy -newer perl does not like ${} for VALAFLAGS - -Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.30), passed through in regex; marked by <-- HERE in m/^${ <-- HERE abs_top_builddir}/gsound$/ at TOPDIR/build/tmp/work/mips32r2-yoe-linux/gsound/1.0.2-r0/recipe-sysroot-native/usr/bin/automake line 5759. -autoreconf: error: automake failed with exit status: 255 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tools/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -8,7 +8,7 @@ bin_PROGRAMS = gsound-play - gsound_play_SOURCES = gsound-play.vala - - gsound_play_VALAFLAGS = \ -- --vapidir ${abs_top_builddir}/gsound \ -+ --vapidir $(abs_top_builddir)/gsound \ - --pkg gsound \ - ${NULL} - diff --git a/meta-gnome/recipes-gnome/gsound/gsound_1.0.2.bb b/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb index 65ee1e1c12..7c7925420c 100644 --- a/meta-gnome/recipes-gnome/gsound/gsound_1.0.2.bb +++ b/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb @@ -7,9 +7,8 @@ DEPENDS = " \ libcanberra \ " -inherit gnomebase gettext gobject-introspection vala +GNOMEBASEBUILDCLASS = "meson" -SRC_URI += "file://0001-Set-vapidir.patch" +inherit gnomebase gettext gobject-introspection vala -SRC_URI[archive.md5sum] = "c26fd21c21b9ef6533a202a73fab21db" -SRC_URI[archive.sha256sum] = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53" +SRC_URI[archive.sha256sum] = "ca2d039e1ebd148647017a7f548862350bc9af01986d39f10cfdc8e95f07881a" |