gst-libs/gst/audio/meson.build

@@ -14,10 +14,20 @@ gstbadaudio = library('gstbadaudio-' + api_version,
   dependencies : [gstaudio_dep, gstbase_dep],
 )
 
+pkgconfig.generate(gstbadaudio,
+  libraries : [gst_dep, gstbase_dep],
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-bad-audio-1.0',
+  description : 'Bad audio library for GStreamer elements',
+)
+
 gstbadaudio_dep = declare_dependency(link_with : gstbadaudio,
   include_directories : [libsinc],
   dependencies : [gstaudio_dep, gstbase_dep])
 
+meson.override_dependency('gstreamer-bad-audio-1.0', gstbadaudio_dep)
+
 if build_gir
   audio_gir = gnome.generate_gir(gstbadaudio,
     sources : badaudio_sources + badaudio_headers,

gst-libs/gst/codecparsers/meson.build

@@ -53,6 +53,16 @@ gstcodecparsers = library('gstcodecparsers-' + api_version,
   dependencies : [gstbase_dep, libm],
 )
 
+pkgconfig.generate(gstcodecparsers,
+  libraries : [gst_dep, gstbase_dep],
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-codecparsers-1.0',
+  description : 'Bitstream parsers for GStreamer elements',
+)
+
 gstcodecparsers_dep = declare_dependency(link_with : gstcodecparsers,
   include_directories : [libsinc],
   dependencies : [gstbase_dep])
+
+meson.override_dependency('gstreamer-codecparsers-1.0', gstcodecparsers_dep)

gst-libs/gst/codecs/gsth265decoder.c

@@ -132,6 +132,7 @@ static GstFlowReturn gst_h265_decoder_handle_frame (GstVideoDecoder * decoder,
     GstVideoCodecFrame * frame);
 
 static gboolean gst_h265_decoder_finish_current_picture (GstH265Decoder * self);
+static void gst_h265_decoder_clear_ref_pic_sets (GstH265Decoder * self);
 static void gst_h265_decoder_clear_dpb (GstH265Decoder * self);
 static gboolean gst_h265_decoder_drain_internal (GstH265Decoder * self);
 static gboolean gst_h265_decoder_start_current_picture (GstH265Decoder * self);
@@ -183,6 +184,9 @@ gst_h265_decoder_finalize (GObject * object)
   GstH265DecoderPrivate *priv = self->priv;
 
   g_array_unref (priv->to_output);
+  g_array_unref (priv->ref_pic_list_tmp);
+  g_array_unref (priv->ref_pic_list0);
+  g_array_unref (priv->ref_pic_list1);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -224,6 +228,8 @@ gst_h265_decoder_stop (GstVideoDecoder * decoder)
     priv->dpb = NULL;
   }
 
+  gst_h265_decoder_clear_ref_pic_sets (self);
+
   return TRUE;
 }
 
@@ -1052,13 +1058,9 @@ has_entry_in_rps (GstH265Picture * dpb_pic,
 }
 
 static void
-gst_h265_decoder_derive_and_mark_rps (GstH265Decoder * self,
-    GstH265Picture * picture, gint32 * CurrDeltaPocMsbPresentFlag,
-    gint32 * FollDeltaPocMsbPresentFlag)
+gst_h265_decoder_clear_ref_pic_sets (GstH265Decoder * self)
 {
-  GstH265DecoderPrivate *priv = self->priv;
   guint i;
-  GArray *dpb_array;
 
   for (i = 0; i < 16; i++) {
     gst_h265_picture_replace (&self->RefPicSetLtCurr[i], NULL);
@@ -1067,6 +1069,18 @@ gst_h265_decoder_derive_and_mark_rps (GstH265Decoder * self,
     gst_h265_picture_replace (&self->RefPicSetStCurrAfter[i], NULL);
     gst_h265_picture_replace (&self->RefPicSetStFoll[i], NULL);
   }
+}
+
+static void
+gst_h265_decoder_derive_and_mark_rps (GstH265Decoder * self,
+    GstH265Picture * picture, gint32 * CurrDeltaPocMsbPresentFlag,
+    gint32 * FollDeltaPocMsbPresentFlag)
+{
+  GstH265DecoderPrivate *priv = self->priv;
+  guint i;
+  GArray *dpb_array;
+
+  gst_h265_decoder_clear_ref_pic_sets (self);
 
   /* (8-6) */
   for (i = 0; i < self->NumPocLtCurr; i++) {

gst-libs/gst/insertbin/meson.build

@@ -13,6 +13,14 @@ gstinsertbin = library('gstinsertbin-' + api_version,
   dependencies : [gst_dep],
 )
 
+pkgconfig.generate(gstinsertbin,
+  libraries : [gst_dep],
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-insertbin-1.0',
+  description : 'Bin to automatically and insertally link elements',
+)
+
 gen_sources = []
 if build_gir
   insertbin_gir = gnome.generate_gir(gstinsertbin,
@@ -34,3 +42,5 @@ gstinsertbin_dep = declare_dependency(link_with : gstinsertbin,
   include_directories : [libsinc],
   sources: gen_sources,
   dependencies : [gst_dep])
+
+meson.override_dependency('gstreamer-insertbin-1.0', gstinsertbin_dep)

gst-libs/gst/interfaces/meson.build

@@ -24,7 +24,17 @@ gstphotography = library('gstphotography-' + api_version,
   dependencies : [gst_dep],
 )
 
+pkgconfig.generate(gstphotography,
+  libraries : [gst_dep, gstbase_dep],
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-photography-1.0',
+  description : 'High level API for transcoding using GStreamer',
+)
+
 gstphotography_dep = declare_dependency(link_with : gstphotography,
   include_directories : [libsinc],
   dependencies : [gst_dep],
   sources : [photoenum_h])
+
+meson.override_dependency('gstreamer-photography-1.0', gstphotography_dep)

gst-libs/gst/mpegts/meson.build

@@ -41,6 +41,15 @@ gstmpegts = library('gstmpegts-' + api_version,
   install : true,
   dependencies : [gst_dep],
 )
+
+pkgconfig.generate(gstmpegts,
+  libraries : [gst_dep, gstbase_dep],
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-mpegts-1.0',
+  description : 'GStreamer MPEG-TS support',
+)
+
 if build_gir
   mpegts_gir = gnome.generate_gir(gstmpegts,
     sources : mpegts_sources + mpegts_headers,
@@ -62,3 +71,5 @@ gstmpegts_dep = declare_dependency(link_with : gstmpegts,
   include_directories : [libsinc],
   dependencies : [gst_dep],
   sources : gen_sources)
+
+meson.override_dependency('gstreamer-mpegts-1.0', gstmpegts_dep)

gst-libs/gst/player/meson.build

@@ -35,6 +35,14 @@ gstplayer = library('gstplayer-' + api_version,
                   gsttag_dep, gstpbutils_dep],
 )
 
+pkgconfig.generate(gstplayer,
+  libraries : [gst_dep, gstvideo_dep],
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-player-1.0',
+  description : 'GStreamer Player convenience library',
+)
+
 gen_sources = []
 if build_gir
   player_gir = gnome.generate_gir(gstplayer,
@@ -59,3 +67,5 @@ gstplayer_dep = declare_dependency(link_with : gstplayer,
   sources: gen_sources,
   dependencies : [gstbase_dep, gstvideo_dep, gstaudio_dep,
                   gsttag_dep, gstpbutils_dep])
+
+meson.override_dependency('gstreamer-player-1.0', gstplayer_dep)

gst-libs/gst/sctp/meson.build

@@ -21,6 +21,16 @@ libgstsctp = library('gstsctp-' + api_version,
   dependencies : [gstbase_dep],
 )
 
+pkgconfig.generate(libgstsctp,
+  libraries : [gst_dep],
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-sctp-1.0',
+  description : 'SCTP helper functions',
+)
+
 gstsctp_dep = declare_dependency(link_with : libgstsctp,
   include_directories : [libsinc],
   dependencies : [gstbase_dep])
+
+meson.override_dependency('gstreamer-sctp-1.0', gstsctp_dep)

gst-libs/gst/transcoder/meson.build

@@ -11,6 +11,15 @@ gst_transcoder = library('gsttranscoder-' + api_version,
   c_args: gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_TRANSCODER'],
   soversion : soversion,
 )
+
+pkgconfig.generate(gst_transcoder,
+  libraries : [gst_dep, gstbase_dep],
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-transcoder-1.0',
+  description : 'High level API for transcoding using GStreamer',
+)
+
 if build_gir
   transcoder_gir = gnome.generate_gir(gst_transcoder,
     sources : sources + headers,
@@ -30,4 +39,6 @@ endif
 gst_transcoder_dep = declare_dependency(link_with: gst_transcoder,
   dependencies : [gst_dep, gstpbutils_dep],
   include_directories : [libsinc]
-)
\ No newline at end of file
+)
+
+meson.override_dependency('gstreamer-transcoder-1.0', gst_transcoder_dep)

gst-libs/gst/vulkan/meson.build

@@ -322,6 +322,14 @@ gstvulkan = library('gstvulkan-' + api_version,
   # don't confuse gst/vulkan/xcb/xcb.h with xcb/xcb.h
   implicit_include_directories : false)
 
+pkgconfig.generate(gstvulkan,
+  libraries : [gst_dep, gstbase_dep, gstvideo_dep],
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-vulkan-1.0',
+  description : 'GStreamer Vulkan support',
+)
+
 if build_gir
   extra_gir_includes = []
   gobject_introspection_dep = dependency('gobject-introspection-1.0')
@@ -350,8 +358,17 @@ gstvulkan_dep = declare_dependency(link_with : gstvulkan,
   sources: gen_sources,
   dependencies : [gstvideo_dep, gstbase_dep, vulkan_dep] + optional_deps)
 
+meson.override_dependency('gstreamer-vulkan-1.0', gstvulkan_dep)
+
 if enabled_vulkan_winsys.contains('xcb')
   install_headers(vulkan_xcb_headers, subdir : 'gstreamer-1.0/gst/vulkan/xcb')
+  pkgconfig.generate(
+    libraries : [gstvulkan],
+    requires : ['xcb'],
+    subdirs : pkgconfig_subdirs,
+    name : 'gstreamer-vulkan-xcb-1.0',
+    description : 'GStreamer Vulkan support (XCB Specifics)',
+  )
   vulkan_xcb_gir = []
   if build_gir
     vulkan_xcb_gir = gnome.generate_gir(gstvulkan,
@@ -369,10 +386,18 @@ if enabled_vulkan_winsys.contains('xcb')
   endif
   gstvulkanxcb_dep = declare_dependency(dependencies : [gstvulkan_dep],
       sources : vulkan_xcb_gir)
+  meson.override_dependency('gstreamer-vulkan-xcb-1.0', gstvulkanxcb_dep)
 endif
 
 if enabled_vulkan_winsys.contains('wayland')
   install_headers(vulkan_wayland_headers, subdir : 'gstreamer-1.0/gst/vulkan/wayland')
+  pkgconfig.generate(
+    libraries : [gstvulkan],
+    requires : ['wayland-client'],
+    subdirs : pkgconfig_subdirs,
+    name : 'gstreamer-vulkan-wayland-1.0',
+    description : 'GStreamer Vulkan support (Wayland Specifics)',
+  )
   vulkan_wayland_gir = []
   if build_gir
     vulkan_wayland_gir = gnome.generate_gir(gstvulkan,
@@ -390,4 +415,5 @@ if enabled_vulkan_winsys.contains('wayland')
   endif
   gstvulkanwayland_dep = declare_dependency(dependencies : [gstvulkan_dep],
       sources : vulkan_wayland_gir)
+  meson.override_dependency('gstreamer-vulkan-wayland-1.0', gstvulkanwayland_dep)
 endif

gst-libs/gst/wayland/meson.build

@@ -18,7 +18,17 @@ if use_wayland
     dependencies : [gst_dep, gstvideo_dep, wl_client_dep]
   )
 
+  pkgconfig.generate(gstwayland,
+    libraries : [gst_dep, gstvideo_dep],
+    variables : pkgconfig_variables,
+    subdirs : pkgconfig_subdirs,
+    name : 'gstreamer-wayland-1.0',
+    description : 'GStreamer Wayland support',
+  )
+
   gstwayland_dep = declare_dependency(link_with : gstwayland,
     include_directories : [libsinc],
     dependencies : [gst_dep, gstvideo_dep])
+
+  meson.override_dependency('gstreamer-wayland-1.0', gstwayland_dep)
 endif

gst-libs/gst/webrtc/meson.build

@@ -53,6 +53,14 @@ gstwebrtc = library('gstwebrtc-' + api_version,
   dependencies : gstwebrtc_dependencies,
 )
 
+pkgconfig.generate(gstwebrtc,
+  libraries : [gst_dep, gstbase_dep],
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-webrtc-1.0',
+  description : 'GStreamer WebRTC support',
+)
+
 if build_gir
   webrtc_gir = gnome.generate_gir(gstwebrtc,
     sources : webrtc_sources + webrtc_headers + [gstwebrtc_h],
@@ -75,3 +83,5 @@ gstwebrtc_dep = declare_dependency(link_with: gstwebrtc,
   include_directories : libsinc,
   sources: webrtc_gen_sources,
   dependencies: gstwebrtc_dependencies)
+
+meson.override_dependency('gstreamer-webrtc-1.0', gstwebrtc_dep)

meson.build

@@ -462,6 +462,24 @@ if get_option('default_library') == 'shared'
   plugins_pkgconfig_install_dir = disabler()
 endif
 
+pkgconfig_variables = ['exec_prefix=${prefix}',
+    'toolsdir=${exec_prefix}/bin',
+    'pluginsdir=${libdir}/gstreamer-1.0',
+    'datarootdir=${prefix}/share',
+    'datadir=${datarootdir}',
+    'girdir=${datadir}/gir-1.0',
+    'typelibdir=${libdir}/girepository-1.0']
+
+pkgconfig_subdirs = ['gstreamer-1.0']
+
+pkgconfig.generate(
+  libraries : [gst_dep],
+  variables : pkgconfig_variables,
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-plugins-bad-1.0',
+  description : 'Streaming media framework, bad plugins libraries',
+)
+
 subdir('gst-libs')
 subdir('gst')
 subdir('sys')
@@ -469,7 +487,6 @@ subdir('ext')
 subdir('tests')
 subdir('data')
 subdir('tools')
-subdir('pkgconfig')
 
 if have_orcc
   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')

pkgconfig/.gitignore

-*.pc

pkgconfig/gstreamer-bad-audio-uninstalled.pc.in

-prefix=
-exec_prefix=
-libdir=@audiolibdir@
-includedir=@abs_top_srcdir@/gst-libs
-
-Name: GStreamer bad audio library, uninstalled
-Description: Bad audio library for GStreamer, Not Installed
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
-
-Libs: -L${libdir} -lgstbadaudio-@GST_API_VERSION@
-Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs

pkgconfig/gstreamer-bad-audio.pc.in

-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
-
-Name: GStreamer bad audio library, uninstalled
-Description: Bad audio library for GStreamer elements, Not Installed
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
-
-Libs: -L${libdir} -lgstbadaudio-@GST_API_VERSION@
-Cflags: -I${includedir}

pkgconfig/gstreamer-codecparsers-uninstalled.pc.in

-prefix=
-exec_prefix=
-libdir=@codecparserslibdir@
-includedir=@abs_top_builddir@/gst-libs
-
-Name: GStreamer codec parsers, Uninstalled
-Description: Bitstream parsers for GStreamer elements, uninstalled
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
-Version: @VERSION@
-Libs: -L${libdir} -lgstcodecparsers-@GST_API_VERSION@
-Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
-

pkgconfig/gstreamer-codecparsers.pc.in

-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-
-Name: GStreamer codec parsers
-Description: Bitstream parsers for GStreamer elements
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
-Version: @VERSION@
-Libs: -L${libdir} -lgstcodecparsers-@GST_API_VERSION@
-Cflags: -I${includedir}
-

pkgconfig/gstreamer-insertbin-uninstalled.pc.in

-prefix=
-exec_prefix=
-libdir=@insertbinlibdir@
-includedir=@abs_top_srcdir@/gst-libs
-
-Name: GStreamer Insert Bin, Uninstalled
-Description: Bin to automatically and insertally link elements, uninstalled
-Requires: gstreamer-@GST_API_VERSION@
-Version: @VERSION@
-Libs: -L${libdir} -lgstinsertbin-@GST_API_VERSION@
-Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
-

pkgconfig/gstreamer-insertbin.pc.in

-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-
-Name: GStreamer Insert Bin
-Description: Bin to automatically and insertally link elements
-Requires: gstreamer-@GST_API_VERSION@
-Version: @VERSION@
-Libs: -L${libdir} -lgstinsertbin-@GST_API_VERSION@
-Cflags: -I${includedir}
-