[jfx11u] Integrated: 8283218: Update GStreamer to 1.20.1
Kevin Rushforth
kcr at openjdk.java.net
Mon May 2 13:40:52 UTC 2022
On Sat, 30 Apr 2022 13:37:08 GMT, Kevin Rushforth <kcr at openjdk.org> wrote:
> Backport to `jfx11u`. Tested in connection with libffi update in the `test-kcr-11.0.16` branch.
>
> This was not a clean backport, but the merge conflicts were trivial to resolve. Here is a summary of the changes. The jfx mainline patch applied cleanly to all other files.
>
> 1. The following file is not present in jfx11u, so that part of the patch was skipped:
>
>
> modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-good/gst/audioparsers/gstaacparse.c
>
>
> 2. The following files had minor merge conflicts, the first was a diff in surrounding context and the rest were in copyright header blocks:
>
>
> modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
> modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
> modules/javafx.media/src/tools/native/def-glib.pl
> modules/javafx.media/src/tools/native/def-gstlite.pl
This pull request has now been integrated.
Changeset: d0df8471
Author: Kevin Rushforth <kcr at openjdk.org>
URL: https://git.openjdk.java.net/jfx11u/commit/d0df8471c4e38e0b0dfae0e83848316694033002
Stats: 38984 lines in 412 files changed: 22060 ins; 5959 del; 10965 mod
8283218: Update GStreamer to 1.20.1
8283403: Update Glib to 2.72.0
Reviewed-by: jvos
Backport-of: c4b1a72cc4d9253d1320d83281d50fb1f3bb6145
-------------
PR: https://git.openjdk.java.net/jfx11u/pull/94
More information about the openjfx-dev
mailing list