Skip to content

8351277: Remove pipewire from AIX build #3808

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

Closed
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions make/modules/java.desktop/lib/Awt2dLibraries.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,12 @@ ifeq ($(call isTargetOs, windows macosx), false)
common/awt/systemscale \
common/font \
common/java2d/opengl \
common/java2d/x11 \
$(LIBPIPEWIRE_HEADER_DIRS)
common/java2d/x11

# exclude pipewire from the AIX build, no Wayland support
ifeq ($(call isTargetOs, aix), false)
LIBAWT_XAWT_EXTRA_HEADER_DIRS += $(LIBPIPEWIRE_HEADER_DIRS)
endif

LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
$(FONTCONFIG_CFLAGS) \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -30,6 +30,8 @@
#include <dlfcn.h>
#include "jni_util.h"
#include "awt.h"

#ifndef _AIX
#include "screencast_pipewire.h"
#include "fp_pipewire.h"
#include <stdio.h>
Expand Down Expand Up @@ -1040,3 +1042,28 @@ JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_getRGBPixelsImpl
releaseToken(env, jtoken, token);
return 0;
}
#else
JNIEXPORT void JNICALL
Java_sun_awt_screencast_ScreencastHelper_closeSession(JNIEnv *env, jclass cls) {
}

JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_getRGBPixelsImpl(
JNIEnv *env,
jclass cls,
jint jx,
jint jy,
jint jwidth,
jint jheight,
jintArray pixelArray,
jintArray affectedScreensBoundsArray,
jstring jtoken
) {
return -1; /* RESULT_ERROR */
}

JNIEXPORT jboolean JNICALL Java_sun_awt_screencast_ScreencastHelper_loadPipewire(
JNIEnv *env, jclass cls, jboolean screencastDebug
) {
return JNI_FALSE;
}
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
#include <string.h>
#include <pwd.h>
#include <unistd.h>

#ifndef _AIX
#include "screencast_pipewire.h"

#include "screencast_portal.h"

extern volatile bool isGtkMainThread;
Expand Down Expand Up @@ -925,3 +928,4 @@ int getPipewireFd(const gchar *token,
DEBUG_SCREENCAST("pwFd %i\n", pipewireFd);
return pipewireFd;
}
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
#define bswap_16 _byteswap_ushort
#define bswap_32 _byteswap_ulong
#define bswap_64 _byteswap_uint64
#elif defined(AIX)
#include <sys/machine.h>
#define __BIG_ENDIAN BIG_ENDIAN
#define __BYTE_ORDER BIG_ENDIAN
#else
#include <endian.h>
#include <byteswap.h>
Expand Down