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

8336940: Update GStreamer to 1.24.6 #1542

Closed
wants to merge 3 commits into from

Conversation

sashamatveev
Copy link
Member

@sashamatveev sashamatveev commented Aug 21, 2024

  • Updated GStreamer to 1.24.6 and Glib to 2.80.4.
  • Testing done on all platforms with all supported formats.
  • Removed gstpluginloader.c. This file contains additional plugin loading mechanism which we do not use. Latest GStreamer modified it heavily and it did not compile without pulling additional dependency from GLib, but since we do not use it anyway it was removed. Corresponding calls to gstpluginloader.c from gstregistry.c were disabled as well.
  • Removed DSD support from Alsa audio sink. Latest GStreamer added support for Alsa DSD (Direct Stream Digital), but we do not use it so it was removed. Also, such support requires newer libasound2 (ALSA) which is not available on older Linux distributions.
  • No other changes or bug fixes are done.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issues

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx.git pull/1542/head:pull/1542
$ git checkout pull/1542

Update a local copy of the PR:
$ git checkout pull/1542
$ git pull https://git.openjdk.org/jfx.git pull/1542/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1542

View PR using the GUI difftool:
$ git pr show -t 1542

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1542.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 21, 2024

👋 Welcome back almatvee! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Aug 21, 2024

@sashamatveev This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8336940: Update GStreamer to 1.24.6
8336939: Update Glib to 2.80.4

Reviewed-by: kcr, sykora

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 2 new commits pushed to the master branch:

  • b898731: 8336632: Update Gradle to 8.9
  • 67ac9d7: 8338306: WebView Drag and Drop fails with WebKit 619.1

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@sashamatveev
Copy link
Member Author

/solves 8336939: Update Glib to 2.80.4

@kevinrushforth
Copy link
Member

Reviewers: @kevinrushforth and @tiainen or @johanvos

/reviewers 2

@openjdk
Copy link

openjdk bot commented Aug 21, 2024

@sashamatveev
Adding additional issue to solves list: 8336939: Update Glib to 2.80.4.

@kevinrushforth kevinrushforth self-requested a review August 21, 2024 20:18
@openjdk
Copy link

openjdk bot commented Aug 21, 2024

@kevinrushforth
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

@kevinrushforth
Copy link
Member

I get a compilation error on my admittedly too-old Ubuntu 16.04 system. It might be worth adding the missing header file, in case other distros hit the same problem.

In file included from ../../../gstreamer-lite/gstreamer/gst/gstmeta.h:28,
                 from ../../../gstreamer-lite/gstreamer/gst/gstbuffer.h:43,
                 from ../../../gstreamer-lite/gstreamer/gst/gstpad.h:70,
                 from ../../../gstreamer-lite/gstreamer/gst/gstelement.h:223,
                 from ../../../gstreamer-lite/gstreamer/gst/gstbin.h:27,
                 from ../../../gstreamer-lite/gstreamer/gst/gst.h:35,
                 from ../../../gstreamer-lite/gstreamer/libs/gst/base/gstbitreader.h:24,
                 from ../../../gstreamer-lite/gstreamer/libs/gst/base/gstbitreader.c:26:
../../../gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h: In function 'gst_byte_array_interface_init':
../../../gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h:66:3: error: implicit declaration of function 'memset' [-Werror=implicit-function-declaration]
   66 |   memset (self, 0, sizeof (GstByteArrayInterface));
      |   ^~~~~~
../../../gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h:1:1: note: include '<string.h>' or provide a declaration of 'memset'
  +++ |+#include <string.h>
    1 | /* Copyright (C) 2023 Netflix Inc.
../../../gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h:66:3: warning: incompatible implicit declaration of built-in function 'memset' [-Wbuiltin-declaration-mismatch]
   66 |   memset (self, 0, sizeof (GstByteArrayInterface));
      |   ^~~~~~
../../../gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h:66:3: note: include '<string.h>' or provide a declaration of 'memset'
../../../gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h: In function 'gst_byte_array_interface_append_data':
../../../gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h:125:3: error: implicit declaration of function 'memcpy' [-Werror=implicit-function-declaration]
  125 |   memcpy (ptr, data, size);
      |   ^~~~~~
../../../gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h:125:3: note: include '<string.h>' or provide a declaration of 'memcpy'
../../../gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h:125:3: warning: incompatible implicit declaration of built-in function 'memcpy' [-Wbuiltin-declaration-mismatch]
../../../gstreamer-lite/gstreamer/gst/gstbytearrayinterface.h:125:3: note: include '<string.h>' or provide a declaration of 'memcpy'
cc1: some warnings being treated as errors
Makefile:281: recipe for target 'modules/javafx.media/build/native/linux/Release/obj/gstreamer-lite/gstreamer/libs/gst/base/gstbitreader.o' failed
make: *** [modules/javafx.media/build/native/linux/Release/obj/gstreamer-lite/gstreamer/libs/gst/base/gstbitreader.o] Error 1
make: *** Waiting for unfinished jobs....
make: Leaving directory 'modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite'

> Task :media:buildLinuxGStreamer FAILED

@openjdk openjdk bot added the rfr Ready for review label Aug 21, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 21, 2024

Webrevs

@sashamatveev
Copy link
Member Author

8336940: Update GStreamer to 1.24.6 [v2]

  • Fixed whitespace.

8336940: Update GStreamer to 1.24.6 [v3]

  • Added missing header file.

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Built and tested on all three platforms.

Copy link
Collaborator

@tiainen tiainen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds and tests ran fine.

@openjdk openjdk bot added the ready Ready to be integrated label Aug 22, 2024
@sashamatveev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 23, 2024

Going to push as commit b88ac04.
Since your change was applied there have been 5 commits pushed to the master branch:

  • 4849716: 8338886: JavaFX debug builds fail on macOS
  • aa52f7e: 8338307: Additional WebKit 619.1 fixes from WebKitGTK 2.44.3
  • fac1c2a: 8338849: Update copyright header for files modified in 2024
  • b898731: 8336632: Update Gradle to 8.9
  • 67ac9d7: 8338306: WebView Drag and Drop fails with WebKit 619.1

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 23, 2024
@openjdk openjdk bot closed this Aug 23, 2024
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review labels Aug 23, 2024
@openjdk
Copy link

openjdk bot commented Aug 23, 2024

@sashamatveev Pushed as commit b88ac04.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants