GNOME Bugzilla – Bug 794856
meson: fix install dir for generated header files to allow for custom include directories
Last modified: 2018-08-10 12:00:00 UTC
Created attachment 370375 [details] [review] gstreamer meson patch The configured files should directly be created in the includedir that is given in the options for meson.
Thanks for the patch. It looks right, but just out of curiosity, could you describe your use case / scenario where this is needed?
I'm porting the Nixos packages of gstreamer and plugins to meson. Nixos splits the build output into several independent folders and that caused some errors while installing the gstreamer package. I will also need to upstream some changes to the plugins, so would it be okay to use this issue for all of them? Or should I create a new issue per patch?
Created attachment 370397 [details] [review] gst-editing-services meson patch
Created attachment 370398 [details] [review] gst-plugins-bad meson patch
Created attachment 370399 [details] [review] gst-plugins-base meson patch
Okay, I added all patches :)
There is a function to join paths in meson, shouldn't you use that instead of + '/... ?
Created attachment 370409 [details] [review] gst-plugins-bad meson patch
Created attachment 370410 [details] [review] gst-plugins-base meson patch
Created attachment 370411 [details] [review] gstreamer meson patch
Created attachment 370413 [details] [review] gst-editing-services meson patch
Created attachment 370414 [details] [review] gst-plugins-base meson patch
Ping
Sorry, but the patches don't apply any more. Please update them and I'll get them merged.
Comment on attachment 370414 [details] [review] gst-plugins-base meson patch Committed without the gl part which was installed into libdir on purpose. You will have to take account of that in your packaging. >--- a/gst-libs/gst/gl/meson.build >+++ b/gst-libs/gst/gl/meson.build >@@ -707,7 +707,7 @@ if build_gstgl > > configure_file(input : 'gstglconfig.h.meson', > output : 'gstglconfig.h', >- install_dir : get_option('libdir') + '/gstreamer-1.0/include/gst/gl', >+ install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/gl'), > configuration : glconf) commit efa9bdccf972efeb377d38e2083e8d411c73b703 (HEAD -> master) Author: Bastian Köcher <gnome@kchr.de> Date: Fri Aug 10 12:43:38 2018 +0100 meson: fix install dir for generated header files Nixos installs into a non-standard includedir, so need to take account of the 'includedir' option instead of just hard-coding 'include' here. https://bugzilla.gnome.org/show_bug.cgi?id=794856
Comment on attachment 370409 [details] [review] gst-plugins-bad meson patch Rebased and pushed: commit c73abb0c71b6ea4fb268f9d99fda63fd6aac8eef (HEAD -> master) Author: Bastian Köcher <gnome@kchr.de> Date: Fri Aug 10 12:57:47 2018 +0100 meson: fix install dir for generated header files Nixos installs into a non-standard includedir, so need to take account of the 'includedir' option instead of just hard-coding 'include' here. https://bugzilla.gnome.org/show_bug.cgi?id=794856