mirror of
https://github.com/AngelAuraMC/angelauramc-openjdk-build.git
synced 2025-09-13 14:15:44 -04:00
Fixes
This commit is contained in:
khanhduytran0
parent
06617ac8f0
commit
6035b841a8
@ -0,0 +1,48 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 1995, 2014, 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
|
||||||
|
* under the terms of the GNU General Public License version 2 only, as
|
||||||
|
* published by the Free Software Foundation. Oracle designates this
|
||||||
|
* particular file as subject to the "Classpath" exception as provided
|
||||||
|
* by Oracle in the LICENSE file that accompanied this code.
|
||||||
|
*
|
||||||
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
* accompanied this code).
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License version
|
||||||
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
* or visit www.oracle.com if you need additional information or have any
|
||||||
|
* questions.
|
||||||
|
*/
|
||||||
|
#ifndef _COLOR_H_
|
||||||
|
#define _COLOR_H_
|
||||||
|
|
||||||
|
#include "awt.h"
|
||||||
|
#include "colordata.h"
|
||||||
|
|
||||||
|
#ifdef __ANDROID__
|
||||||
|
typedef struct {
|
||||||
|
int depth;
|
||||||
|
int bits_per_pixel;
|
||||||
|
int scanline_pad;
|
||||||
|
} XPixmapFormatValues;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(HEADLESS) && !defined(MACOSX)
|
||||||
|
typedef struct {
|
||||||
|
unsigned int Depth;
|
||||||
|
XPixmapFormatValues wsImageFormat;
|
||||||
|
ImgColorData clrdata;
|
||||||
|
ImgConvertFcn *convert[NUM_IMGCV];
|
||||||
|
} awtImageData;
|
||||||
|
#endif /* !HEADLESS && !MACOSX */
|
||||||
|
|
||||||
|
#endif /* _COLOR_H_ */
|
||||||
@ -0,0 +1,167 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 1996, 2014, 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
|
||||||
|
* under the terms of the GNU General Public License version 2 only, as
|
||||||
|
* published by the Free Software Foundation. Oracle designates this
|
||||||
|
* particular file as subject to the "Classpath" exception as provided
|
||||||
|
* by Oracle in the LICENSE file that accompanied this code.
|
||||||
|
*
|
||||||
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
* accompanied this code).
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License version
|
||||||
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
* or visit www.oracle.com if you need additional information or have any
|
||||||
|
* questions.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "color.h"
|
||||||
|
|
||||||
|
#ifdef __ANDROID__
|
||||||
|
typedef char *XPointer;
|
||||||
|
typedef struct _XImage {
|
||||||
|
int width, height; /* size of image */
|
||||||
|
int xoffset; /* number of pixels offset in X direction */
|
||||||
|
int format; /* XYBitmap, XYPixmap, ZPixmap */
|
||||||
|
char *data; /* pointer to image data */
|
||||||
|
int byte_order; /* data byte order, LSBFirst, MSBFirst */
|
||||||
|
int bitmap_unit; /* quant. of scanline 8, 16, 32 */
|
||||||
|
int bitmap_bit_order; /* LSBFirst, MSBFirst */
|
||||||
|
int bitmap_pad; /* 8, 16, 32 either XY or ZPixmap */
|
||||||
|
int depth; /* depth of image */
|
||||||
|
int bytes_per_line; /* accelerator to next scanline */
|
||||||
|
int bits_per_pixel; /* bits per pixel (ZPixmap) */
|
||||||
|
unsigned long red_mask; /* bits in z arrangement */
|
||||||
|
unsigned long green_mask;
|
||||||
|
unsigned long blue_mask;
|
||||||
|
XPointer obdata; /* hook for the object routines to hang on */
|
||||||
|
struct funcs { /* image manipulation routines */
|
||||||
|
struct _XImage *(*create_image)();
|
||||||
|
int (*destroy_image)();
|
||||||
|
unsigned long (*get_pixel)();
|
||||||
|
int (*put_pixel)();
|
||||||
|
struct _XImage *(*sub_image)();
|
||||||
|
int (*add_pixel)();
|
||||||
|
} f;
|
||||||
|
} XImage;
|
||||||
|
|
||||||
|
typedef unsigned long XID;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
short x1, x2, y1, y2;
|
||||||
|
} Box, BOX, BoxRec, *BoxPtr;
|
||||||
|
typedef struct {
|
||||||
|
short x, y, width, height;
|
||||||
|
}RECTANGLE, RectangleRec, *RectanglePtr;
|
||||||
|
#define TRUE 1
|
||||||
|
#define FALSE 0
|
||||||
|
#define MAXSHORT 32767
|
||||||
|
#define MINSHORT -MAXSHORT
|
||||||
|
#ifndef MAX
|
||||||
|
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
|
||||||
|
#endif
|
||||||
|
#ifndef MIN
|
||||||
|
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
|
||||||
|
#endif
|
||||||
|
/*
|
||||||
|
* clip region
|
||||||
|
*/
|
||||||
|
typedef struct _XRegion {
|
||||||
|
long size;
|
||||||
|
long numRects;
|
||||||
|
BOX *rects;
|
||||||
|
BOX extents;
|
||||||
|
} REGION;
|
||||||
|
typedef struct _XRegion *Region;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(HEADLESS) && !defined(MACOSX)
|
||||||
|
typedef struct {
|
||||||
|
ImgConvertData cvdata; /* The data needed by ImgConvertFcn's */
|
||||||
|
struct Hsun_awt_image_ImageRepresentation *hJavaObject; /* backptr */
|
||||||
|
XID pixmap; /* The X11 pixmap containing the image */
|
||||||
|
XID mask; /* The X11 pixmap with the transparency mask */
|
||||||
|
int bgcolor; /* The current bg color installed in pixmap */
|
||||||
|
|
||||||
|
int depth; /* The depth of the destination image */
|
||||||
|
int dstW; /* The width of the destination pixmap */
|
||||||
|
int dstH; /* The height of the destination pixmap */
|
||||||
|
|
||||||
|
XImage *xim; /* The Ximage structure for the temp buffer */
|
||||||
|
XImage *maskim; /* The Ximage structure for the mask */
|
||||||
|
|
||||||
|
int hints; /* The delivery hints from the producer */
|
||||||
|
|
||||||
|
Region curpixels; /* The region of randomly converted pixels */
|
||||||
|
struct {
|
||||||
|
int num; /* The last fully delivered scanline */
|
||||||
|
char *seen; /* The lines which have been delivered */
|
||||||
|
} curlines; /* For hints=COMPLETESCANLINES */
|
||||||
|
} IRData;
|
||||||
|
|
||||||
|
typedef unsigned int MaskBits;
|
||||||
|
|
||||||
|
extern int image_Done(IRData *ird, int x1, int y1, int x2, int y2);
|
||||||
|
|
||||||
|
extern void *image_InitMask(IRData *ird, int x1, int y1, int x2, int y2);
|
||||||
|
|
||||||
|
#define BufComplete(cvdata, dstX1, dstY1, dstX2, dstY2) \
|
||||||
|
image_Done((IRData *) cvdata, dstX1, dstY1, dstX2, dstY2)
|
||||||
|
|
||||||
|
#define SendRow(ird, dstY, dstX1, dstX2)
|
||||||
|
|
||||||
|
#define ImgInitMask(cvdata, x1, y1, x2, y2) \
|
||||||
|
image_InitMask((IRData *)cvdata, x1, y1, x2, y2)
|
||||||
|
|
||||||
|
#define ScanBytes(cvdata) (((IRData *)cvdata)->xim->bytes_per_line)
|
||||||
|
|
||||||
|
#define MaskScan(cvdata) \
|
||||||
|
((((IRData *)cvdata)->maskim->bytes_per_line) >> 2)
|
||||||
|
|
||||||
|
#endif /* !HEADLESS && !MACOSX */
|
||||||
|
|
||||||
|
#define MaskOffset(x) ((x) >> 5)
|
||||||
|
|
||||||
|
#define MaskInit(x) (1U << (31 - ((x) & 31)))
|
||||||
|
|
||||||
|
#define SetOpaqueBit(mask, bit) ((mask) |= (bit))
|
||||||
|
#define SetTransparentBit(mask, bit) ((mask) &= ~(bit))
|
||||||
|
|
||||||
|
#define UCHAR_ARG(uc) ((unsigned char)(uc))
|
||||||
|
#define ColorCubeFSMap(r, g, b) \
|
||||||
|
cData->img_clr_tbl [ ((UCHAR_ARG(r)>>3)<<10) | \
|
||||||
|
((UCHAR_ARG(g)>>3)<<5) | (UCHAR_ARG(b)>>3)]
|
||||||
|
|
||||||
|
#define ColorCubeOrdMapSgn(r, g, b) \
|
||||||
|
((dstLockInfo.inv_cmap)[ ((UCHAR_ARG(r)>>3)<<10) | \
|
||||||
|
((UCHAR_ARG(g)>>3)<<5) | (UCHAR_ARG(b)>>3)])
|
||||||
|
|
||||||
|
#define GetPixelRGB(pixel, red, green, blue) \
|
||||||
|
do { \
|
||||||
|
ColorEntry *cp = &awt_Colors[pixel]; \
|
||||||
|
red = cp->r; \
|
||||||
|
green = cp->g; \
|
||||||
|
blue = cp->b; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define CUBEMAP(r,g,b) ColorCubeOrdMapSgn(r, g, b)
|
||||||
|
#define cubemapArray 1
|
||||||
|
|
||||||
|
extern uns_ordered_dither_array img_oda_alpha;
|
||||||
|
|
||||||
|
extern void freeICMColorData(ColorData *pData);
|
||||||
|
|
||||||
|
extern void initInverseGrayLut(int* prgb, int rgbsize, ColorData* cData);
|
||||||
|
extern unsigned char* initCubemap(int* cmap, int cmap_len, int cube_dim);
|
||||||
|
extern void initDitherTables(ColorData* cData);
|
||||||
|
|
||||||
|
#define SET_CUBEMAPARRAY \
|
||||||
|
lockInfo->inv_cmap = (const char*)lockInfo->colorData->img_clr_tbl
|
||||||
30
override-jre-files/problem.txt
Normal file
30
override-jre-files/problem.txt
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
Creating support/modules_libs/jdk.security.auth/libjaas_unix.so from 1 file(s)
|
||||||
|
In file included from /home/runner/work/android-openjdk-build-multiarch/android-openjdk-build-multiarch/openjdk/jdk/src/java.desktop/unix/native/common/awt/img_util_md.h:26:0,
|
||||||
|
from /home/runner/work/android-openjdk-build-multiarch/android-openjdk-build-multiarch/openjdk/jdk/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c:31:
|
||||||
|
- /home/runner/work/android-openjdk-build-multiarch/android-openjdk-build-multiarch/openjdk/jdk/src/java.desktop/unix/native/common/awt/color.h:34:5: error: unknown type name 'XPixmapFormatValues'
|
||||||
|
- XPixmapFormatValues wsImageFormat;
|
||||||
|
^
|
||||||
|
In file included from /home/runner/work/android-openjdk-build-multiarch/android-openjdk-build-multiarch/openjdk/jdk/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c:31:0:
|
||||||
|
/home/runner/work/android-openjdk-build-multiarch/android-openjdk-build-multiarch/openjdk/jdk/src/java.desktop/unix/native/common/awt/img_util_md.h:32:5: error: unknown type name 'XID'
|
||||||
|
XID pixmap; /* The X11 pixmap containing the image */
|
||||||
|
^
|
||||||
|
/home/runner/work/android-openjdk-build-multiarch/android-openjdk-build-multiarch/openjdk/jdk/src/java.desktop/unix/native/common/awt/img_util_md.h:33:5: error: unknown type name 'XID'
|
||||||
|
XID mask; /* The X11 pixmap with the transparency mask */
|
||||||
|
^
|
||||||
|
/home/runner/work/android-openjdk-build-multiarch/android-openjdk-build-multiarch/openjdk/jdk/src/java.desktop/unix/native/common/awt/img_util_md.h:40:5: error: unknown type name 'XImage'
|
||||||
|
XImage *xim; /* The Ximage structure for the temp buffer */
|
||||||
|
^
|
||||||
|
/home/runner/work/android-openjdk-build-multiarch/android-openjdk-build-multiarch/openjdk/jdk/src/java.desktop/unix/native/common/awt/img_util_md.h:41:5: error: unknown type name 'XImage'
|
||||||
|
XImage *maskim; /* The Ximage structure for the mask */
|
||||||
|
^
|
||||||
|
/home/runner/work/android-openjdk-build-multiarch/android-openjdk-build-multiarch/openjdk/jdk/src/java.desktop/unix/native/common/awt/img_util_md.h:45:5: error: unknown type name 'Region'
|
||||||
|
Region curpixels; /* The region of randomly converted pixels */
|
||||||
|
^
|
||||||
|
Awt2dLibraries.gmk:245: recipe for target '/home/runner/work/android-openjdk-build-multiarch/android-openjdk-build-multiarch/openjdk/build/android-aarch64-normal-server-release/support/native/java.desktop/libawt/BufImgSurfaceData.o' failed
|
||||||
|
make[3]: *** [/home/runner/work/android-openjdk-build-multiarch/android-openjdk-build-multiarch/openjdk/build/android-aarch64-normal-server-release/support/native/java.desktop/libawt/BufImgSurfaceData.o] Error 1
|
||||||
|
make/Main.gmk:221: recipe for target 'java.desktop-libs' failed
|
||||||
|
make[2]: *** [java.desktop-libs] Error 2
|
||||||
|
make[2]: *** Waiting for unfinished jobs....
|
||||||
|
|
||||||
|
ERROR: Build failed for target 'images' in configuration 'android-aarch64-normal-server-release' (exit code 2)
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user