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

Conversation

@sashamatveev
Copy link
Member

@sashamatveev sashamatveev commented Mar 31, 2021

  • GLib was updated to version 2.66.7 and GStreamer to version 1.18.3
  • One bug was discovered in updated GStreamer which was causing deadlock or infinite loop during seek on macOS. See gstsystemclock.c for changes between ifdef GSTREAMER_LITE. Otherwise no changes.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issues

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/447/head:pull/447
$ git checkout pull/447

Update a local copy of the PR:
$ git checkout pull/447
$ git pull https://git.openjdk.java.net/jfx pull/447/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 447

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/447.diff

8262365: Update GStreamer to version 1.18.3
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 31, 2021

👋 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 openjdk bot added the rfr label Mar 31, 2021
@sashamatveev
Copy link
Member Author

@sashamatveev sashamatveev commented Mar 31, 2021

/solves 8262365: Update GStreamer to version 1.18.3

@openjdk
Copy link

@openjdk openjdk bot commented Mar 31, 2021

@sashamatveev
Adding additional issue to solves list: 8262365: Update GStreamer to version 1.18.3.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 31, 2021

Webrevs

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Mar 31, 2021

/reviewers 2

@openjdk
Copy link

@openjdk openjdk bot commented Mar 31, 2021

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Mar 31, 2021

I get a compilation error on Linux:

../../../gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-buffer.c: In function 'gst_audio_buffer_map':
../../../gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-buffer.c:158:7: error: implicit declaration of function 'memset' [-Werror=implicit-function-declaration]
  158 |       memset (buffer->map_infos, 0,
      |       ^~~~~~
../../../gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-buffer.c:158:7: warning: incompatible implicit declaration of built-in function 'memset'
../../../gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-buffer.c:26:1: note: include '<string.h>' or provide a declaration of 'memset'
...
cc1: some warnings being treated as errors
Makefile:270: recipe for target 'modules/javafx.media/build/native/linux/Release/obj/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-buffer.o' failed
make: *** [modules/javafx.media/build/native/linux/Release/obj/gstreamer-lite/gst-plugins-base/gst-libs/gst/audio/audio-buffer.o] Error 1

This is with the gcc 10.2 compiler used for production builds.

@sashamatveev
Copy link
Member Author

@sashamatveev sashamatveev commented Apr 1, 2021

I cannot reproduce build failure on Linux.

@johanvos
Copy link
Collaborator

@johanvos johanvos commented Apr 1, 2021

It compiles for me (on gcc-9, 10.1 and 10.2) but I can imagine it doesn't compile on all configurations. memset is declared in string.h and that may or may not be included.
Running gcc -H shows that on my system, string.h is included by glib-2.0/glib/gtestutils.h (which is included by glib-2.0/glib.h) but on other systems, that might not be the case.
Since this PR introduces memset in the audio-buffer.c file, I think it is safest to include string.h in this file as well, as this removes the dependency on that file to be included indirectly.

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Apr 1, 2021

Alexander tried it on our CI build machine yesterday and it builds fine there, too. I should add that I was building on a very old Ubuntu 16.04 system.

Since this PR introduces memset in the audio-buffer.c file, I think it is safest to include string.h in this file as well, as this removes the dependency on that file to be included indirectly.

I was thinking the same thing. There is one more file that should include <string.h>: qtdemux_tags.c uses strlenand fails to compile on my system. With the change to include string.h in those two files, the build now passes on my system.

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Apr 1, 2021

All my testing looks good on all three platforms. I'll take a look at the diffs next.

One thing I did spot is that you need to update gstreamer.md and glib.md to bump the version numbers.

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Apr 1, 2021

It now builds for me on my old Linux box. And the changes to the /legal/ files looks good.

One more thing I just thought of: we should do a test build on macOS aarch64. I have no reason to believe that there will be a problem, but worth double-checking.

@sashamatveev
Copy link
Member Author

@sashamatveev sashamatveev commented Apr 2, 2021

It builds fine on macOS aarch64 and I did minor testing as well. No issues.

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good.

@openjdk
Copy link

@openjdk openjdk bot commented Apr 3, 2021

@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:

8262366: Update glib to version 2.66.7
8262365: Update GStreamer to version 1.18.3

Reviewed-by: jvos, kcr

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 13 new commits pushed to 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.

@openjdk openjdk bot added the ready label Apr 3, 2021
@sashamatveev
Copy link
Member Author

@sashamatveev sashamatveev commented Apr 5, 2021

/integrate

@openjdk openjdk bot closed this Apr 5, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 5, 2021

@sashamatveev Since your change was applied there have been 13 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit e63931e.

💡 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
3 participants