Merge branch 'wavparse-allow-4gb' into 'main'

wavparse: allow WAV files up to 4Gb instead of 2Gb See merge request gstreamer/gstreamer!6290
meson: Fix Python library searching on Windows
2024-05-11 04:52:42 +00:00 · 2024-04-27 19:42:38 +00:00 · 2024-04-27 01:30:21 +00:00 · 2024-04-27 01:30:21 +00:00 · 2024-03-12 13:58:59 +00:00
2 changed files with 27 additions and 20 deletions
--- a/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c
+++ b/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c
@ -1304,12 +1304,6 @@ gst_wavparse_stream_headers (GstWavParse * wav)
        "Got TAG: %" GST_FOURCC_FORMAT ", offset %" G_GUINT64_FORMAT ", size %"
        G_GUINT32_FORMAT, GST_FOURCC_ARGS (tag), wav->offset, size);

-    /* Maximum valid size is INT_MAX */
-    if (size & 0x80000000) {
-      GST_WARNING_OBJECT (wav, "Invalid size, clipping to 0x7fffffff");
-      size = 0x7fffffff;
-    }
-
    /* Clip to upstream size if known */
    if (upstream_size > 0 && size + wav->offset > upstream_size) {
      GST_WARNING_OBJECT (wav, "Clipping chunk size to file size");
--- 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
Yury Shatz	8e554f9327	Merge branch 'wavparse-allow-4gb' into 'main' wavparse: allow WAV files up to 4Gb instead of 2Gb See merge request gstreamer/gstreamer!6290	2024-04-27 19:42:38 +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
Jurijs Satcs	d77818cb74	wavparse: allow WAV files up to 4Gb instead of 2Gb Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2853	2024-03-12 13:58:59 +00:00