Merge branch 'gst-plugins-base-issue-846' into 'main'

basetextoverlay: Remove redundant overlay composition metas See merge request gstreamer/gstreamer!940
meson: Fix Python library searching on Windows
2024-05-11 13:02:52 +00:00 · 2024-04-27 14:58:41 +00:00 · 2024-04-27 01:30:21 +00:00 · 2024-04-27 01:30:21 +00:00 · 2021-09-27 17:54:31 +01:00
2 changed files with 32 additions and 14 deletions
--- a/subprojects/gst-plugins-base/ext/pango/gstbasetextoverlay.c
+++ b/subprojects/gst-plugins-base/ext/pango/gstbasetextoverlay.c
@ -2776,6 +2776,11 @@ gst_base_text_overlay_video_chain (GstPad * pad, GstObject * parent,
      GST_DEBUG ("GstVideoOverlayCompositionMeta found.");
      overlay->upstream_composition = composition_meta->overlay;
      overlay->need_render = TRUE;
+    } else {
+      GST_DEBUG_OBJECT (overlay, "Removing redundant composition meta %p",
+          composition_meta);
+      gst_buffer_remove_video_overlay_composition_meta (buffer,
+          composition_meta);
    }
  } else if (overlay->upstream_composition != NULL) {
    overlay->upstream_composition = NULL;
--- a/subprojects/gst-python/meson.build
+++ b/subprojects/gst-python/meson.build
@ -45,35 +45,53 @@ pylib_loc = get_option('libpython-dir')
 fsmod = import('fs')
 pylib_prefix = 'lib'
 pylib_suffix = 'so'
+pylib_ver = python_dep.version()
+pylib_locs = []
 if host_system == 'windows'
  if cc.get_argument_syntax() == 'msvc'
    pylib_prefix = ''
  endif
  pylib_suffix = 'dll'
+  pylib_ver = pylib_ver.replace('.', '')
 elif host_system == 'darwin'
  pylib_suffix = 'dylib'
 endif
 pylib_fnames = []
 # Library name with soversion, non-devel package
-pylib_fnames += python.get_variable('INSTSONAME', [])
+if python.has_variable('INSTSONAME')
+  # For example, libpython3.12.so.1.0 (Linux), libpython3.11.dll.a (MSYS2), etc.
+  pylib_fnames += python.get_variable('INSTSONAME')
+endif
 # Library name without soversion, devel package, framework, etc.
-pylib_fnames += python.get_variable('LDLIBRARY', [])
+if python.has_variable('LDLIBRARY')
+  # For example, libpython3.12.so (Linux), libpython3.11.dll.a (MSYS2), etc.
+  pylib_fnames += python.get_variable('LDLIBRARY')
+endif
 # Manually construct name as a fallback
 pylib_fnames += [
-  pylib_prefix + 'python' + python_dep.version() + python_abi_flags + '.' + pylib_suffix
+  pylib_prefix + 'python' + pylib_ver + python_abi_flags + '.' + pylib_suffix
 ]
 if pylib_loc != ''
  pylib_locs = [pylib_loc]
 else
-  pylib_locs = [
-    python.get_variable('LIBDIR', ''),
-    python.get_variable('LIBPL', ''),
-  ]
+  if python.has_variable('LIBDIR')
+    pylib_locs += python.get_variable('LIBDIR')
+  endif
+  if python.has_variable('LIBPL')
+    pylib_locs += python.get_variable('LIBPL')
+  endif
+  # On Windows, python312.dll is in the rootdir where Python is installed,
+  # which is configured as the "prefix" in sysconfig.
+  if host_system == 'windows'
+    pylib_locs += python.get_variable('prefix')
+  endif
 endif
 pylib_fname = ''
 foreach loc: pylib_locs
  foreach fname: pylib_fnames
-    if fsmod.exists(loc / fname)
+    fpath = loc / fname
+    debug(f'Looking for Python library at: @fpath@')
+    if fsmod.exists(fpath)
      pylib_fname = fname
      message(f'PY_LIB_FNAME = @fname@ (@loc@)')
      break
@ -81,12 +99,7 @@ foreach loc: pylib_locs
  endforeach
 endforeach
 if pylib_fname == ''
-  error_msg = 'Could not find python library to load'
-  if python_opt.enabled()
-    error(error_msg)
-  else
-    message(error_msg)
-  endif
+  message('Could not find python library to load, will try loading at runtime')
 endif

 pygi_override_dir = get_option('pygi-overrides-dir')
Author	SHA1	Message	Date
Philippe Normand	ba4b926ce9	Merge branch 'gst-plugins-base-issue-846' into 'main' basetextoverlay: Remove redundant overlay composition metas See merge request gstreamer/gstreamer!940	2024-04-27 14:58:41 +00:00
Nirbheek Chauhan	d7eeb62f38	meson: Fix Python library searching on Windows Neither LIBDIR nor LIBPL are set with the native windows Python (unlike MSYS2), so we need to use `prefix` which takes us to the rootdir of the Python installation. The name is also different: it's python312.dll, not python3.12.dll. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6734>	2024-04-27 01:30:21 +00:00
Nirbheek Chauhan	753aeccde7	meson: Fix Python library name fetching on Windows `python.get_variable('FOO', [])` becomes `python.get_variable('FOO')` due to how Meson treats empty arrays in arguments, which breaks the fallback feature of get_variable(). So we need to actually check whether the variable exists before trying to fetch it. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6734>	2024-04-27 01:30:21 +00:00
Philippe Normand	4e119e3d02	basetextoverlay: Remove redundant overlay composition metas Ensure the outgoing video frame has at most one overlay composition meta. When multiple textoverlay elements are in the same pipeline, the downstream one reuses the overlay composition meta of the upstream one, but the overlay compositor currently handles only one overlay composition meta per frame, so the textoverlay needs to get rid of the meta that is being reused from its upstream counterpart. Fixes #846	2021-09-27 17:54:31 +01:00