mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: fix install dir for generated header files

Browse source 
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
This commit is contained in:
Bastian Köcher 2018-08-10 12:57:47 +01:00 committed by Tim-Philipp Müller
parent 10fcddedc2
commit c73abb0c71
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst-libs/gst/interfaces/meson.build
View file

@ -7,7 +7,8 @@ photo_enums = gnome.mkenums_simple('photography-enumtypes',
header_prefix : '#include <gst/interfaces/photography-prelude.h>', header_prefix : '#include <gst/interfaces/photography-prelude.h>',
decorator: 'GST_PHOTOGRAPHY_API', decorator: 'GST_PHOTOGRAPHY_API',
install_header: true, install_header: true,
install_dir : 'include/gstreamer-1.0/gst/interfaces/') install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/interfaces'))
photoenum_c = photo_enums[0] photoenum_c = photo_enums[0]
photoenum_h = photo_enums[1] photoenum_h = photo_enums[1]

2
gst-libs/gst/mpegts/meson.build
View file

@ -23,7 +23,7 @@ mpegts_enums = gnome.mkenums_simple('gstmpegts-enumtypes',
header_prefix : '#include <gst/mpegts/mpegts-prelude.h>', header_prefix : '#include <gst/mpegts/mpegts-prelude.h>',
decorator : 'GST_MPEGTS_API', decorator : 'GST_MPEGTS_API',
install_header: true, install_header: true,
install_dir : 'include/gstreamer-1.0/gst/mpegts/') install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/mpegts'))
mpegtsenumtypes_h = mpegts_enums[1] mpegtsenumtypes_h = mpegts_enums[1]

3
gst-libs/gst/webrtc/meson.build
View file

@ -30,7 +30,8 @@ webrtc_enums = gnome.mkenums_simple('webrtc-enumtypes',
header_prefix : '#include <gst/webrtc/webrtc_fwd.h>', header_prefix : '#include <gst/webrtc/webrtc_fwd.h>',
decorator: 'GST_WEBRTC_API', decorator: 'GST_WEBRTC_API',
install_header: true, install_header: true,
install_dir : 'include/gstreamer-1.0/gst/webrtc/') install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/webrtc/'))
gstwebrtc_c = webrtc_enums[0] gstwebrtc_c = webrtc_enums[0]
gstwebrtc_h = webrtc_enums[1] gstwebrtc_h = webrtc_enums[1]