From nobody Sun Apr 10 21:04:23 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 365741A979E1; Sun, 10 Apr 2022 21:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kc4HD1msSz3lqh; Sun, 10 Apr 2022 21:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649624664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rYCk5cneWl/ORf/PZ9VCzCf5NmJdHZ91gukd9HqbTYA=; b=tx9HFiX1DQ7rs8qyRSCP1WhTAKyja1T9QfUYHbEgBNtoDFmwrPHlSn0xMWR9WPD7zLEdgP 2rzjj0ASns8vnQmXDc5P5GqhutF83whuEFXA+GE7m+1eUSyrTsqbkdsQqnYM60zYuDSUFC Gl1615rN1IcE3vu9cf5yXhZlqjucNW+ovIpAnibEWrd0XdSRb9K3hqIekj1KUPlehQ026J KSDmEYVXtx55OB+0OF6IUW4Ar2lLEFGgE0lln9IuUUYMX/Zm8lPunguWADloEhui5bwkSq tP+NAv/D0JliJsyPHDI+RmUALysAMJA3+ki32nbuP0XDbTpQsuVWupJQ1mtDJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0197F15CCA; Sun, 10 Apr 2022 21:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23AL4N9w081462; Sun, 10 Apr 2022 21:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23AL4NXI081461; Sun, 10 Apr 2022 21:04:23 GMT (envelope-from git) Date: Sun, 10 Apr 2022 21:04:23 GMT Message-Id: <202204102104.23AL4NXI081461@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: 8ba1801ad5d2 - main - java/openjdk18: Add a port of OpenJDK 18 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ba1801ad5d241c8071d87da33d80bdb1be86255 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649624664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rYCk5cneWl/ORf/PZ9VCzCf5NmJdHZ91gukd9HqbTYA=; b=hkV0+cg0qOs+6wMqhQ6Grgn1grFuzYyFPcwCrx99MHVjvNenfUzQfd88OHDbw7N1sGwj3x 1zktUqJ2nl74eTWbhBEQEVZLJKg+jS25RZYPuGtmly7tsK/I4zrDG0E0nXBKEPFizTYUPo W8Suf28UXesOtFUSS5n5Q4W/QEIcdobq6L0PIelBbxzCVyDpADSiXOC3uLf2w3pOchk2Ge 0/ho446ROWQMBsk6aspb8ay8dpnpfiNCliCiIf8OIowVoarMzNsyVqtfFasMa2sIkFTobF A7L2mTlQ57hwPcQqmByVTUd/JZcUzvPA5hoDR8PQ5CqiROmj+4hfKGRaqPAf2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649624664; a=rsa-sha256; cv=none; b=pR8LMGKR6CS6PJ/l17qjMvmgfPmFv2xyUBbESOQHyX7jdeDXMOXjJs5OxZPn+IVVkYyghg 4YAamY8kd/VbYMZms2VZ446BjKFcPF4u1ZdTn998f5+6GbFYYTMmbhRld5QbcI9x5h6D8q jk/VCmGCkxmi2fUZr2pnEBQGcXwHGUmX6j0B3m6g1kF8snSHXbmcwORa753D0C2rUSTFQd rOYq4mGkYa1bBfk6IYWb3VlcL9dOsE8GqG4jwJ4pk0gYivP+Xw8ryzYw5nLcJnNvEaeFYJ ApE1nadUn6epfSflpN1fGegZXoNkGUOPcUPfQX/X4CIlmQo8htuW44LsqKmz8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ba1801ad5d241c8071d87da33d80bdb1be86255 commit 8ba1801ad5d241c8071d87da33d80bdb1be86255 Author: Greg Lewis AuthorDate: 2022-04-03 20:20:48 +0000 Commit: Greg Lewis CommitDate: 2022-04-10 21:03:15 +0000 java/openjdk18: Add a port of OpenJDK 18 --- java/Makefile | 1 + java/openjdk18/Makefile | 195 +++++++++++++++++++ java/openjdk18/distinfo | 3 + java/openjdk18/files/cacerts | Bin 0 -> 109961 bytes ...-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp | 11 ++ java/openjdk18/files/patch-configure | 14 ++ .../files/patch-make_autoconf_flags-cflags.m4 | 13 ++ .../files/patch-make_autoconf_libraries.m4 | 15 ++ ...ake_modules_java.desktop_lib_Awt2dLibraries.gmk | 11 ++ .../files/patch-src_hotspot_os_bsd_os__bsd.cpp | 11 ++ ...op_share_native_libfontmanager_freetypeScaler.c | 209 +++++++++++++++++++++ java/openjdk18/pkg-descr | 3 + java/openjdk18/pkg-message | 18 ++ 13 files changed, 504 insertions(+) diff --git a/java/Makefile b/java/Makefile index 381f9363c383..2fdfde899949 100644 --- a/java/Makefile +++ b/java/Makefile @@ -94,6 +94,7 @@ SUBDIR += openjdk16 SUBDIR += openjdk17 SUBDIR += openjdk17-jre + SUBDIR += openjdk18 SUBDIR += openjdk7 SUBDIR += openjdk7-jre SUBDIR += openjdk8 diff --git a/java/openjdk18/Makefile b/java/openjdk18/Makefile new file mode 100644 index 000000000000..aa71d4e7d2a1 --- /dev/null +++ b/java/openjdk18/Makefile @@ -0,0 +1,195 @@ +PORTNAME= openjdk +DISTVERSIONPREFIX= jdk- +DISTVERSION= ${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +CATEGORIES= java devel +PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} + +MAINTAINER= java@FreeBSD.org +COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} + +LICENSE= GPLv2 + +ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le + +BUILD_DEPENDS= zip:archivers/zip \ + autoconf>0:devel/autoconf \ + ${LOCALBASE}/include/cups/cups.h:print/cups \ + bash:shells/bash \ + gsed:textproc/gsed +LIB_DEPENDS= libasound.so:audio/alsa-lib \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgif.so:graphics/giflib \ + libharfbuzz.so:print/harfbuzz \ + liblcms2.so:graphics/lcms2 \ + libpng.so:graphics/png +RUN_DEPENDS= javavm:java/javavmwrapper \ + xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype + +USES= compiler:features cpe gmake iconv jpeg pkgconfig xorg +USE_XORG= x11 xext xi xrandr xrender xt xtst + +CPE_VENDOR= oracle + +USE_GITHUB= yes +GH_ACCOUNT= battleblow +GH_PROJECT= jdk18 + +NO_CCACHE= yes + +_MAKE_JOBS= # +MAKE_ENV= LANG="C" \ + LC_ALL="C" \ + CLASSPATH="" \ + JAVA_HOME="" \ + LD_LIBRARY_PATH="" \ + CC=${CC} \ + CXX=${CXX} \ + CPP=${CPP} \ + MAKEFLAGS="" + +JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} +JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} +.if defined(BUILD_JRE) +JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre +.else +JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk +.endif +INSTALLDIR= ${PREFIX}/${PKGBASE} + +NOPRECIOUSMAKEVARS= yes + +JDK_MAJOR_VERSION= 18 +JDK_MINOR_VERSION= 0 +JDK_PATCH_VERSION= 0 +JDK_BUILD_NUMBER= 37 +BSD_JDK_VERSION= 1 + +JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 + +GNU_CONFIGURE= yes +CONFIGURE_ENV= CC=${CC} \ + CXX=${CXX} \ + CPP=${CPP} \ + ac_cv_path_SED=${LOCALBASE}/bin/gsed +CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ + --disable-ccache \ + --disable-javac-server \ + --disable-hotspot-gtest \ + --with-alsa=${LOCALBASE} \ + --with-cups=${LOCALBASE} \ + --with-fontconfig=${LOCALBASE} \ + --with-freetype=system \ + --with-freetype-include=${LOCALBASE}/include/freetype2 \ + --with-freetype-lib=${LOCALBASE}/lib \ + --with-libjpeg=system \ + --with-giflib=system \ + --with-giflib-include=${LOCALBASE}/include \ + --with-giflib-lib=${LOCALBASE}/lib \ + --with-harfbuzz=system \ + --with-libpng=system \ + --with-zlib=system \ + --with-lcms=system \ + --x-includes=${LOCALBASE}/include \ + --x-libraries=${LOCALBASE}/lib \ + --with-cacerts-file=${FILESDIR}/cacerts \ + --with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \ + --with-native-debug-symbols=none \ + --with-debug-level=release \ + --with-vendor-name="OpenJDK BSD Porting Team" \ + --with-vendor-url="https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/" \ + --with-vendor-bug-url="${JDK_BUG_URL}" \ + --with-vendor-vm-bug-url="${JDK_BUG_URL}" + +JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} + +.if defined(BUILD_JRE) +ALL_TARGET= legacy-images +.else +ALL_TARGET= images +.endif +JDK_BUILD_TYPE= release + +.include + +BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk18 +.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le +BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk17 +.endif +BOOTSTRAP_JDKS+= ${LOCALBASE}/openjdk17 + +# do we have valid native jdk installed? +.for BJDK in ${BOOTSTRAP_JDKS} +. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) +BOOTSTRAPJDKDIR= ${BJDK} +. endif +.endfor + +# if no valid jdk found, set dependency +.if !defined(BOOTSTRAPJDKDIR) +. if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le +BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk17 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk17 +. else +BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk17 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk17 +. endif +.endif + +JDK_BUILD_JVM= server + +MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} +CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} + +.if ${COMPILER_TYPE} == gcc +USE_GCC= yes +CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ + --with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ + --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" +.else +MAKE_ENV+= USE_CLANG=true +.if ${COMPILER_VERSION} >= 130 +CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter" +.endif +.endif + +.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*} +CONFIGURE_ARGS+= --disable-warnings-as-errors +.endif +.if ${ARCH} == aarch64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) +CONFIGURE_ARGS+= --disable-dtrace +.endif +.if ${ARCH} == powerpc64 && ${OSREL:C/\.[0-9]//} == 12 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp +.endif + +.if empty(ICONV_LIB) +ICONV_CFLAGS= -DLIBICONV_PLUG +.else +ICONV_CFLAGS= -I${LOCALBASE}/include +ICONV_LDFLAGS= -L${LOCALBASE}/lib +ICONV_LIBS= ${ICONV_LIB} +.endif + +post-patch: + @${FIND} ${WRKSRC} -name '*.orig' -delete + @${CHMOD} 755 ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/configure \ + ${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp + @${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \ + -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ + -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ + ${WRKSRC}/make/autoconf/libraries.m4 + +do-install: + @${MKDIR} ${STAGEDIR}${INSTALLDIR} + @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} + @cd ${STAGEDIR}${INSTALLDIR} && \ + ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; + @${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper + @${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ + ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} + +.include diff --git a/java/openjdk18/distinfo b/java/openjdk18/distinfo new file mode 100644 index 000000000000..c0e92e153f9c --- /dev/null +++ b/java/openjdk18/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1649001594 +SHA256 (battleblow-jdk18-jdk-18+37-1_GH0.tar.gz) = ff4b2610c1503308977026ddc820f77c221fc2db0c58256c39307e4f908e75d1 +SIZE (battleblow-jdk18-jdk-18+37-1_GH0.tar.gz) = 105502778 diff --git a/java/openjdk18/files/cacerts b/java/openjdk18/files/cacerts new file mode 100644 index 000000000000..4a096141ef17 Binary files /dev/null and b/java/openjdk18/files/cacerts differ diff --git a/java/openjdk18/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp b/java/openjdk18/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp new file mode 100644 index 000000000000..1722d87b9665 --- /dev/null +++ b/java/openjdk18/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp @@ -0,0 +1,11 @@ +--- src/hotspot/cpu/ppc/vm_version_ppc.hpp.orig 2019-10-16 11:31:09.000000000 -0700 ++++ src/hotspot/cpu/ppc/vm_version_ppc.hpp 2019-10-23 12:54:06.972903000 -0700 +@@ -108,7 +108,7 @@ + static bool has_lqarx() { return (_features & lqarx_m) != 0; } + static bool has_vcipher() { return (_features & vcipher_m) != 0; } + static bool has_vpmsumb() { return (_features & vpmsumb_m) != 0; } +- static bool has_mfdscr() { return (_features & mfdscr_m) != 0; } ++ static bool has_mfdscr() { return false; } + static bool has_vsx() { return (_features & vsx_m) != 0; } + static bool has_ldbrx() { return (_features & ldbrx_m) != 0; } + static bool has_stdbrx() { return (_features & stdbrx_m) != 0; } diff --git a/java/openjdk18/files/patch-configure b/java/openjdk18/files/patch-configure new file mode 100644 index 000000000000..59daa4ff854f --- /dev/null +++ b/java/openjdk18/files/patch-configure @@ -0,0 +1,14 @@ +--- configure.orig 2019-03-12 12:38:39.648907000 -0700 ++++ configure 2019-03-12 12:39:04.275572000 -0700 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!%%LOCALBASE%%/bin/bash + # + # Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +@@ -32,4 +32,4 @@ + # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c. + # This trick is needed to get autoconf to co-operate properly. + # The ${-:+-$-} construction passes on bash options. +-bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@" ++%%LOCALBASE%%/bin/bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@" diff --git a/java/openjdk18/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk18/files/patch-make_autoconf_flags-cflags.m4 new file mode 100644 index 000000000000..5156c18515da --- /dev/null +++ b/java/openjdk18/files/patch-make_autoconf_flags-cflags.m4 @@ -0,0 +1,13 @@ +--- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC ++++ make/autoconf/flags-cflags.m4 +@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], + # for all archs except arm and ppc, prevent gcc to omit frame pointer + $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer" + fi ++ elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then ++ if test "x$FLAGS_CPU" = xppc64; then ++ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5" ++ fi + fi + + elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then diff --git a/java/openjdk18/files/patch-make_autoconf_libraries.m4 b/java/openjdk18/files/patch-make_autoconf_libraries.m4 new file mode 100644 index 000000000000..0911464a6522 --- /dev/null +++ b/java/openjdk18/files/patch-make_autoconf_libraries.m4 @@ -0,0 +1,15 @@ +--- make/autoconf/libraries.m4~ 2019-08-12 19:10:36.292217000 -0700 ++++ make/autoconf/libraries.m4 2019-08-12 19:18:15.523606000 -0700 +@@ -188,9 +188,9 @@ + ICONV_LDFLAGS="-L/usr/local/lib" + ICONV_LIBS=-liconv + elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then +- ICONV_CFLAGS=-DLIBICONV_PLUG +- ICONV_LDFLAGS= +- ICONV_LIBS= ++ ICONV_CFLAGS=%%ICONV_CFLAGS%% ++ ICONV_LDFLAGS=%%ICONV_LDFLAGS%% ++ ICONV_LIBS=%%ICONV_LIBS%% + else + ICONV_CFLAGS= + ICONV_LDFLAGS= diff --git a/java/openjdk18/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk18/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk new file mode 100644 index 000000000000..65f66318255d --- /dev/null +++ b/java/openjdk18/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk @@ -0,0 +1,11 @@ +--- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2021-09-18 15:30:22.109237000 -0700 ++++ make/modules/java.desktop/lib/Awt2dLibraries.gmk 2021-09-18 15:31:02.024314000 -0700 +@@ -530,7 +530,7 @@ + LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ + LDFLAGS_aix := -Wl$(COMMA)-berok, \ + LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ +- LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ ++ LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ + LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation -framework CoreGraphics, \ + LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ + $(WIN_AWT_LIB), \ diff --git a/java/openjdk18/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk18/files/patch-src_hotspot_os_bsd_os__bsd.cpp new file mode 100644 index 000000000000..402f0f475bc3 --- /dev/null +++ b/java/openjdk18/files/patch-src_hotspot_os_bsd_os__bsd.cpp @@ -0,0 +1,11 @@ +--- src/hotspot/os/bsd/os_bsd.cpp.orig 2021-09-29 21:25:10 UTC ++++ src/hotspot/os/bsd/os_bsd.cpp +@@ -361,7 +361,7 @@ + #elif defined(__NetBSD__) + #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib" + #else +- #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib" ++ #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib" + #endif + #else + #define DEFAULT_LIBPATH OVERRIDE_LIBPATH diff --git a/java/openjdk18/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c b/java/openjdk18/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c new file mode 100644 index 000000000000..537ecdc3047c --- /dev/null +++ b/java/openjdk18/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c @@ -0,0 +1,209 @@ +--- 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; + } diff --git a/java/openjdk18/pkg-descr b/java/openjdk18/pkg-descr new file mode 100644 index 000000000000..41916866fc9f --- /dev/null +++ b/java/openjdk18/pkg-descr @@ -0,0 +1,3 @@ +An open-source implementation of the Java Platform, Standard Edition, + +WWW: https://openjdk.java.net/projects/jdk/18/ diff --git a/java/openjdk18/pkg-message b/java/openjdk18/pkg-message new file mode 100644 index 000000000000..2ea3d87d89c8 --- /dev/null +++ b/java/openjdk18/pkg-message @@ -0,0 +1,18 @@ +[ +{ type: install + message: <