sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-29 18:16:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
ports/java/openjdk8/files/fontconfig.patch
Greg Lewis e0172e6694 Fix build with FONTCONFIG 
* This gets the fontconfig patch applying cleanly and building.  No idea
  if it actually works or not.

PR:		241294
2019-10-17 23:45:38 +00:00

225 lines
7.6 KiB
Diff
Raw Blame History

--- jdk/src/share/native/sun/font/freetypeScaler.c.orig 2017-01-20 17:04:07 UTC
+++ jdk/src/share/native/sun/font/freetypeScaler.c
@@ -42,6 +42,8 @@
#include FT_OUTLINE_H
#include FT_SYNTHESIS_H
#include FT_MODULE_H
+#include FT_LCD_FILTER_H
+#include <fontconfig/fontconfig.h>
#include "fontscaler.h"
@@ -87,6 +89,133 @@
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
@@ -809,31 +938,14 @@
return ptr_to_jlong(getNullGlyphImage());
}
- if (!context->useSbits) {
- renderFlags |= FT_LOAD_NO_BITMAP;
- }
-
- /* 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;
+ RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
+ context->ptsz, context->aaType, &renderingProperties);
glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
- 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)
@@ -862,10 +974,10 @@
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());
}
width = (UInt16) ftglyph->bitmap.width;
@@ -1100,11 +1211,14 @@
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);
glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
+
if (error) {
return NULL;
}
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-07-18 14:30:01.000000000 -0700
+++ jdk/make/lib/Awt2dLibraries.gmk 2015-07-18 14:30:08.000000000 -0700
@@ -943,7 +943,7 @@
LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\
- LDFLAGS_SUFFIX_bsd := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
+ LDFLAGS_SUFFIX_bsd := -L%%LOCALBASE%%/lib -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
-ljava -ljvm, \
LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
Reference in a new issue View git blame Copy permalink