8349751: AIX build failure after upgrade pipewire to 1.3.81 #23543

azvegint · 2025-02-10T19:07:49Z

Filed as a separate issue to keep the #23426 clean.

Fix is the same as in the src/java.desktop/unix/native/libpipewire/include/spa/param/audio/raw.h part of the JDK-8309703

Progress

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

Issue

JDK-8349751: AIX build failure after upgrade pipewire to 1.3.81 (Bug - P4)

Reviewers

Martin Doerr (@TheRealMDoerr - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23543

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23543.diff

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-02-10T19:12:12Z

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

openjdk · 2025-02-10T19:12:23Z

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

8349751: AIX build failure after upgrade pipewire to 1.3.81

Reviewed-by: mdoerr

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:

57f4c30: 8347917: AArch64: Enable upper GPR registers in C1
ff52859: 8285624: jpackage fails to create exe, msi when Windows OS is in FIPS mode
3741c98: 8349883: Locale.LanguageRange.parse("-") throws ArrayIndexOutOfBoundsException
3e7acfa: 8349873: StackOverflowError after JDK-8342550 if -Duser.timezone= is set to a deprecated zone id
d8fcd43: 8349927: Waiting for compiler termination delays shutdown for 10+ ms
a88e2a5: 8349977: JVMCIRuntime::_shared_library_javavm_id should be jlong
2eac490: 8349868: Remove unneeded libjava shared library dependency from jtreg test libNewDirectByteBuffer, libDirectIO and libInheritedChannel
6ddbcc3: 8328119: Support HKDF in SunPKCS11 (Preview)
28e744d: 8348092: Shenandoah: assert(nk >= _lowest_valid_narrow_klass_id && nk <= _highest_valid_narrow_klass_id) failed: narrowKlass ID out of range (3131947710)
0b50e47: 8349753: Incorrect use of CodeBlob::is_buffer_blob() in few places
... and 3 more: https://git.openjdk.org/jdk/compare/add3cd1ca470be8fd5e5e1930d7f789318eb8e6d...master

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 · 2025-02-10T19:12:58Z

@azvegint The following label will be automatically applied to this pull request:

client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2025-02-10T19:15:21Z

Webrevs

TheShermanTanker · 2025-02-11T08:33:09Z

src/java.desktop/unix/native/libpipewire/include/spa/param/audio/raw.h

 #include <spa/utils/endian.h>
+#endif


The ifdef conditional blocks could be merged if I am not mistaken?

Yes, at first I kept it as it was in the original fix.
But after revisiting it, I think that it is belongs in the new spa/utils/endian.h file.

@MBaesken could you please recheck if it still works for you?

Yes, at first I kept it as it was in the original fix. But after revisiting it, I think that it is belongs in the new spa/utils/endian.h file.

@MBaesken could you please recheck if it still works for you?

This still works for me on AIX.

openjdk-notifier · 2025-02-13T11:47:26Z

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout xwayland/8349751_aix_build_fix
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2025-02-13T11:48:10Z

@azvegint this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout xwayland/8349751_aix_build_fix
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

prrace

FWIW
(1) I do not like JDK changes in upstream files we import
(2) This really needs to be done by the port owners.
(3) I do not like JDK changes in upstream files we import
Yes, I'm repeating that. We do have one case of changes which never made it into upstream in some X11 copied code from xwd because xwd is an app and doesn't care about resource leakage (ie there are upstream unfixed bugs). But I don't think we need to expand that precedent.
This change needs to be up-streamed. I do not want the burden of 'remembering' this.
Let's call this the last time we include this into JDK unless it comes from pipewire.

TheRealMDoerr

LGTM. Thanks for fixing it! I agree, we should try to get it into the upstream pipewire. For now, fixing the build is urgent.

azvegint · 2025-02-14T12:54:53Z

/integrate

openjdk · 2025-02-14T12:55:38Z

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

fa1bd23: 8343802: Prevent NULL usage backsliding
57f4c30: 8347917: AArch64: Enable upper GPR registers in C1
ff52859: 8285624: jpackage fails to create exe, msi when Windows OS is in FIPS mode
3741c98: 8349883: Locale.LanguageRange.parse("-") throws ArrayIndexOutOfBoundsException
3e7acfa: 8349873: StackOverflowError after JDK-8342550 if -Duser.timezone= is set to a deprecated zone id
d8fcd43: 8349927: Waiting for compiler termination delays shutdown for 10+ ms
a88e2a5: 8349977: JVMCIRuntime::_shared_library_javavm_id should be jlong
2eac490: 8349868: Remove unneeded libjava shared library dependency from jtreg test libNewDirectByteBuffer, libDirectIO and libInheritedChannel
6ddbcc3: 8328119: Support HKDF in SunPKCS11 (Preview)
28e744d: 8348092: Shenandoah: assert(nk >= _lowest_valid_narrow_klass_id && nk <= _highest_valid_narrow_klass_id) failed: narrowKlass ID out of range (3131947710)
... and 4 more: https://git.openjdk.org/jdk/compare/add3cd1ca470be8fd5e5e1930d7f789318eb8e6d...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-02-14T12:55:44Z

@azvegint Pushed as commit 19c0ce4.

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

TheRealMDoerr · 2025-02-14T16:25:48Z

@prrace: I wonder if pipewire should be build on any platform other than linux. Is there any usage on other UNIX systems (AIX/BSD/...)?

MBaesken · 2025-02-20T15:27:36Z

@prrace: I wonder if pipewire should be build on any platform other than linux. Is there any usage on other UNIX systems (AIX/BSD/...)?

According to https://pipewire.org/ pipewire is a project/lib for Linux .
In the pipewire coding imported into OpenJDK I also find some BSD related ifdefs so parts of pipewire might also work on BSD
spa/utils/endian.h:8:#if defined(__FreeBSD__) || defined(__MidnightBSD__)

Not sure now much sense this all makes on AIX. As far as I understand , pipewire was imported into OpenJDK for java.awt.Robot support for Wayland, the change was
8280982: [Wayland] [XWayland] java.awt.Robot taking screenshots
9d7bf53
Seems we should clarify the Wayland situation on AIX first, I could not find much information about this so far.

azvegint added 4 commits February 3, 2025 18:45

8348600: Update PipeWire to 1.3.81

Verified

This commit was signed with the committer’s verified signature.

pradyunsg Pradyun Gedam

GPG key ID: FF99710C4332258E

Verified
Learn about vigilant mode

Loading
Loading status checks…

ae99c71

replace "\t" with " "

Verified

This commit was signed with the committer’s verified signature.

pradyunsg Pradyun Gedam

GPG key ID: FF99710C4332258E

Verified
Learn about vigilant mode

Loading
Loading status checks…

1230c18

replace "\t" with " ", part 2

Verified

This commit was signed with the committer’s verified signature.

pradyunsg Pradyun Gedam

GPG key ID: FF99710C4332258E

Verified
Learn about vigilant mode

Loading
Loading status checks…

3b72900

8349751: AIX build failure after upgrade pipewire to 1.3.81

Loading
Loading status checks…

91891e6

openjdk bot added the rfr label Feb 10, 2025

openjdk bot added the client label Feb 10, 2025

TheShermanTanker reviewed Feb 11, 2025

View reviewed changes

azvegint added 2 commits February 11, 2025 12:21

merge "if defined"

Loading
Loading status checks…

87227ff

move fix to spa/utils/endian.h

Loading
Loading status checks…

600ddb9

openjdk-notifier bot changed the base branch from pr/23426 to master February 13, 2025 11:47

openjdk bot added the merge-conflict label Feb 13, 2025

Merge master

Loading
Loading status checks…

ffec8e4

openjdk bot removed the merge-conflict label Feb 13, 2025

prrace reviewed Feb 14, 2025

View reviewed changes

TheRealMDoerr approved these changes Feb 14, 2025

View reviewed changes

openjdk bot added the ready label Feb 14, 2025

openjdk bot added the integrated label Feb 14, 2025

openjdk bot closed this Feb 14, 2025

openjdk bot removed ready rfr labels Feb 14, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8349751: AIX build failure after upgrade pipewire to 1.3.81 #23543

8349751: AIX build failure after upgrade pipewire to 1.3.81 #23543

azvegint commented Feb 10, 2025 •

edited by openjdk bot

Loading

bridgekeeper bot commented Feb 10, 2025

openjdk bot commented Feb 10, 2025 •

edited

Loading

openjdk bot commented Feb 10, 2025

mlbridge bot commented Feb 10, 2025 •

edited

Loading

TheShermanTanker Feb 11, 2025

azvegint Feb 11, 2025

MBaesken Feb 12, 2025

openjdk-notifier bot commented Feb 13, 2025

openjdk bot commented Feb 13, 2025

prrace left a comment

TheRealMDoerr left a comment

azvegint commented Feb 14, 2025

openjdk bot commented Feb 14, 2025

openjdk bot commented Feb 14, 2025

TheRealMDoerr commented Feb 14, 2025

MBaesken commented Feb 20, 2025 •

edited

Loading

8349751: AIX build failure after upgrade pipewire to 1.3.81 #23543

8349751: AIX build failure after upgrade pipewire to 1.3.81 #23543

Conversation

azvegint commented Feb 10, 2025 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Feb 10, 2025

openjdk bot commented Feb 10, 2025 • edited Loading

openjdk bot commented Feb 10, 2025

mlbridge bot commented Feb 10, 2025 • edited Loading

Webrevs

TheShermanTanker Feb 11, 2025

Choose a reason for hiding this comment

azvegint Feb 11, 2025

Choose a reason for hiding this comment

MBaesken Feb 12, 2025

Choose a reason for hiding this comment

openjdk-notifier bot commented Feb 13, 2025

openjdk bot commented Feb 13, 2025

prrace left a comment

Choose a reason for hiding this comment

TheRealMDoerr left a comment

Choose a reason for hiding this comment

azvegint commented Feb 14, 2025

openjdk bot commented Feb 14, 2025

openjdk bot commented Feb 14, 2025

TheRealMDoerr commented Feb 14, 2025

MBaesken commented Feb 20, 2025 • edited Loading

azvegint commented Feb 10, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Feb 10, 2025 •

edited

Loading

mlbridge bot commented Feb 10, 2025 •

edited

Loading

MBaesken commented Feb 20, 2025 •

edited

Loading