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 794856 - meson: fix install dir for generated header files to allow for custom include directories
meson: fix install dir for generated header files to allow for custom include...
Status: RESOLVED FIXED
Product: GStreamer
Classification: Platform
Component: gstreamer (core)
1.14.0
Other Linux
: Normal normal
: 1.15.1
Assigned To: GStreamer Maintainers
GStreamer Maintainers
Depends on:
Blocks:
 
 
Reported: 2018-03-31 11:57 UTC by Bastian Köcher
Modified: 2018-08-10 12:00 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
gstreamer meson patch (1.72 KB, patch)
2018-03-31 11:57 UTC, Bastian Köcher
none Details | Review
gst-editing-services meson patch (812 bytes, patch)
2018-03-31 22:32 UTC, Bastian Köcher
none Details | Review
gst-plugins-bad meson patch (2.10 KB, patch)
2018-03-31 22:32 UTC, Bastian Köcher
none Details | Review
gst-plugins-base meson patch (4.81 KB, patch)
2018-03-31 22:33 UTC, Bastian Köcher
none Details | Review
gst-plugins-bad meson patch (2.13 KB, patch)
2018-04-01 13:27 UTC, Bastian Köcher
committed Details | Review
gst-plugins-base meson patch (4.89 KB, patch)
2018-04-01 13:52 UTC, Bastian Köcher
none Details | Review
gstreamer meson patch (2.37 KB, patch)
2018-04-01 14:07 UTC, Bastian Köcher
committed Details | Review
gst-editing-services meson patch (822 bytes, patch)
2018-04-01 14:23 UTC, Bastian Köcher
committed Details | Review
gst-plugins-base meson patch (5.44 KB, patch)
2018-04-01 15:35 UTC, Bastian Köcher
committed Details | Review

Description Bastian Köcher 2018-03-31 11:57:15 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.
Comment 1 Tim-Philipp Müller 2018-03-31 14:54:29 UTC
Thanks for the patch. It looks right, but just out of curiosity, could you describe your use case / scenario where this is needed?
Comment 2 Bastian Köcher 2018-03-31 20:36:27 UTC
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?
Comment 3 Bastian Köcher 2018-03-31 22:32:13 UTC
Created attachment 370397 [details] [review]
gst-editing-services meson patch
Comment 4 Bastian Köcher 2018-03-31 22:32:45 UTC
Created attachment 370398 [details] [review]
gst-plugins-bad meson patch
Comment 5 Bastian Köcher 2018-03-31 22:33:34 UTC
Created attachment 370399 [details] [review]
gst-plugins-base meson patch
Comment 6 Bastian Köcher 2018-03-31 22:35:33 UTC
Okay, I added all patches :)
Comment 7 Nicolas Dufresne (ndufresne) 2018-03-31 23:54:16 UTC
There is a function to join paths in meson, shouldn't you use that instead of + '/... ?
Comment 8 Bastian Köcher 2018-04-01 13:27:09 UTC
Created attachment 370409 [details] [review]
gst-plugins-bad meson patch
Comment 9 Bastian Köcher 2018-04-01 13:52:11 UTC
Created attachment 370410 [details] [review]
gst-plugins-base meson patch
Comment 10 Bastian Köcher 2018-04-01 14:07:39 UTC
Created attachment 370411 [details] [review]
gstreamer meson patch
Comment 11 Bastian Köcher 2018-04-01 14:23:37 UTC
Created attachment 370413 [details] [review]
gst-editing-services meson patch
Comment 12 Bastian Köcher 2018-04-01 15:35:59 UTC
Created attachment 370414 [details] [review]
gst-plugins-base meson patch
Comment 13 Bastian Köcher 2018-07-05 20:38:32 UTC
Ping
Comment 14 Tim-Philipp Müller 2018-07-07 10:51:41 UTC
Sorry, but the patches don't apply any more. Please update them and I'll get them merged.
Comment 15 Tim-Philipp Müller 2018-08-10 11:50:18 UTC
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 16 Tim-Philipp Müller 2018-08-10 11:58:58 UTC
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