diff --git a/java/openjdk23/Makefile b/java/openjdk23/Makefile --- a/java/openjdk23/Makefile +++ b/java/openjdk23/Makefile @@ -3,6 +3,7 @@ DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} +PORTREVISION= 1 MAINTAINER= java@FreeBSD.org COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} diff --git a/java/openjdk23/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c b/java/openjdk23/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c deleted file mode 100644 --- a/java/openjdk23/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c +++ /dev/null @@ -1,209 +0,0 @@ ---- src/java.desktop/share/native/libfontmanager/freetypeScaler.c.orig 2020-07-08 21:34:01 UTC -+++ src/java.desktop/share/native/libfontmanager/freetypeScaler.c -@@ -43,6 +43,7 @@ - #include FT_SYNTHESIS_H - #include FT_LCD_FILTER_H - #include FT_MODULE_H -+#include - - #include "fontscaler.h" - -@@ -87,6 +88,133 @@ typedef struct FTScalerContext { - int ptsz; /* size in points */ - } FTScalerContext; - -+typedef struct { -+ FT_Render_Mode ftRenderMode; -+ int ftLoadFlags; -+ FT_LcdFilter ftLcdFilter; -+} RenderingProperties; -+ -+static FcPattern* matchedPattern(const FcChar8* family, double ptSize) { -+ FcPattern* pattern = FcPatternCreate(); -+ if (!pattern) -+ return 0; -+ -+ FcPatternAddString(pattern, FC_FAMILY, family); -+ FcPatternAddBool(pattern, FC_SCALABLE, FcTrue); -+ FcPatternAddDouble(pattern, FC_SIZE, ptSize); -+ -+ FcConfigSubstitute(0, pattern, FcMatchPattern); -+ FcDefaultSubstitute(pattern); -+ -+ FcResult res; -+ FcPattern *match = FcFontMatch(0, pattern, &res); -+ FcPatternDestroy(pattern); -+ return (res == FcResultMatch) ? match : NULL; -+} -+ -+static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, RenderingProperties* rp) { -+ FcPattern *pattern = matchedPattern(family, ptSize); -+ -+ FT_Render_Mode ftRenderMode = FT_RENDER_MODE_NORMAL; -+ int ftLoadFlags = FT_LOAD_DEFAULT; -+ FT_LcdFilter ftLcdFilter = FT_LCD_FILTER_DEFAULT; -+ FcBool fcAntialias = 0; -+ char horizontal = 1; -+ -+ // subpixel order -+ if (aaType == TEXT_AA_ON) -+ ftRenderMode = FT_RENDER_MODE_NORMAL; -+ else if (aaType == TEXT_AA_OFF) -+ ftRenderMode = FT_RENDER_MODE_MONO; -+ else { -+ int fcRGBA = FC_RGBA_UNKNOWN; -+ if (pattern) -+ FcPatternGetInteger(pattern, FC_RGBA, 0, &fcRGBA); -+ switch (fcRGBA) { -+ case FC_RGBA_NONE: -+ ftRenderMode = FT_RENDER_MODE_NORMAL; -+ break; -+ case FC_RGBA_RGB: -+ case FC_RGBA_BGR: -+ ftRenderMode = FT_RENDER_MODE_LCD; -+ horizontal = 1; -+ break; -+ case FC_RGBA_VRGB: -+ case FC_RGBA_VBGR: -+ ftRenderMode = FT_RENDER_MODE_LCD_V; -+ horizontal = 0; -+ break; -+ default: -+ ftRenderMode = FT_RENDER_MODE_NORMAL; -+ break; -+ } -+ } -+ -+ // loading mode -+ if (aaType == TEXT_AA_OFF) -+ ftLoadFlags |= FT_LOAD_TARGET_MONO; -+ else { -+ int fcHintStyle = FC_HINT_NONE; -+ if (pattern) -+ FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &fcHintStyle); -+ switch (fcHintStyle) { -+ case FC_HINT_NONE: -+ ftLoadFlags |= FT_LOAD_NO_HINTING; -+ break; -+ case FC_HINT_SLIGHT: -+ ftLoadFlags |= FT_LOAD_TARGET_LIGHT; -+ break; -+ case FC_HINT_MEDIUM: -+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL; -+ break; -+ case FC_HINT_FULL: -+ if (aaType == TEXT_AA_ON) -+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL; -+ else -+ ftLoadFlags |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V; -+ break; -+ default: -+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL; -+ break; -+ } -+ } -+ -+ // autohinting -+ FcBool fcAutohint = 0; -+ if (pattern && FcPatternGetBool(pattern, FC_AUTOHINT, 0, &fcAutohint) == FcResultMatch) -+ if (fcAutohint) -+ ftLoadFlags |= FT_LOAD_FORCE_AUTOHINT; -+ -+ // LCD filter -+ int fcLCDFilter = FC_LCD_DEFAULT; -+ if (pattern) -+ FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &fcLCDFilter); -+ switch (fcLCDFilter) { -+ case FC_LCD_NONE: -+ ftLcdFilter = FT_LCD_FILTER_NONE; -+ break; -+ case FC_LCD_DEFAULT: -+ ftLcdFilter = FT_LCD_FILTER_DEFAULT; -+ break; -+ case FC_LCD_LIGHT: -+ ftLcdFilter = FT_LCD_FILTER_LIGHT; -+ break; -+ case FC_LCD_LEGACY: -+ ftLcdFilter = FT_LCD_FILTER_LEGACY; -+ break; -+ default: -+ ftLcdFilter = FT_LCD_FILTER_DEFAULT; -+ break; -+ } -+ -+ if (pattern) -+ FcPatternDestroy(pattern); -+ -+ rp->ftRenderMode = ftRenderMode; -+ rp->ftLoadFlags = ftLoadFlags; -+ rp->ftLcdFilter = ftLcdFilter; -+} -+ - #ifdef DEBUG - /* These are referenced in the freetype sources if DEBUG macro is defined. - To simplify work with debuging version of freetype we define -@@ -868,29 +996,12 @@ static jlong - renderFlags |= FT_LOAD_NO_HINTING; - } - -- if (!context->useSbits) { -- renderFlags |= FT_LOAD_NO_BITMAP; -- } -+ RenderingProperties renderingProperties; -+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name, -+ context->ptsz, context->aaType, &renderingProperties); - -- /* NB: in case of non identity transform -- we might also prefer to disable transform before hinting, -- and apply it explicitly after hinting is performed. -- Or we can disable hinting. */ -- -- /* select appropriate hinting mode */ -- if (context->aaType == TEXT_AA_OFF) { -- target = FT_LOAD_TARGET_MONO; -- } else if (context->aaType == TEXT_AA_ON) { -- target = FT_LOAD_TARGET_NORMAL; -- } else if (context->aaType == TEXT_AA_LCD_HRGB || -- context->aaType == TEXT_AA_LCD_HBGR) { -- target = FT_LOAD_TARGET_LCD; -- } else { -- target = FT_LOAD_TARGET_LCD_V; -- } -- renderFlags |= target; -- -- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags); -+ FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter); -+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); - if (error) { - //do not destroy scaler yet. - //this can be problem of particular context (e.g. with bad transform) -@@ -915,11 +1026,11 @@ static jlong - glyphInfo = getNullGlyphImage(); - return ptr_to_jlong(glyphInfo); - } -- error = FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target)); -- if (error != 0) { -- return ptr_to_jlong(getNullGlyphImage()); -- } - } -+ error = FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode); -+ if (error != 0) { -+ return ptr_to_jlong(getNullGlyphImage()); -+ } - - if (renderImage) { - width = (UInt16) ftglyph->bitmap.width; -@@ -1134,9 +1245,11 @@ static FT_Outline* getFTOutline(JNIEnv* env, jobject f - return NULL; - } - -- renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP; -+ RenderingProperties renderingProperties; -+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name, -+ context->ptsz, context->aaType, &renderingProperties); - -- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags); -+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); - if (error) { - return NULL; - }