After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 796273 - meson [1.14]: Fix detection of glib-mkenums under MSYS2
meson [1.14]: Fix detection of glib-mkenums under MSYS2
Status: RESOLVED FIXED
Product: GStreamer
Classification: Platform
Component: gstreamer (core)
1.14.0
Other Windows
: Normal normal
: 1.14.2
Assigned To: GStreamer Maintainers
GStreamer Maintainers
Depends on:
Blocks:
 
 
Reported: 2018-05-20 11:59 UTC by Christoph Reiter (lazka)
Modified: 2018-05-20 16:20 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
meson: Fix detection of glib-mkenums under MSYS2 (1010 bytes, patch)
2018-05-20 11:59 UTC, Christoph Reiter (lazka)
committed Details | Review
0001-meson-delete-unused-variable.patch (842 bytes, patch)
2018-05-20 14:20 UTC, Christoph Reiter (lazka)
none Details | Review
0002-meson-use-gnome.mkenums_simple-to-generate-controlle (5.46 KB, patch)
2018-05-20 14:21 UTC, Christoph Reiter (lazka)
none Details | Review
0003-meson-use-gnome.mkenums_simple-to-generate-core-enum (1.53 KB, patch)
2018-05-20 14:21 UTC, Christoph Reiter (lazka)
none Details | Review
0004-meson-bump-meson-req-for-gnome.mkenums_simple (664 bytes, patch)
2018-05-20 14:21 UTC, Christoph Reiter (lazka)
none Details | Review

Description Christoph Reiter (lazka) 2018-05-20 11:59:00 UTC
Created attachment 372235 [details] [review]
meson: Fix detection of glib-mkenums under MSYS2

Under MSYS2 glib-mkenums is an executable and has a .exe extension and
the path does not end with "glib-mkenums".

Make the script compare the path without the file extension instead.

----

Those scripts are gone in master, so this is for 1.14 only.
Comment 1 Tim-Philipp Müller 2018-05-20 12:23:59 UTC
Comment on attachment 372235 [details] [review]
meson: Fix detection of glib-mkenums under MSYS2

Or maybe we should backport the commit that makes it use gnome.mkenums_simple() from master instead.
Comment 2 Christoph Reiter (lazka) 2018-05-20 12:27:27 UTC
ok, I'll give that a try.

Assuming the current meson_version>=0.40.1 is correct, this would bump it to >=0.42.0
Comment 3 Tim-Philipp Müller 2018-05-20 12:33:34 UTC
Right. I think that'd be fine, since meson is still not our primary build system officially. Will think about it.
Comment 4 Christoph Reiter (lazka) 2018-05-20 14:20:53 UTC
Created attachment 372240 [details] [review]
0001-meson-delete-unused-variable.patch
Comment 5 Christoph Reiter (lazka) 2018-05-20 14:21:16 UTC
Created attachment 372241 [details] [review]
0002-meson-use-gnome.mkenums_simple-to-generate-controlle
Comment 6 Christoph Reiter (lazka) 2018-05-20 14:21:40 UTC
Created attachment 372242 [details] [review]
0003-meson-use-gnome.mkenums_simple-to-generate-core-enum
Comment 7 Christoph Reiter (lazka) 2018-05-20 14:21:56 UTC
Created attachment 372243 [details] [review]
0004-meson-bump-meson-req-for-gnome.mkenums_simple
Comment 8 Christoph Reiter (lazka) 2018-05-20 14:25:57 UTC
These are the four patches from master which could be backported. The first three applied cleanly, the last has a small conflict due to the library version number.

Tested under MSYS2 and Debian sid.

(I'm not sure re-attaching these here helps you in any way, so please tell and I wont in the future)
Comment 9 Christoph Reiter (lazka) 2018-05-20 14:27:39 UTC
s/the last has/the last had/
Comment 10 Tim-Philipp Müller 2018-05-20 15:43:14 UTC
It's fine to list the commits to cherry-pick in future, no need to attach patches for that.

For 1.14, let's go with your original patch. I prefer to keep the diff as small as possible between bug-fix releases.
Comment 11 Tim-Philipp Müller 2018-05-20 15:45:02 UTC
Thanks for the patch!

commit 7cbbdf3a90ef8d92c993d0b1a1c3a73d03f6bca4 (HEAD -> 1.14)
Author: Christoph Reiter <reiter.christoph@gmail.com>
Date:   Sun May 20 13:53:31 2018 +0200

    meson: Fix detection of glib-mkenums under MSYS2
    
    Under MSYS2 glib-mkenums is an executable and has a .exe extension and
    the path does not end with "glib-mkenums".
    
    Make the script compare the path without the file extension instead.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=796273
Comment 12 Christoph Reiter (lazka) 2018-05-20 16:20:23 UTC
\o/ Thanks!