openjdk · snazarkin · Feb 24, 2025
diff --git a/modules/javafx.media/src/main/legal/glib.md b/modules/javafx.media/src/main/legal/glib.md
@@ -1,11 +1,11 @@
-## GNU Glib v2.80.4
+## GNU Glib v2.82.4
 
 ### Glib Notice
 ```
 
-You are receiving a copy of GNU Glib, Version: 2.80.4 in either source or
+You are receiving a copy of GNU Glib, Version: 2.82.4 in either source or
 object code in the JavaFX runtime or JavaFX SDK. The terms of the
-Oracle license do NOT apply to the GNU Glib, Version: 2.80.4; it is
+Oracle license do NOT apply to the GNU Glib, Version: 2.82.4; it is
 licensed under the following license, separately from the Oracle programs
 you receive. If you do not wish to install this library, you may delete
 this library:
@@ -88,7 +88,7 @@ Copyright (C) 1999-2019 Free Software
 Copyright (C) 1999-2003 Red Hat Software
 Copyright (C) 2004       Anders Carlsson <andersca@gnome.org>
 Copyright (C) 2000 Eazel, Inc.
-Copyright (C) 2002-2007
+Copyright (C) 2002-2007 Soeren Sandmann (sandmann@daimi.au.dk)
 Copyright (C) 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
 Copyright (C) 2017-2019 Руслан Ижбулатов
 Copyright (C) 2005-2007 Imendio AB

diff --git a/modules/javafx.media/src/main/legal/gstreamer.md b/modules/javafx.media/src/main/legal/gstreamer.md
@@ -1,11 +1,11 @@
-## GStreamer v1.24.6
+## GStreamer v1.24.10
 
 ### GStreamer Notice
 ```
 
-You are receiving a copy of GStreamer, Version: 1.24.6 in either source or
+You are receiving a copy of GStreamer, Version: 1.24.10 in either source or
 object code in the JavaFX runtime or JavaFX SDK. The terms of the
-Oracle license do NOT apply to the GStreamer, Version: 1.24.6; it is
+Oracle license do NOT apply to the GStreamer, Version: 1.24.10; it is
 licensed under the following license, separately from the Oracle programs
 you receive. If you do not wish to install this library, you may delete
 this library:
@@ -59,8 +59,7 @@ Copyright (C) 2007-2011 Sebastian Dröge <sebastian.droege@collabora.co.uk>
 Copyright (C) 2010 Arun Raghavan <arun.raghavan@collabora.co.uk>
 Copyright (C) <2005-2011> Stefan Kost <ensonic@users.sf.net>
 Copyright (C) <2015> Luis de Bethencourt <luis@debethencourt.com>
-Copyright (C) 2010 Collabora Multimedia
-Copyright (C) 2009-2010 Edward Hervey <edward.hervey@collabora.co.uk>
+Copyright (C) 2010 Edward Hervey <edward.hervey@collabora.co.uk>
 Copyright (C) 2005-2007 Jan Schmidt <thaytan@mad.scientist.com>
 Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
 Copyright (C) 2002-2003 Scott Wheeler <wheeler@kde.org> (portions from taglib)

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/config.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/config.h
@@ -39,7 +39,7 @@
 #define GETTEXT_PACKAGE "glib20"
 
 /* Define to the GLIB binary age */
-#define GLIB_BINARY_AGE 8004
+#define GLIB_BINARY_AGE 8204
 
 /* Define to the GLIB interface age */
 #define GLIB_INTERFACE_AGE 1
@@ -54,7 +54,7 @@
 #define GLIB_MICRO_VERSION 4
 
 /* Define to the GLIB minor version */
-#define GLIB_MINOR_VERSION 80
+#define GLIB_MINOR_VERSION 82
 
 /* Have inline keyword */
 #define G_HAVE_INLINE 1
@@ -705,7 +705,7 @@
 #define PACKAGE_NAME "glib"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "glib 2.80.4"
+#define PACKAGE_STRING "glib 2.82.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "glib"
@@ -714,7 +714,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.80.4"
+#define PACKAGE_VERSION "2.82.4"
 
 /* define if posix_memalign() can allocate any size */
 #define POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS 1

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/glibconfig.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/osx/glibconfig.h
@@ -113,7 +113,7 @@ typedef unsigned long guintptr;
 #define G_GUINTPTR_FORMAT       "lu"
 
 #define GLIB_MAJOR_VERSION 2
-#define GLIB_MINOR_VERSION 80
+#define GLIB_MINOR_VERSION 82
 #define GLIB_MICRO_VERSION 4
 
 #define G_OS_UNIX

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/config.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/config.h
@@ -38,7 +38,7 @@
 #define GETTEXT_PACKAGE "glib20"
 
 /* Define to the GLIB binary age */
-#define GLIB_BINARY_AGE 8004
+#define GLIB_BINARY_AGE 8204
 
 /* Define to the GLIB interface age */
 #define GLIB_INTERFACE_AGE 1
@@ -53,7 +53,7 @@
 #define GLIB_MICRO_VERSION 4
 
 /* Define to the GLIB minor version */
-#define GLIB_MINOR_VERSION 80
+#define GLIB_MINOR_VERSION 82
 
 /* A 'va_copy' style function */
 #if !defined (_MSC_VER) || (_MSC_VER >= 1800)
@@ -692,7 +692,7 @@
 #define PACKAGE_NAME "glib"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "glib 2.80.4"
+#define PACKAGE_STRING "glib 2.82.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "glib"
@@ -701,7 +701,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.80.4"
+#define PACKAGE_VERSION "2.82.4"
 
 /* define if posix_memalign() can allocate any size */
 /* #undef POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS */

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glibconfig.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glibconfig.h
@@ -119,7 +119,7 @@ typedef unsigned long long guintptr;
 #endif
 
 #define GLIB_MAJOR_VERSION 2
-#define GLIB_MINOR_VERSION 80
+#define GLIB_MINOR_VERSION 82
 #define GLIB_MICRO_VERSION 4
 
 #define G_OS_WIN32

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garcbox.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garcbox.c
@@ -207,6 +207,11 @@ g_atomic_rc_box_release (gpointer mem_block)
  * to clear the contents of @mem_block, and then will free the
  * resources allocated for @mem_block.
  *
+ * Note that implementing weak references via @clear_func is not thread-safe:
+ * clearing a pointer to the memory from the callback can race with another
+ * thread trying to access it as @mem_block already has a reference count of 0
+ * when the callback is called and will be freed.
+ *
  * Since: 2.58
  */
 void

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garray.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/garray.c
@@ -930,11 +930,11 @@ g_array_sort (GArray       *farray,
 
   /* Don't use qsort as we want a guaranteed stable sort */
   if (array->len > 0)
-    g_qsort_with_data (array->data,
-                       array->len,
-                       array->elt_size,
-                       (GCompareDataFunc)compare_func,
-                       NULL);
+    g_sort_array (array->data,
+                  array->len,
+                  array->elt_size,
+                  (GCompareDataFunc) compare_func,
+                  NULL);
 }
 
 /**
@@ -962,11 +962,11 @@ g_array_sort_with_data (GArray           *farray,
   g_return_if_fail (array != NULL);
 
   if (array->len > 0)
-    g_qsort_with_data (array->data,
-                       array->len,
-                       array->elt_size,
-                       compare_func,
-                       user_data);
+    g_sort_array (array->data,
+                  array->len,
+                  array->elt_size,
+                  compare_func,
+                  user_data);
 }
 
 /**
@@ -2352,23 +2352,23 @@ g_ptr_array_insert (GPtrArray *array,
                     gpointer   data)
 {
   GRealPtrArray *rarray = (GRealPtrArray *)array;
+  guint real_index;
 
   g_return_if_fail (rarray);
   g_return_if_fail (index_ >= -1);
-  g_return_if_fail (index_ <= (gint)rarray->len);
+  g_return_if_fail (index_ < 0 || (guint) index_ <= rarray->len);
 
   g_ptr_array_maybe_expand (rarray, 1u + rarray->null_terminated);
 
-  if (index_ < 0)
-    index_ = rarray->len;
+  real_index = (index_ >= 0) ? (guint) index_ : rarray->len;
 
-  if ((guint) index_ < rarray->len)
-    memmove (&(rarray->pdata[index_ + 1]),
-             &(rarray->pdata[index_]),
-             (rarray->len - index_) * sizeof (gpointer));
+  if (real_index < rarray->len)
+    memmove (&(rarray->pdata[real_index + 1]),
+             &(rarray->pdata[real_index]),
+             (rarray->len - real_index) * sizeof (gpointer));
 
   rarray->len++;
-  rarray->pdata[index_] = data;
+  rarray->pdata[real_index] = data;
 
   ptr_array_maybe_null_terminate (rarray);
 }
@@ -2427,11 +2427,11 @@ g_ptr_array_sort (GPtrArray    *array,
 
   /* Don't use qsort as we want a guaranteed stable sort */
   if (array->len > 0)
-    g_qsort_with_data (array->pdata,
-                       array->len,
-                       sizeof (gpointer),
-                       (GCompareDataFunc)compare_func,
-                       NULL);
+    g_sort_array (array->pdata,
+                  array->len,
+                  sizeof (gpointer),
+                  (GCompareDataFunc) compare_func,
+                  NULL);
 }
 
 /* Please keep this doc-comment in sync with
@@ -2507,11 +2507,11 @@ g_ptr_array_sort_with_data (GPtrArray        *array,
   g_return_if_fail (array != NULL);
 
   if (array->len > 0)
-    g_qsort_with_data (array->pdata,
-                       array->len,
-                       sizeof (gpointer),
-                       compare_func,
-                       user_data);
+    g_sort_array (array->pdata,
+                  array->len,
+                  sizeof (gpointer),
+                  compare_func,
+                  user_data);
 }
 
 static inline gint

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gasyncqueue.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gasyncqueue.c
@@ -38,7 +38,7 @@
 #include "deprecated/gthread.h"
 
 /**
- * GAsyncQueue:
+ * GAsyncQueue: (copy-func g_async_queue_ref) (free-func g_async_queue_unref)
  *
  * An opaque data structure which represents an asynchronous queue.
  *

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbase64.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbase64.c
@@ -436,7 +436,8 @@ guchar *
 g_base64_decode_inplace (gchar *text,
                          gsize *out_len)
 {
-  gint input_length, state = 0;
+  gint state = 0;
+  size_t input_length;
   guint save = 0;
 
   g_return_val_if_fail (text != NULL, NULL);

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbytes.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gbytes.c
@@ -37,7 +37,7 @@
 #include <string.h>
 
 /**
- * GBytes:
+ * GBytes: (copy-func g_bytes_ref) (free-func g_bytes_unref)
  *
  * A simple refcounted data type representing an immutable sequence of zero or
  * more bytes from an unspecified origin.
@@ -609,4 +609,4 @@ g_bytes_get_region (GBytes *bytes,
    */
 
   return ((guchar *) bytes->data) + offset;
-}
+}
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconvert.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gconvert.c
@@ -76,7 +76,7 @@ try_conversion (const char *to_codeset,
 
 #if defined(__FreeBSD__) && defined(ICONV_SET_ILSEQ_INVALID)
   /* On FreeBSD request GNU iconv compatible handling of characters that cannot
-   * be repesented in the destination character set.
+   * be represented in the destination character set.
    * See https://cgit.freebsd.org/src/commit/?id=7c5b23111c5fd1992047922d4247c4a1ce1bb6c3
    */
   int value = 1;

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdate.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdate.c
@@ -2258,6 +2258,7 @@ win32_strftime_helper (const GDate     *d,
   gchar *convbuf;
   glong convlen = 0;
   gsize retval;
+  size_t format_len = strlen (format);
 
   systemtime.wYear = tm->tm_year + 1900;
   systemtime.wMonth = tm->tm_mon + 1;
@@ -2269,7 +2270,8 @@ win32_strftime_helper (const GDate     *d,
   systemtime.wMilliseconds = 0;
 
   lcid = GetThreadLocale ();
-  result = g_array_sized_new (FALSE, FALSE, sizeof (wchar_t), MAX (128, strlen (format) * 2));
+  result = g_array_sized_new (FALSE, FALSE, sizeof (wchar_t),
+                              (format_len <= 64) ? (guint) format_len * 2 : 128);
 
   p = format;
   while (*p)

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gdatetime.c
@@ -1495,19 +1495,19 @@ parse_iso8601_time (const gchar *text, gsize length,
  *
  * Creates a #GDateTime corresponding to the given
  * [ISO 8601 formatted string](https://en.wikipedia.org/wiki/ISO_8601)
- * @text. ISO 8601 strings of the form <date><sep><time><tz> are supported, with
+ * @text. ISO 8601 strings of the form `<date><sep><time><tz>` are supported, with
  * some extensions from [RFC 3339](https://tools.ietf.org/html/rfc3339) as
  * mentioned below.
  *
  * Note that as #GDateTime "is oblivious to leap seconds", leap seconds information
  * in an ISO-8601 string will be ignored, so a `23:59:60` time would be parsed as
  * `23:59:59`.
  *
- * <sep> is the separator and can be either 'T', 't' or ' '. The latter two
+ * `<sep>` is the separator and can be either 'T', 't' or ' '. The latter two
  * separators are an extension from
  * [RFC 3339](https://tools.ietf.org/html/rfc3339#section-5.6).
  *
- * <date> is in the form:
+ * `<date>` is in the form:
  *
  * - `YYYY-MM-DD` - Year/month/day, e.g. 2016-08-24.
  * - `YYYYMMDD` - Same as above without dividers.
@@ -1517,12 +1517,12 @@ parse_iso8601_time (const gchar *text, gsize length,
  *   e.g. 2016-W34-3.
  * - `YYYYWwwD` - Same as above without dividers.
  *
- * <time> is in the form:
+ * `<time>` is in the form:
  *
  * - `hh:mm:ss(.sss)` - Hours, minutes, seconds (subseconds), e.g. 22:10:42.123.
  * - `hhmmss(.sss)` - Same as above without dividers.
  *
- * <tz> is an optional timezone suffix of the form:
+ * `<tz>` is an optional timezone suffix of the form:
  *
  * - `Z` - UTC.
  * - `+hh:mm` or `-hh:mm` - Offset from UTC in hours and minutes, e.g. +12:00.
@@ -3109,7 +3109,7 @@ format_number (GString     *str,
     "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"
   };
   const gchar * const *digits = ascii_digits;
-  const gchar *tmp[10];
+  const gchar *tmp[10] = { NULL, };
   gint i = 0;
 #ifdef HAVE_LANGINFO_OUTDIGIT
   static GMutex alt_digits_mutex;
@@ -3273,7 +3273,7 @@ g_date_time_format_utf8 (GDateTime   *datetime,
        GString     *outstr,
        gboolean     locale_is_utf8)
 {
-  guint     len;
+  size_t len;
   guint     colons;
   gunichar  c;
   gboolean  alt_digits = FALSE;

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/genviron.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/genviron.c
@@ -647,7 +647,7 @@ g_get_environ (void)
 {
   gunichar2 *strings;
   gchar **result;
-  gint i, n;
+  size_t i, n;
 
   strings = GetEnvironmentStringsW ();
   for (n = 0, i = 0; strings[n]; i++)

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gfileutils.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gfileutils.c
@@ -373,7 +373,7 @@ g_file_test (const gchar *filename,
     {
       const gchar *lastdot = strrchr (filename, '.');
       const gchar *pathext = NULL, *p;
-      int extlen;
+      size_t extlen;
 
       if (lastdot == NULL)
         break;
@@ -401,7 +401,7 @@ g_file_test (const gchar *filename,
     const gchar *q = strchr (p, ';');
     if (q == NULL)
       q = p + strlen (p);
-    if (extlen == q - p &&
+      if (extlen == (size_t) (q - p) &&
         memcmp (lastdot, p, extlen) == 0)
       {
         g_free ((gchar *) pathext);