Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8262366: Update glib to version 2.66.7 #447

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions modules/javafx.media/src/main/legal/glib.md
@@ -1,11 +1,11 @@
## GNU Glib v2.62.2
## GNU Glib v2.66.7

### Glib Notice
```

You are receiving a copy of GNU Glib, Version: 2.62.2 in either source or
You are receiving a copy of GNU Glib, Version: 2.66.7 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.62.2; it is
Oracle license do NOT apply to the GNU Glib, Version: 2.66.7; 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:
Expand Down
6 changes: 3 additions & 3 deletions modules/javafx.media/src/main/legal/gstreamer.md
@@ -1,11 +1,11 @@
## GStreamer v1.16.1
## GStreamer v1.18.3

### GStreamer Notice
```

You are receiving a copy of GStreamer, Version: 1.16.1 in either source or
You are receiving a copy of GStreamer, Version: 1.18.3 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.16.1; it is
Oracle license do NOT apply to the GStreamer, Version: 1.18.3; 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:
Expand Down
@@ -1,6 +1,8 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */

#pragma once

/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */

Expand Down Expand Up @@ -37,7 +39,7 @@
#define GETTEXT_PACKAGE "glib20"

/* Define to the GLIB binary age */
#define GLIB_BINARY_AGE 6202
#define GLIB_BINARY_AGE 6607

/* Define to the GLIB interface age */
#define GLIB_INTERFACE_AGE 1
Expand All @@ -49,10 +51,10 @@
#define GLIB_MAJOR_VERSION 2

/* Define to the GLIB micro version */
#define GLIB_MICRO_VERSION 2
#define GLIB_MICRO_VERSION 7

/* Define to the GLIB minor version */
#define GLIB_MINOR_VERSION 62
#define GLIB_MINOR_VERSION 66

/* Have inline keyword */
#define G_HAVE_INLINE 1
Expand Down Expand Up @@ -703,7 +705,7 @@
#define PACKAGE_NAME "glib"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "glib 2.62.2"
#define PACKAGE_STRING "glib 2.66.7"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "glib"
Expand All @@ -712,7 +714,7 @@
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION "2.62.2"
#define PACKAGE_VERSION "2.66.7"

/* define if posix_memalign() can allocate any size */
#define POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS 1
Expand Down
Expand Up @@ -39,26 +39,35 @@ G_BEGIN_DECLS

typedef signed char gint8;
typedef unsigned char guint8;

typedef signed short gint16;
typedef unsigned short guint16;

#define G_GINT16_MODIFIER "h"
#define G_GINT16_FORMAT "hi"
#define G_GUINT16_FORMAT "hu"


typedef signed int gint32;
typedef unsigned int guint32;

#define G_GINT32_MODIFIER ""
#define G_GINT32_FORMAT "i"
#define G_GUINT32_FORMAT "u"


#define G_HAVE_GINT64 1 /* deprecated, always true */

typedef signed long gint64;
typedef unsigned long guint64;
G_GNUC_EXTENSION typedef signed long long gint64;
G_GNUC_EXTENSION typedef unsigned long long guint64;

#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))

#define G_GINT64_MODIFIER "ll"
#define G_GINT64_FORMAT "lli"
#define G_GUINT64_FORMAT "llu"

#define G_GINT64_CONSTANT(val) (val##L)
#define G_GUINT64_CONSTANT(val) (val##UL)
#define G_GINT64_MODIFIER "l"
#define G_GINT64_FORMAT "li"
#define G_GUINT64_FORMAT "lu"

#define GLIB_SIZEOF_VOID_P 8
#define GLIB_SIZEOF_LONG 8
Expand All @@ -84,6 +93,7 @@ typedef gint64 goffset;
#define G_GOFFSET_FORMAT G_GINT64_FORMAT
#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)

#define G_POLLFD_FORMAT "%d"

#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p))
Expand All @@ -97,24 +107,21 @@ typedef unsigned long guintptr;
#define G_GINTPTR_MODIFIER "l"
#define G_GINTPTR_FORMAT "li"
#define G_GUINTPTR_FORMAT "lu"
#ifndef G_DISABLE_DEPRECATED
#define g_ATEXIT(proc) (atexit (proc))
#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
#endif

#define GLIB_MAJOR_VERSION 2
#define GLIB_MINOR_VERSION 62
#define GLIB_MICRO_VERSION 2
#define GLIB_MINOR_VERSION 66
#define GLIB_MICRO_VERSION 7

#define G_OS_UNIX


#define G_VA_COPY va_copy
#define G_VA_COPY va_copy
#define G_VA_COPY_AS_ARRAY 1


#ifndef __cplusplus
# define G_HAVE_ISO_VARARGS 1
#endif

#ifdef __cplusplus
# define G_HAVE_ISO_VARARGS 1
#endif
Expand All @@ -127,8 +134,12 @@ typedef unsigned long guintptr;
# undef G_HAVE_ISO_VARARGS
#endif

#define G_HAVE_GNUC_VARARGS 1
#define G_HAVE_GROWING_STACK 0
#define G_HAVE_GNUC_VISIBILITY 1

#ifndef _MSC_VER
# define G_HAVE_GNUC_VARARGS 1
#endif

#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
Expand All @@ -149,14 +160,17 @@ typedef unsigned long guintptr;
#define GUINT16_TO_LE(val) ((guint16) (val))
#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))

#define GINT32_TO_LE(val) ((gint32) (val))
#define GUINT32_TO_LE(val) ((guint32) (val))
#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))

#define GINT64_TO_LE(val) ((gint64) (val))
#define GUINT64_TO_LE(val) ((guint64) (val))
#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))

#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
#define GULONG_TO_LE(val) ((gulong) GUINT64_TO_LE (val))
#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
Expand All @@ -181,6 +195,7 @@ typedef unsigned long guintptr;
#define G_MODULE_SUFFIX "dylib"

typedef int GPid;
#define G_PID_FORMAT "i"

#define GLIB_SYSDEF_AF_UNIX 1
#define GLIB_SYSDEF_AF_INET 2
Expand Down
Expand Up @@ -26,7 +26,6 @@ extern "C" {
#define G_MODULE_IMPL_NONE 0
#define G_MODULE_IMPL_DL 1
#define G_MODULE_IMPL_WIN32 3
#define G_MODULE_IMPL_DYLD 6
#define G_MODULE_IMPL_AR 7

#define G_MODULE_IMPL G_MODULE_IMPL_DL
Expand Down