Attachment 178350 Details for Bug 215636 – patch file

[patch] patch file

openjdk8-8.112.16_2.patch (text/plain), 10.76 KB, created by Dmitri Goutnik on 2016-12-28 18:26:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2016-12-28 18:26:12 UTC

Size: 10.76 KB

patch

obsolete

>Index: java/openjdk8/Makefile
>===================================================================
>--- java/openjdk8/Makefile	(revision 429811)
>+++ java/openjdk8/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	openjdk
> PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	java devel
> MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
> 		https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
>@@ -255,7 +255,7 @@
> CONFIGURE_SCRIPT=	../../configure
> CONFIGURE_WRKSRC=	${WRKSRC}/common/autoconf
> 
>-OPTIONS_DEFINE=		POLICY TZUPDATE X11
>+OPTIONS_DEFINE=		POLICY TZUPDATE X11 FONTCONFIG
> OPTIONS_DEFINE_armv6=	FPUHACK
> OPTIONS_DEFAULT=	POLICY TZUPDATE X11
> OPTIONS_DEFAULT_armv6=	FPUHACK
>@@ -266,6 +266,8 @@
> FPUHACK_EXTRA_PATCHES=	${PATCHDIR}/fpuhack.patch
> POLICY_CONFIGURE_ENABLE=	unlimited-crypto
> TZUPDATE_RUN_DEPENDS=	java-zoneinfo>0:java/java-zoneinfo
>+FONTCONFIG_EXTRA_PATCHES=	${PATCHDIR}/fontconfig.patch
>+FONTCONFIG_IMPLIES=	X11
> 
> JAVAVMS_COMMENT=	OpenJDK${JDK_MAJOR_VERSION}
> 
>@@ -378,6 +380,10 @@
> ICONV_LDFLAGS=	-L${LOCALBASE}/lib ${ICONV_LIB}
> .endif
> 
>+.if ${PORT_OPTIONS:MFONTCONFIG}
>+FONTCONFIG_LDFLAGS=	-L${LOCALBASE}/lib -lfontconfig
>+.endif
>+
> post-extract:
> 	@${CP} ${FILESDIR}/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg \
> 	    ${WRKSRC}/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg
>@@ -413,6 +419,8 @@
> 	    ${WRKSRC}/jdk/make/lib/Awt2dLibraries.gmk \
> 	    ${WRKSRC}/jdk/make/lib/CoreLibraries.gmk \
> 	    ${WRKSRC}/jdk/make/lib/ServiceabilityLibraries.gmk
>+	@${REINPLACE_CMD} -e 's|%%FONTCONFIG_LDFLAGS%%|${FONTCONFIG_LDFLAGS}|' \
>+	    ${WRKSRC}/jdk/make/lib/Awt2dLibraries.gmk
> .if defined(BUILD_JRE)
> 	@${REINPLACE_CMD} -e 's|-f Images.gmk$$|& jre-image|' \
> 	    -e 's|-f Images.gmk overlay-images$$|-f Images.gmk jre-overlay-image|' \
>Index: java/openjdk8/files/fontconfig.patch
>===================================================================
>--- java/openjdk8/files/fontconfig.patch	(nonexistent)
>+++ java/openjdk8/files/fontconfig.patch	(working copy)
>@@ -0,0 +1,213 @@
>+Patch FreeType scaler to obtain per-family FreeType rendering/loading flags
>+from fontconfig instead of using OpenJDK heuristics.
>+Based on original OpenJDK Infinality patches from
>+http://www.infinality.net/forum/viewtopic.php?f=2&t=80#p395 (now gone) and Fedora 21
>+https://github.com/smerrill/fedora-21-openjdk8-infinality/blob/master/SOURCES/005_enable-infinality.patch
>+
>+--- jdk/src/share/native/sun/font/freetypeScaler.c.orig	2016-12-27 15:42:38.958414000 -0500
>++++ jdk/src/share/native/sun/font/freetypeScaler.c	2016-12-27 15:57:22.816455000 -0500
>+@@ -38,6 +38,8 @@
>+ #include FT_SIZES_H
>+ #include FT_OUTLINE_H
>+ #include FT_SYNTHESIS_H
>++#include FT_LCD_FILTER_H
>++#include <fontconfig/fontconfig.h>
>+ 
>+ #include "fontscaler.h"
>+ 
>+@@ -656,6 +658,128 @@
>+     }
>+ }
>+ 
>++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 match;
>++}
>++
>++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;
>++        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;
>++        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 (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &fcAutohint) == FcResultMatch)
>++        if (fcAutohint)
>++            ftLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
>++
>++    // LCD filter
>++    int fcLCDFilter = FC_LCD_DEFAULT;
>++    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;
>++    }
>++
>++    FcPatternDestroy(pattern);
>++
>++    rp->ftRenderMode = ftRenderMode;
>++    rp->ftLoadFlags = ftLoadFlags;
>++    rp->ftLcdFilter = ftLcdFilter;
>++}
>+ 
>+ /*
>+  * Class:     sun_font_FreetypeFontScaler
>+@@ -689,32 +813,15 @@
>+         return ptr_to_jlong(getNullGlyphImage());
>+     }
>+ 
>+-    /* if algorithmic styling is required then we do not request bitmap */
>+-    if (context->doBold || context->doItalize) {
>+-        renderFlags =  FT_LOAD_DEFAULT;
>+-    }
>+-
>+-    /* 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)
>+@@ -733,9 +840,7 @@
>+ 
>+     /* generate bitmap if it is not done yet
>+      e.g. if algorithmic styling is performed and style was added to outline */
>+-    if (ftglyph->format == FT_GLYPH_FORMAT_OUTLINE) {
>+-        FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));
>+-    }
>++    FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode);
>+ 
>+     width  = (UInt16) ftglyph->bitmap.width;
>+     height = (UInt16) ftglyph->bitmap.rows;
>+@@ -964,11 +1069,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;
>+     }
>
>Property changes on: java/openjdk8/files/fontconfig.patch
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
>===================================================================
>--- java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk	(revision 429811)
>+++ java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk	(working copy)
>@@ -1,5 +1,14 @@
> --- 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 := %%FONTCONFIG_LDFLAGS%% -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 \
> @@ -1259,7 +1259,7 @@
>    else ifeq ($(OPENJDK_TARGET_OS), bsd)
>      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include

Actions: View | Diff

Attachments on bug 215636: 178350 | 178351 | 178352 | 178353 | 178354 | 178355 | 178356 | 178357 | 178358 | 178637 | 179154 | 179959 | 188141 | 189163