From 201e7c7803bf3c159c9b4c0b1ee5c7f66d106fd2 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 24 Apr 2018 14:05:57 -0400 Subject: [PATCH] Meson: Generate pc file for all plugins in base https://bugzilla.gnome.org/show_bug.cgi?id=794568 --- ext/alsa/meson.build | 1 + ext/cdparanoia/meson.build | 1 + ext/gl/meson.build | 1 + ext/libvisual/meson.build | 1 + ext/ogg/meson.build | 1 + ext/opus/meson.build | 1 + ext/pango/meson.build | 1 + ext/theora/meson.build | 1 + ext/vorbis/meson.build | 2 ++ gst/adder/meson.build | 1 + gst/app/meson.build | 1 + gst/audioconvert/meson.build | 1 + gst/audiomixer/meson.build | 1 + gst/audiorate/meson.build | 1 + gst/audioresample/meson.build | 1 + gst/audiotestsrc/meson.build | 1 + gst/encoding/meson.build | 1 + gst/gio/meson.build | 1 + gst/pbtypes/meson.build | 1 + gst/playback/meson.build | 1 + gst/rawparse/meson.build | 1 + gst/subparse/meson.build | 1 + gst/tcp/meson.build | 1 + gst/typefind/meson.build | 1 + gst/videoconvert/meson.build | 1 + gst/videorate/meson.build | 1 + gst/videoscale/meson.build | 1 + gst/videotestsrc/meson.build | 1 + gst/volume/meson.build | 1 + meson.build | 7 +++++++ sys/ximage/meson.build | 1 + sys/xvimage/meson.build | 1 + 32 files changed, 39 insertions(+) diff --git a/ext/alsa/meson.build b/ext/alsa/meson.build index 06d65bda2b..7e57429f7f 100644 --- a/ext/alsa/meson.build +++ b/ext/alsa/meson.build @@ -18,4 +18,5 @@ if alsa_dep.found() install : true, install_dir : plugins_install_dir, ) + pkgconfig.generate(gstalsa, install_dir : plugins_pkgconfig_install_dir) endif diff --git a/ext/cdparanoia/meson.build b/ext/cdparanoia/meson.build index 42dc8049a4..1752923aee 100644 --- a/ext/cdparanoia/meson.build +++ b/ext/cdparanoia/meson.build @@ -29,4 +29,5 @@ if cdparanoia_found install : true, install_dir : plugins_install_dir, ) + pkgconfig.generate(gstcdparanoia, install_dir : plugins_pkgconfig_install_dir) endif diff --git a/ext/gl/meson.build b/ext/gl/meson.build index 913c199eda..ec344723a9 100644 --- a/ext/gl/meson.build +++ b/ext/gl/meson.build @@ -117,4 +117,5 @@ if build_gstgl and gstgl_dep.found() install : true, install_dir : plugins_install_dir, ) + pkgconfig.generate(gstopengl, install_dir : plugins_pkgconfig_install_dir) endif diff --git a/ext/libvisual/meson.build b/ext/libvisual/meson.build index 5cc59b1823..55c0e75e2b 100644 --- a/ext/libvisual/meson.build +++ b/ext/libvisual/meson.build @@ -16,4 +16,5 @@ if libvisual_dep.found() install : true, install_dir : plugins_install_dir, ) + pkgconfig.generate(gstlibvisual, install_dir : plugins_pkgconfig_install_dir) endif diff --git a/ext/ogg/meson.build b/ext/ogg/meson.build index 2bb0f61788..ecbbee73cc 100644 --- a/ext/ogg/meson.build +++ b/ext/ogg/meson.build @@ -23,4 +23,5 @@ if ogg_dep.found() install : true, install_dir : plugins_install_dir, ) + pkgconfig.generate(gstogg, install_dir : plugins_pkgconfig_install_dir) endif diff --git a/ext/opus/meson.build b/ext/opus/meson.build index e0def6b982..3dbc26bc3f 100644 --- a/ext/opus/meson.build +++ b/ext/opus/meson.build @@ -18,4 +18,5 @@ if opus_dep.found() install : true, install_dir : plugins_install_dir, ) + pkgconfig.generate(gstopus, install_dir : plugins_pkgconfig_install_dir) endif diff --git a/ext/pango/meson.build b/ext/pango/meson.build index 89dd68abab..d157264970 100644 --- a/ext/pango/meson.build +++ b/ext/pango/meson.build @@ -18,4 +18,5 @@ if pango_dep.found() install : true, install_dir : plugins_install_dir, ) + pkgconfig.generate(gstpango, install_dir : plugins_pkgconfig_install_dir) endif diff --git a/ext/theora/meson.build b/ext/theora/meson.build index 1b5327edfb..5616cff37f 100644 --- a/ext/theora/meson.build +++ b/ext/theora/meson.build @@ -26,4 +26,5 @@ if theoradec_dep.found() or theoraenc_dep.found() install : true, install_dir : plugins_install_dir, ) + pkgconfig.generate(gsttheora, install_dir : plugins_pkgconfig_install_dir) endif diff --git a/ext/vorbis/meson.build b/ext/vorbis/meson.build index 78b49e1efe..b883227e86 100644 --- a/ext/vorbis/meson.build +++ b/ext/vorbis/meson.build @@ -39,6 +39,7 @@ if vorbis_dep.found() install : true, install_dir : plugins_install_dir, ) + pkgconfig.generate(gstvorbis, install_dir : plugins_pkgconfig_install_dir) endif if vorbisidec_dep.found() @@ -51,4 +52,5 @@ if vorbisidec_dep.found() install : true, install_dir : plugins_install_dir, ) + pkgconfig.generate(gstivorbisdec, install_dir : plugins_pkgconfig_install_dir) endif diff --git a/gst/adder/meson.build b/gst/adder/meson.build index f02a3477bc..19edae34ad 100644 --- a/gst/adder/meson.build +++ b/gst/adder/meson.build @@ -27,3 +27,4 @@ adder = library('gstadder', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(adder, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/app/meson.build b/gst/app/meson.build index 90873a91be..6e3098e824 100644 --- a/gst/app/meson.build +++ b/gst/app/meson.build @@ -6,3 +6,4 @@ adder = library('gstapp', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(adder, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/audioconvert/meson.build b/gst/audioconvert/meson.build index ffe914dbef..e7a1527d1f 100644 --- a/gst/audioconvert/meson.build +++ b/gst/audioconvert/meson.build @@ -11,3 +11,4 @@ gstaudioconvert = library('gstaudioconvert', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstaudioconvert, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/audiomixer/meson.build b/gst/audiomixer/meson.build index d852540e91..9da6b16d11 100644 --- a/gst/audiomixer/meson.build +++ b/gst/audiomixer/meson.build @@ -30,3 +30,4 @@ gstaudiomixer = library('gstaudiomixer', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstaudiomixer, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/audiorate/meson.build b/gst/audiorate/meson.build index a5862693e1..22bad0d6ae 100644 --- a/gst/audiorate/meson.build +++ b/gst/audiorate/meson.build @@ -6,3 +6,4 @@ audiorate = library('gstaudiorate', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(audiorate, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/audioresample/meson.build b/gst/audioresample/meson.build index 6dcfd8807e..53c428b707 100644 --- a/gst/audioresample/meson.build +++ b/gst/audioresample/meson.build @@ -8,3 +8,4 @@ audioresample = library('gstaudioresample', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(audioresample, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/audiotestsrc/meson.build b/gst/audiotestsrc/meson.build index 14df1dfd56..8fa6a40b73 100644 --- a/gst/audiotestsrc/meson.build +++ b/gst/audiotestsrc/meson.build @@ -6,3 +6,4 @@ audiotest = library('gstaudiotestsrc', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(audiotest, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/encoding/meson.build b/gst/encoding/meson.build index bab3f7f645..296c13c2cb 100644 --- a/gst/encoding/meson.build +++ b/gst/encoding/meson.build @@ -12,3 +12,4 @@ gstencoding = library('gstencoding', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstencoding, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/gio/meson.build b/gst/gio/meson.build index 4c0b46ea92..79252165e7 100644 --- a/gst/gio/meson.build +++ b/gst/gio/meson.build @@ -15,3 +15,4 @@ gstgio = library('gstgio', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstgio, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/pbtypes/meson.build b/gst/pbtypes/meson.build index 55f752109b..b256b57308 100644 --- a/gst/pbtypes/meson.build +++ b/gst/pbtypes/meson.build @@ -10,3 +10,4 @@ gstpbtypes = library('gstpbtypes', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstpbtypes, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/playback/meson.build b/gst/playback/meson.build index ef765a3e0b..fc0e5d9163 100644 --- a/gst/playback/meson.build +++ b/gst/playback/meson.build @@ -26,3 +26,4 @@ gstplayback = library('gstplayback', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstplayback, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/rawparse/meson.build b/gst/rawparse/meson.build index 611f18b7ef..ff124298e7 100644 --- a/gst/rawparse/meson.build +++ b/gst/rawparse/meson.build @@ -15,4 +15,5 @@ gstrawparse = library('gstrawparse', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstrawparse, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/subparse/meson.build b/gst/subparse/meson.build index f3b02ac10c..a31bde34b4 100644 --- a/gst/subparse/meson.build +++ b/gst/subparse/meson.build @@ -15,3 +15,4 @@ gstsubparse = library('gstsubparse', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstsubparse, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/tcp/meson.build b/gst/tcp/meson.build index 712937164c..77b813a160 100644 --- a/gst/tcp/meson.build +++ b/gst/tcp/meson.build @@ -21,3 +21,4 @@ gsttcp = library('gsttcp', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gsttcp, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/typefind/meson.build b/gst/typefind/meson.build index bae11f0793..09a2c712ad 100644 --- a/gst/typefind/meson.build +++ b/gst/typefind/meson.build @@ -6,3 +6,4 @@ gsttypefind = library('gsttypefindfunctions', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gsttypefind, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/videoconvert/meson.build b/gst/videoconvert/meson.build index e0fbd4bdc6..8dda897790 100644 --- a/gst/videoconvert/meson.build +++ b/gst/videoconvert/meson.build @@ -10,3 +10,4 @@ gstvideoconvert = library('gstvideoconvert', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstvideoconvert, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/videorate/meson.build b/gst/videorate/meson.build index df386fce28..f260790f80 100644 --- a/gst/videorate/meson.build +++ b/gst/videorate/meson.build @@ -6,3 +6,4 @@ gstvideorate = library('gstvideorate', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstvideorate, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/videoscale/meson.build b/gst/videoscale/meson.build index 1a0916ad6b..7e4bf2f679 100644 --- a/gst/videoscale/meson.build +++ b/gst/videoscale/meson.build @@ -10,3 +10,4 @@ gstvideoscale = library('gstvideoscale', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstvideoscale, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/videotestsrc/meson.build b/gst/videotestsrc/meson.build index 6f24d07ed1..08c6406c70 100644 --- a/gst/videotestsrc/meson.build +++ b/gst/videotestsrc/meson.build @@ -27,3 +27,4 @@ gstvideotestsrc = library('gstvideotestsrc', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstvideotestsrc, install_dir : plugins_pkgconfig_install_dir) diff --git a/gst/volume/meson.build b/gst/volume/meson.build index 22a1c7a313..b4d24507d6 100644 --- a/gst/volume/meson.build +++ b/gst/volume/meson.build @@ -26,3 +26,4 @@ gstvolume = library('gstvolume', 'gstvolume.c', orc_c, orc_h, install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstvolume, install_dir : plugins_pkgconfig_install_dir) diff --git a/meson.build b/meson.build index bb41d44c48..48a3da215f 100644 --- a/meson.build +++ b/meson.build @@ -311,6 +311,13 @@ gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + 'g_setenv("GST_PLUGIN_SYSTEM_PATH_1_0", "", TRUE);' + \ 'gst_init(NULL,NULL);' ] +pkgconfig = import('pkgconfig') +plugins_pkgconfig_install_dir = join_paths(plugins_install_dir, 'pkgconfig') +if get_option('default_library') == 'shared' + # If we don't build static plugins there is no need to generate pc files + plugins_pkgconfig_install_dir = disabler() +endif + subdir('gst-libs') subdir('gst') subdir('ext') diff --git a/sys/ximage/meson.build b/sys/ximage/meson.build index 063b147926..b1bcf1d387 100644 --- a/sys/ximage/meson.build +++ b/sys/ximage/meson.build @@ -6,3 +6,4 @@ gstximage = library('gstximagesink', install : true, install_dir : plugins_install_dir, ) +pkgconfig.generate(gstximage, install_dir : plugins_pkgconfig_install_dir) diff --git a/sys/xvimage/meson.build b/sys/xvimage/meson.build index 6e9ea30fd2..216c0ecf86 100644 --- a/sys/xvimage/meson.build +++ b/sys/xvimage/meson.build @@ -18,4 +18,5 @@ if xvideo_dep.found() install : true, install_dir : plugins_install_dir, ) + pkgconfig.generate(gstxvimage, install_dir : plugins_pkgconfig_install_dir) endif