Attachment #216749 for bug #248248




# Created by: Tobias Kortkamp <t@tobik.me>
# $FreeBSD$

PORTNAME=	openjfx
DISTVERSION=	14.0.2.1+1
CATEGORIES=	x11-toolkits java devel
PKGNAMESUFFIX=	14
CATEGORIES=	java x11-toolkits devel
MASTER_SITES=	https://github.com/t6/openjfx/releases/download/release/ \
		http://hg.openjdk.java.net/openjfx/8u/rt/archive/${DISTVERSION}${EXTRACT_SUFX}?dummy=/
PKGNAMESUFFIX=	-devel

MAINTAINER=	mikael@FreeBSD.org
COMMENT=	JavaFX SDK overlay for OpenJDK 11

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64
EXPIRATION_DATE=	2020-11-30
ONLY_FOR_ARCHS=	amd64 i386

BUILD_DEPENDS=	zip:archivers/zip \
		apache-ant>0:devel/apache-ant \
		antlr4>0:devel/antlr4 \
		gradle62>=6.2:devel/gradle62 \
		${JAVALIBDIR}/junit.jar:java/junit
LIB_DEPENDS=	libasound.so:audio/alsa-lib \
		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2

USES=		gettext-runtime gl gnome jpeg localbase:ldflags ninja pkgconfig \
		sqlite xorg

USE_GITHUB=	yes
GH_ACCOUNT=	openjdk
GH_PROJECT=	jfx
USE_GL=		gl
USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango
USE_JAVA=	yes
JAVA_VERSION=	11
USE_LDCONFIG=	yes
USE_XORG=	x11 xtst xxf86vm

CFLAGS+=	-Wno-unused-command-line-argument

PLIST_SUB=	JAVA_HOME=${JAVA_HOME}

PLIST_SUB=	ARCH=${ARCH} \
		JAVA_HOME=${JAVA_HOME}

OPTIONS_DEFINE=	MEDIA SWT TEST WEBKIT
OPTIONS_EXCLUDE_aarch64=	WEBKIT
OPTIONS_EXCLUDE_powerpc64=	WEBKIT
OPTIONS_DEFAULT=	MEDIA WEBKIT
OPTIONS_SUB=	yes


WEBKIT_IMPLIES=	MEDIA
WEBKIT_BUILD_DEPENDS=	cmake:devel/cmake
WEBKIT_LIB_DEPENDS=	libicui18n.so:devel/icu
WEBKIT_USES=	bison gmake gperf perl5 python:2.7,build
WEBKIT_USE=	GNOME=libxslt,libxml2 \
		PERL5=build \
		RUBY=yes \

# Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle
_GRADLE_ENV=	CC=${WRKDIR}/bin/ccwrapper \
		CXX=${WRKDIR}/bin/cxxwrapper \
		GRADLE_USER_HOME=${WRKDIR}/gradle-home \
		JAVA_VERSION=${JAVA_VERSION}
_GRADLE_RUN=	${SETENV} ${_GRADLE_ENV} gradle62 --no-daemon

# NOTE: This port won't build if ${JAVA_HOME}/jre/lib/ext/jfxrt.jar
# already exists on your system.  This is not a problem in Poudriere
# or Synth but something to be aware of if you're trying to build this
# port in a non-pristine environment.

# The BSD Makefiles for GStreamer-lite and Jfxmedia are based on the
# Linux versions.  Prepare the tree, so that we only see the changes
# from Linux's Makefile in our own patches.
pre-patch:
	@${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/linux \
		${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/bsd
	@${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/linux \
		${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/bsd

post-patch:
	@${MKDIR} ${WRKDIR}/bin
	@${PRINTF} '#!/bin/sh\nexec ${CCACHE_BIN} ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper
	@${PRINTF} '#!/bin/sh\nexec ${CCACHE_BIN} ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper
	@${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper
	@${REINPLACE_CMD} -e 's|gcc|${WRKDIR}/bin/ccwrapper|g' \
			  -e 's|g\+\+|${WRKDIR}/bin/cxxwrapper|g' \
		${WRKSRC}/buildSrc/bsd.gradle
		${WRKSRC}/buildSrc/linux.gradle > ${WRKSRC}/buildSrc/bsd.gradle
# Add a *BSD native audio sink to GStreamer-lite instead of using the
# bundled ALSA sink.  Currently we add an sndio sink, but this is an extension
# point for eventually adding an OSS backend (or others) as an option as well.
# If you add a new one make sure it registers itself as "bsdaudiosink" as defined
# in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp
	@${MKDIR} ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
	@${CP} ${FILESDIR}/gstsndio.* ${FILESDIR}/sndiosink.* \
		${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
	@cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \
		${LN} -s gstsndio.c gstbsdaudio.c && \
		${LN} -s sndiosink.c bsdaudiosink.c
# Pull Java dependencies from LOCALBASE
	@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \
		${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle
# Remove bundled libraries. We use the system's versions instead.
	@cd ${WRKSRC}/modules/javafx.web/src/main/native/Source/ThirdParty && \
		${RM} -r icu libxml libxslt sqlite
	@${RM} -r ${WRKSRC}/modules/javafx.web/src/main/native/Source/WTF/icu
	@cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/3rd_party && \
		${RM} -r glib libffi

post-patch-SWT-off:
	@${RM} -r ${WRKSRC}/modules/graphics/src/main/java/com/sun/glass/ui/swt

do-configure:
	@${MKDIR} ${WRKDIR}/gradle-home
	@${ECHO_CMD} "NUM_COMPILE_THREADS = ${MAKE_JOBS_NUMBER}" > ${WRKSRC}/gradle.properties

	@${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle

do-build:
	@cd ${WRKSRC} && ${SETENV} ${_GRADLE_RUN} zips

do-install:
	@${MKDIR} ${STAGEDIR}${JAVA_HOME}/lib ${STAGEDIR}${JAVA_HOME}/jmods
	(cd ${WRKSRC}/build/artifacts/javafx-sdk-14.0.2.1/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVA_HOME}/lib)
	@${MV} ${STAGEDIR}${JAVA_HOME}/lib/src.zip ${STAGEDIR}${JAVA_HOME}/lib/javafx-src.zip
	(cd ${WRKSRC}/build/artifacts/javafx-jmods-14.0.2.1 && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVA_HOME}/jmods)
	@${FIND} ${STAGEDIR}${JAVA_HOME}/lib -name '*.so' -exec ${STRIP_CMD} \{\} \;

do-test-TEST-on:
	@cd ${WRKSRC} && ${_GRADLE_RUN} check test

Lines 1-3 Link Here

(-)java/openjfx14/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1563779003	1	TIMESTAMP = 1595085795
2	SHA256 (openjfx8-8u202-b07.tar.gz) = ca98b6d0721a0e4b91d62672e81594c80a47cfb5ded241de50f10ade9884c400	2	SHA256 (openjdk-jfx-14.0.2.1+1_GH0.tar.gz) = 08830d79dbdaadf66a1feae356caed6d70636dfdbf47598dd48a59f407d05ef1
3	SIZE (openjfx8-8u202-b07.tar.gz) = 70669594	3	SIZE (openjdk-jfx-14.0.2.1+1_GH0.tar.gz) = 67975108




--- build.gradle.orig	2020-07-17 10:21:33 UTC
+++ build.gradle
@@ -295,6 +295,7 @@ ext.IS_64 = OS_ARCH.toLowerCase().contains("64")
 ext.IS_MAC = OS_NAME.contains("mac") || OS_NAME.contains("darwin")
 ext.IS_WINDOWS = OS_NAME.contains("windows")
 ext.IS_LINUX = OS_NAME.contains("linux")
+ext.IS_BSD = OS_NAME.contains("freebsd") || OS_NAME.contains("dragonfly")
 
 ext.MAVEN_GROUP_ID = "org.openjfx"
 // use a user supplied JDK_HOME, STUB_RUNTIME, JAVAC, and/or JAVAH, all of which may be specified
@@ -313,7 +314,7 @@ defineProperty("COMPILE_MEDIA", "false")
 ext.IS_COMPILE_MEDIA = Boolean.parseBoolean(COMPILE_MEDIA)
 
@@ -302,7 +303,7 @@ ext.MAVEN_GROUP_ID = "org.openjfx"
 // at present building on PI is not supported, but we would only need to make
 // some changes on assumptions on what should be built (like SWT / Swing) and
 // such and we could probably make it work.
-if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) fail("Unsupported build OS ${OS_NAME}")
+if (!IS_MAC && !IS_WINDOWS && !IS_LINUX && !IS_BSD) fail("Unsupported build OS ${OS_NAME}")
 if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
     fail("Unknown and unsupported build architecture: $OS_ARCH")
 } else if (IS_MAC && OS_ARCH != "x86_64") {
@@ -385,7 +386,7 @@ defineProperty("BUILD_WORKING_LIBAV", "false")
 ext.IS_BUILD_WORKING_LIBAV = IS_LINUX ? Boolean.parseBoolean(BUILD_WORKING_LIBAV) : false
 
 // COMPILE_PANGO specifies whether to build javafx_font_pango.
-defineProperty("COMPILE_PANGO", "${IS_LINUX}")
+defineProperty("COMPILE_PANGO", "${IS_LINUX || IS_BSD}")

 ext.IS_COMPILE_PANGO = Boolean.parseBoolean(COMPILE_PANGO)
 
 // COMPILE_HARFBUZZ specifies whether to use Harfbuzz.
@@ -413,7 +414,8 @@ ext.SWT_FILE_NAME = IS_MAC ? "org.eclipse.swt.cocoa.ma
     IS_WINDOWS && IS_64 ? "org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512" :
     IS_WINDOWS && !IS_64 ? "org.eclipse.swt.win32.win32.x86_3.105.3.v20170228-0512" :
     IS_LINUX && IS_64 ? "org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512" :

+    IS_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.105.3.v20170228-0512" :
+    IS_BSD ? "/usr/local/share/java/classes/swt.jar" : ""
 
 // Specifies whether to run full tests (true) or smoke tests (false)
 defineProperty("FULL_TEST", "false")
@@ -495,6 +497,12 @@ if (IS_MAC) {
     defineProperty("NUM_COMPILE_THREADS", "${Runtime.runtime.availableProcessors()}")
 }
 

 //
 // The next three sections of properties are used to generate the
 // VersionInfo class, and the Windows DLL manifest.
@@ -558,7 +566,7 @@ defineProperty("MAVEN_VERSION", IS_MILESTONE_FCS ? "${
 // Check whether the COMPILE_TARGETS property has been specified (if so, it was done by
 // the user and not by this script). If it has not been defined then default
 // to building the normal desktop build for this machine

 defineProperty("COMPILE_TARGETS", "$defaultHostTarget")
 
 // Flag indicating whether to import cross compile tools
@@ -704,7 +712,7 @@ void fetchExternalTools(String configName, List packag
                 def File pkgdir = file("$destdir/$basename")
 
                 if (pkgname.endsWith(".tgz") || pkgname.endsWith("tar.gz")) {
-                    if (IS_LINUX || IS_MAC) {
+                    if (IS_LINUX || IS_MAC || IS_BSD) {
                         // use native tar to support symlinks
                         pkgdir.mkdirs()
                         exec {
@@ -1180,7 +1188,7 @@ compileTargets { t ->
     if (!targetProperties.containsKey('includeMonocle')) targetProperties.includeMonocle = false
     if (!targetProperties.containsKey('includeEGL')) targetProperties.includeEGL = false
 

-    if (!targetProperties.containsKey('includeGTK')) targetProperties.includeGTK = IS_LINUX
+    if (!targetProperties.containsKey('includeGTK')) targetProperties.includeGTK = IS_LINUX || IS_BSD
 
     if (!targetProperties.containsKey('modLibDest')) targetProperties.modLibDest = targetProperties.libDest
     // a common name for the hosted build (for use when building apps)
@@ -708,7 +716,7 @@ compileTargets { t ->
 // at present building on PI is not supported, but we would only need to make
 // some changes on assumptions on what should be built (like SWT / Swing) and
 // such and we could probably make it work.
-if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) logger.error("Unsupported build OS ${OS_NAME}")
+if (!IS_MAC && !IS_WINDOWS && !IS_LINUX && !IS_BSD) logger.error("Unsupported build OS ${OS_NAME}")
 if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
     throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
 } else if (IS_MAC && OS_ARCH != "x86_64") {
@@ -1165,7 +1173,8 @@ allprojects {
     // By default all of our projects require junit for testing so we can just
     // setup this dependency here.
     dependencies {
-        testCompile group: "junit", name: "junit", version: "4.8.2"
+        testCompile files("/usr/local/share/java/classes/junit4.jar",
+                          "/usr/local/share/java/classes/hamcrest.jar")
         if (BUILD_CLOSED && DO_JCOV)  {
             testCompile name: "jcov"
         }
@@ -1303,12 +1312,15 @@ project(":graphics") {
 
@@ -2067,6 +2075,11 @@ project(":graphics") {
     }
 
     dependencies {
         compile project(":base"), BUILD_SRC
-        compile name: SWT_FILE_NAME
-        stubCompile group: "junit", name: "junit", version: "4.8.2",
+        if (IS_BSD) {
+             compile files(SWT_FILE_NAME)
+	} else {
+             compile name: SWT_FILE_NAME
+	}
         stubCompile group: "junit", name: "junit", version: "4.8.2"
+                          "/usr/local/share/java/classes/hamcrest.jar"),
         project(":base").sourceSets.test.output, sourceSets.main.output
-        antlr3 group: "org.antlr", name: "antlr", version: "3.1.3"
-        antlr3 group: "org.antlr", name: "antlr-runtime",  version: "3.1.3"
-        antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2"
+        antlr3 files("/usr/local/share/java/classes/antlr-3.5.2-complete.jar")
     }
 
         antlr group: "org.antlr", name: "antlr4", version: "4.7.2", classifier: "complete"
@@ -2456,7 +2469,7 @@ project(":graphics") {
             libsDir.mkdirs();
 
             def allLibsPresent = true
-            def libNames = [ "antlr4-4.7.2-complete.jar" ]
+            def libNames = [ "antlr-4.8-complete.jar" ]
             libNames.each { name ->
                 File f = new File(libsDir, name)
                 if (!f.exists()) allLibsPresent = false
@@ -2467,7 +2480,7 @@ project(":graphics") {
                 copy {
                     into libsDir
                     from f.getParentFile()
-                    include "**/antlr4-4.7.2-complete.jar"
+                    include "**/antlr-4.8-complete.jar"
-                    include "**/antlr-runtime-3.1.3.jar"
+                    include "**/antlr-3.5.2-complete.jar"
                     includeEmptyDirs = false
                 }
             }
@@ -2602,31 +2615,10 @@ project(":swt") {
     commonModuleSetup(project, [ 'base', 'graphics' ])
 
     dependencies {
         compile BUILD_SRC, project(":base"), project(":graphics")
-        compile name: SWT_FILE_NAME
-    }
-
+        } else {
+            compile name: SWT_FILE_NAME
+        }
     }
 }
 
@@ -1794,7 +1808,7 @@ project(":fxpackager") {
     }
 
     dependencies {
-        compile group: "org.apache.ant", name: "ant", version: "1.8.2"
+        compile files("/usr/local/share/java/apache-ant/lib/ant.jar")
     }
 
     // When producing the jar, we need to relocate a few class files
@@ -2055,23 +2069,6 @@ project(":fxpackager") {
     jar.dependsOn buildJavaPackager
     jar.dependsOn packagerJar
 
-    classes {
-        doLast {
-            // Copy all of the download libraries to libs directory for the sake of the IDEs
-            File libsDir = rootProject.file("build/libs");
-            File swtLib = new File(libsDir, "swt-debug.jar")
-            libsDir.mkdirs();
-
-            // Skip copy if file is present.
-            if (swtLib.exists()) return;
-
-            for (File f : configurations.compile.files) {
-                // Have to rename the swt jar because it is some platform specific name but
-                // for the sake of the IDEs we need to have a single stable name that works
-                // on every platform
-                copy {
-                    into libsDir
-                    from f.getParentFile()
-                    include "**/*swt*.jar"
-                    includeEmptyDirs = false
-                    rename ".*swt.*jar", "swt-debug\\.jar"
-                }
-            }
+        if (IS_BSD) {
+            compile files(SWT_FILE_NAME)
+        } else {
+            compile name: SWT_FILE_NAME
         }
     }
@@ -2250,7 +2247,7 @@ project(":media") {
 
@@ -2809,7 +2801,7 @@ project(":media") {
 
             doLast {
                 exec {
-                    commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/jfxmedia/projects/${projectDir}")

+                    commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/jfxmedia/projects/${projectDir}")
                     args("JAVA_HOME=${JDK_HOME}", "GENERATED_HEADERS_DIR=${generatedHeadersDir}",
                          "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=jfxmedia",
                          "COMPILE_PARFAIT=${compileParfait}",
@@ -2838,7 +2830,7 @@ project(":media") {
                         args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.jfxmediaRcFile}")
                     } else {
                         args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
-                        if (t.name == "linux") {
+                        if (t.name == "linux" || t.name == "bsd") {
                             args(IS_64 ? "ARCH=x64" : "ARCH=x32")
                         }
 
@@ -2282,7 +2279,7 @@ project(":media") {
                 enabled = IS_COMPILE_MEDIA
                 doLast {
                     exec {
-                        commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/gstreamer-lite")
+                        commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/gstreamer-lite")
                         args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=gstreamer-lite",
                              IS_64 ? "ARCH=x64" : "ARCH=x32", "CC=${mediaProperties.compiler}",
                              "AR=${mediaProperties.ar}", "LINKER=${mediaProperties.linker}")
@@ -2856,7 +2848,7 @@ project(":media") {
 
                         if (t.name == "win") {
@@ -2290,7 +2287,7 @@ project(":media") {
                             args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.gstreamerRcFile}")
                         } else {
                             args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
-                            if (t.name == "linux") {
+                            if (t.name == "linux" || t.name == "bsd") {
                                 args(IS_64 ? "ARCH=x64" : "ARCH=x32")
                             }
                         }
@@ -2311,7 +2308,7 @@ project(":media") {
 
                 doLast {
                     exec {
-                        commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/fxplugins")
+                        commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/fxplugins")
                         args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=fxplugins",
                              IS_64 ? "ARCH=x64" : "ARCH=x32",
                              "CC=${mediaProperties.compiler}", "AR=${mediaProperties.ar}", "LINKER=${mediaProperties.linker}")
@@ -2879,7 +2871,7 @@ project(":media") {
 
@@ -2328,7 +2325,7 @@ project(":media") {
                             args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.fxpluginsRcFile}")
                         } else {
                             args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
-                            if (t.name == "linux") {
+                            if (t.name == "linux" || t.name == "bsd") {
                                 args(IS_64 ? "ARCH=x64" : "ARCH=x32")
                             }
                         }
@@ -2338,7 +2335,7 @@ project(":media") {
 
             buildNative.dependsOn buildPlugins
 
-            if (t.name == "linux") {
+            if (t.name == "linux" || t.name == "bsd") {
                 // Pre-defined command line arguments
                 def cfgCMDArgs = ["sh", "configure"]
                 def commonCfgArgs = ["--enable-shared", "--disable-debug", "--disable-static", "--disable-yasm", "--disable-doc", "--disable-programs", "--disable-everything"]
@@ -2984,7 +2976,7 @@ project(":media") {
                                 }
                                 exec {
                                     workingDir("$libavDir")
-                                    commandLine("make")
+                                    commandLine(MAKE_CMD)
                                 }
                             }
                         }
@@ -3052,7 +3044,7 @@ project(":media") {
                                 }
                                 exec {
                                     workingDir("$libavDir")
-                                    commandLine("make")
+                                    commandLine(MAKE_CMD)
                                 }
                             }
                         }
@@ -3138,7 +3130,7 @@ project(":media") {
                                 }
                                 exec {
                                     workingDir("$libavDir")
-                                    commandLine("make")
+                                    commandLine(MAKE_CMD)
                                 }
                             }
                         }
@@ -3172,7 +3164,7 @@ project(":media") {
                                 File dir = file(libavDir)
                                 if (dir.exists()) {
                                     exec {
-                                        commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
+                                        commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
                                         args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
                                              "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
                                              "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}",
@@ -3186,7 +3178,7 @@ project(":media") {
@@ -2362,7 +2359,7 @@ project(":media") {
                                 File dir = file(libavDir)
                                 if (dir.exists()) {
                                     exec {

                                         args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
                                              "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
                                              "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}",
@@ -3200,7 +3192,7 @@ project(":media") {
                                 File dir = file(libavDir)
                                 if (dir.exists()) {
                                     exec {
-                                        commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
+                                        commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
                                         args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
                                              "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
                                              "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}",
@@ -3211,7 +3203,7 @@ project(":media") {
                         } else {
                             // Building fxavcodec plugin (libav plugin)
                             exec {
-                                commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
+                                commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
                                 args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
                                      "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
                                      "BASE_NAME=avplugin", IS_64 ? "ARCH=x64" : "ARCH=x32")
@@ -3262,7 +3254,7 @@ project(":media") {
@@ -2423,7 +2420,7 @@ project(":media") {
                     doLast {
                         exec {
                             environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT)

-                            commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite")
+                            commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite")
                             args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite",
                                  IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.glibRcFile}",
                                  "CC=${mediaProperties.compiler}", "AR=${mediaProperties.ar}", "LINKER=${mediaProperties.linker}")
@@ -3282,7 +3274,7 @@ project(":media") {
                         }
@@ -2442,7 +2439,7 @@ project(":media") {
                         }
 
                         exec {
-                            commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite")
+                            commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite")
                             args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite")
                             args ("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}")
                         }
@@ -3407,7 +3399,7 @@ project(":web") {
     compileTargets { t ->
         def targetProperties = project.rootProject.ext[t.upper]
         def webkitProperties = targetProperties.webkit

                           IS_64 ? "${t.name}-amd64" : "${t.name}-i586"
 
         def webkitOutputDir = cygpath("$buildDir/${t.name}")
@@ -3436,8 +3428,12 @@ project(":web") {
                         environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT)
                     } else if (t.name == "mac") {
                         cmakeArgs = " $cmakeArgs -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_MIN_VERSION -DCMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
-                    } else if (t.name == "linux") {
-                        cmakeArgs = " $cmakeArgs -DCMAKE_SYSTEM_NAME=Linux"
+                    } else if (t.name == "linux" || t.name == "bsd") {
+                        if (t.name == "linux") {
+                            cmakeArgs = " $cmakeArgs -DCMAKE_SYSTEM_NAME=Linux"
+                        } else {
+                            cmakeArgs = " $cmakeArgs -DCMAKE_SYSTEM_NAME=FreeBSD"
+                        }
                         if (IS_64) {
                             cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=x86_64"
                         } else {
@@ -3479,6 +3475,10 @@ project(":web") {
                         targetCpuBitDepthSwitch = "--32-bit"
                     }
                     cmakeArgs += " -DJAVAFX_RELEASE_VERSION=${jfxReleaseMajorVersion}"
                     cmakeArgs += " -DJAVAFX_RELEASE_VERSION=8.0"
+                    cmakeArgs += " -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
+                    cmakeArgs += " -DCMAKE_C_COMPILER:STRING=${System.getenv("CC")}"
+                    cmakeArgs += " -DCMAKE_CXX_COMPILER:STRING=${System.getenv("CXX")}"
+
                     commandLine("perl", "$projectDir/src/main/native/Tools/Scripts/build-webkit",
                         "--java", "--icu-unicode", targetCpuBitDepthSwitch,
                         "--no-experimental-features", "--cmakeargs=${cmakeArgs}")
@@ -4928,7 +4928,7 @@ compileTargets { t ->
                     // OSX media natives
                     [ "jfxmedia_qtkit", "jfxmedia_avf", "glib-lite" ].each { name ->
                         from ("${mediaProject.buildDir}/native/${t.name}/${mediaBuildType}/${library(name)}") }
-                } else if (t.name == "linux") {
+                } else if (t.name == "linux" || t.name == "bsd") {
                     from("${mediaProject.buildDir}/native/${t.name}/${mediaBuildType}") { include "libavplugin*.so" }
                 } else from ("${mediaProject.buildDir}/native/${t.name}/${mediaBuildType}/${library("glib-lite")}")
             } else {
@@ -4941,7 +4941,7 @@ compileTargets { t ->
                     // copy libjfxmedia_{avf,qtkit}.dylib if they exist
                     [ "jfxmedia_qtkit", "jfxmedia_avf", "glib-lite" ].each { name ->
                         from ("$MEDIA_STUB/${library(name)}") }
-                } else if (t.name == "linux") {
+                } else if (t.name == "linux" || t.name == "bsd") {
                     from(MEDIA_STUB) { include "libavplugin*.so" }
                     }
                 }
                 else if (t.name != "android"  && t.name != "dalvik" ) {
             }
 
             // Copy over the javapackager executable
-            if (t.name == "win" || t.name == "linux" || t.name == "mac") {
+            if (t.name == "win" || t.name == "linux" || t.name == "bsd" || t.name == "mac") {
                 copy {
                     from "modules/fxpackager/build/javapackager"
                     into "build/${sdkDirName}/bin"
@@ -3264,6 +3264,7 @@ ext.JFXRT_CP =
             "modules/web/build/classes/java/main",
     )
 
+/*
 project(":apps") {
     // The apps build is Ant based, and gradle lets us "import" ant build.xml
     // into our configuration.
@@ -3341,7 +3342,7 @@ project(":apps") {
         }
         rootProject.clean.dependsOn(appsClean)
     }
-}
+} */
 
 /******************************************************************************
  *                                                                            *




--- buildSrc/bsd.gradle.orig	2020-07-21 10:33:26 UTC
+++ buildSrc/bsd.gradle
@@ -0,0 +1,329 @@
+/*
+ * Copyright (c) 2013, 2019, 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.
+ */
+
+ext.BSD = [:]
+
+// Declare whether this particular target file applies to the current system
+BSD.canBuild = IS_BSD;
+if (!BSD.canBuild) return;
+
+// All desktop related packages should be built
+BSD.compileSwing = true;
+BSD.compileSWT = true;
+
+// Libraries end up in the lib/$OS_ARCH directory for Linux
+BSD.libDest = "lib"
+
+// Lambda for naming the generated libs
+BSD.library = { name -> return (IS_STATIC_BUILD ? "lib${name}.a" : "lib${name}.so") as String }
+
+// A set of common parameters to use for both compiling and linking
+def commonFlags = [
+        "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
+        "-fstack-protector",
+        "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses"] // warning flags
+
+if (!IS_64) {
+    commonFlags += "-m32"
+}
+
+if (IS_STATIC_BUILD) {
+    commonFlags += "-DSTATIC_BUILD"
+}
+
+// Specify the compilation parameters and link parameters
+def ccFlags = [
+        commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/freebsd", "-c",
+        "-ffunction-sections", "-fdata-sections",
+        IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
+def ccFlagsGTK3 = ccFlags
+//ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
+def dynamicLinkFlags = [ "-shared", commonFlags,
+                 "-z", "relro",
+                 "-Wl,--gc-sections"].flatten()
+
+def staticLinkFlags = [].flatten()
+
+def linkFlags = IS_STATIC_BUILD ? staticLinkFlags : dynamicLinkFlags;
+
+if (IS_DEBUG_NATIVE) {
+    linkFlags += "-g"
+}
+
+def toolchainDir
+if (hasProperty('toolchainDir')) {
+    toolchainDir = ext.toolchainDir + "/"
+} else {
+    toolchainDir = ""
+}
+
+def gtk2CCFlags = [  ];
+def gtk3CCFlags = [ "-Wno-deprecated-declarations" ];
+def gtk2LinkFlags = [ ];
+def gtk3LinkFlags = [ ];
+
+// Create $buildDir/freebsd_tools.properties file and load props from it
+setupTools("bsd_gtk2",
+    { propFile ->
+        ByteArrayOutputStream results1 = new ByteArrayOutputStream();
+        exec {
+            commandLine("${toolchainDir}pkg-config", "--cflags", "gtk+-2.0", "gthread-2.0", "xtst")
+            setStandardOutput(results1);
+        }
+        propFile << "cflagsGTK2=" << results1.toString().trim() << "\n";
+
+        ByteArrayOutputStream results3 = new ByteArrayOutputStream();
+        exec {
+            commandLine("${toolchainDir}pkg-config", "--libs", "gtk+-2.0", "gthread-2.0", "xtst")
+            setStandardOutput(results3);
+        }
+        propFile << "libsGTK2=" << results3.toString().trim()  << "\n";
+    },
+    { properties ->
+        def cflagsGTK2 = properties.getProperty("cflagsGTK2")
+        def libsGTK2 = properties.getProperty("libsGTK2")
+        if (cflagsGTK2 && libsGTK2) {
+            gtk2CCFlags.addAll(cflagsGTK2.split(" "))
+            gtk2LinkFlags.addAll(libsGTK2.split(" "))
+        } else {
+            throw new IllegalStateException("GTK2 development packages not found. If GTK2 packages are installed, please remove the build directory and try again.")
+        }
+    }
+)
+
+setupTools("bsd_gtk3",
+    { propFile ->
+        ByteArrayOutputStream results2 = new ByteArrayOutputStream();
+        exec {
+            commandLine("${toolchainDir}pkg-config", "--cflags", "gtk+-3.0", "gthread-2.0", "xtst")
+            setStandardOutput(results2);
+        }
+        propFile << "cflagsGTK3=" << results2.toString().trim() << "\n";
+
+        ByteArrayOutputStream results4 = new ByteArrayOutputStream();
+        exec {
+            commandLine("${toolchainDir}pkg-config", "--libs", "gtk+-3.0", "gthread-2.0", "xtst")
+            setStandardOutput(results4);
+        }
+        propFile << "libsGTK3=" << results4.toString().trim()  << "\n";
+
+    },
+    { properties ->
+        def cflagsGTK3 = properties.getProperty("cflagsGTK3")
+        def libsGTK3 = properties.getProperty("libsGTK3")
+        if (cflagsGTK3 && libsGTK3) {
+            gtk3CCFlags.addAll(cflagsGTK3.split(" "))
+            gtk3LinkFlags.addAll(libsGTK3.split(" "))
+        } else {
+            throw new IllegalStateException("GTK3 development packages not found. If GTK3 packages are installed, please remove the build directory and try again.")
+        }
+    }
+)
+
+def pangoCCFlags = ["-D_ENABLE_PANGO"];
+def pangoLinkFlags = [];
+setupTools("bsd_pango_tools",
+    { propFile ->
+        ByteArrayOutputStream results = new ByteArrayOutputStream();
+        exec {
+            commandLine "${toolchainDir}pkg-config", "--cflags", "pangoft2"
+            standardOutput = results
+        }
+        propFile << "cflags=" << results.toString().trim() << "\n";
+
+        results = new ByteArrayOutputStream();
+        exec {
+            commandLine "${toolchainDir}pkg-config", "--libs", "pangoft2"
+            standardOutput = results
+        }
+        propFile << "libs=" << results.toString().trim();
+    },
+    { properties ->
+        def cflags = properties.getProperty("cflags")
+        def libs = properties.getProperty("libs")
+        if (cflags && libs) {
+            pangoCCFlags.addAll(cflags.split(" "))
+            pangoLinkFlags.addAll(libs.split(" "))
+        } else {
+            throw new IllegalStateException("Linux pango packages not found.\nIf pango packages are installed, please remove the build directory and try again.")
+        }
+    }
+)
+
+def freetypeCCFlags = [ext.IS_COMPILE_PANGO ? "-D_ENABLE_PANGO" :
+                       ext.IS_COMPILE_HARFBUZZ ? "-D_ENABLE_HARFBUZZ" : ""]
+def freetypeLinkFlags = []
+setupTools("bsd_freetype_tools",
+    { propFile ->
+        ByteArrayOutputStream results = new ByteArrayOutputStream();
+        exec {
+            commandLine "${toolchainDir}pkg-config", "--cflags", "freetype2"
+            standardOutput = results
+        }
+        propFile << "cflags=" << results.toString().trim() << "\n";
+
+        results = new ByteArrayOutputStream();
+        exec {
+            commandLine "${toolchainDir}pkg-config", "--libs", "freetype2"
+            standardOutput = results
+        }
+        propFile << "libs=" << results.toString().trim();
+    },
+    { properties ->
+        def cflags = properties.getProperty("cflags")
+        def libs = properties.getProperty("libs")
+        if (cflags && libs) {
+            freetypeCCFlags.addAll(cflags.split(" "))
+            if (!IS_STATIC_BUILD) {
+                freetypeLinkFlags.addAll(libs.split(" "))
+            }
+        } else {
+            throw new IllegalStateException("Linux freetype packages not found.\nIf freetype pacakges are installed, please remove the build directory and try again.")
+        }
+    }
+)
+
+def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "${toolchainDir}gcc";
+def linker = IS_STATIC_BUILD ? "ar" : IS_COMPILE_PARFAIT ? "parfait-g++" : "${toolchainDir}g++";
+
+BSD.glass = [:]
+BSD.glass.variants = ["glass", "glassgtk2", "glassgtk3"]
+
+FileTree ft_gtk_launcher = fileTree("${project(":graphics").projectDir}/src/main/native-glass/gtk/") {
+    include("**/launcher.c")
+}
+
+FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-glass/gtk/") {
+    exclude("**/launcher.c")
+}
+
+BSD.glass.glass = [:]
+BSD.glass.glass.nativeSource = ft_gtk_launcher.getFiles()
+BSD.glass.glass.compiler = compiler
+BSD.glass.glass.ccFlags = [ccFlags].flatten()
+BSD.glass.glass.linker = linker
+BSD.glass.glass.linkFlags = IS_STATIC_BUILD? linkFlags : [linkFlags, "-lX11", "-ldl"].flatten()
+BSD.glass.glass.lib = "glass"
+
+BSD.glass.glassgtk2 = [:]
+BSD.glass.glassgtk2.nativeSource =  ft_gtk.getFiles()
+BSD.glass.glassgtk2.compiler = compiler
+BSD.glass.glassgtk2.ccFlags = IS_STATIC_BUILD ?
+        ["-fno-threadsafe-statics", ccFlags, gtk2CCFlags].flatten() :
+        [ccFlags, gtk2CCFlags].flatten()
+BSD.glass.glassgtk2.linker = linker
+BSD.glass.glassgtk2.linkFlags = IS_STATIC_BUILD ? linkFlags : [linkFlags, gtk2LinkFlags].flatten()
+BSD.glass.glassgtk2.lib = "glassgtk2"
+
+BSD.glass.glassgtk3 = [:]
+BSD.glass.glassgtk3.nativeSource =  ft_gtk.getFiles()
+BSD.glass.glassgtk3.compiler = compiler
+BSD.glass.glassgtk3.ccFlags = IS_STATIC_BUILD ?
+        ["-fno-threadsafe-statics", ccFlags, gtk3CCFlags].flatten() :
+        [ccFlags, gtk3CCFlags].flatten()
+BSD.glass.glassgtk3.linker = linker
+BSD.glass.glassgtk3.linkFlags = IS_STATIC_BUILD ? linkFlags : [linkFlags, gtk3LinkFlags].flatten()
+BSD.glass.glassgtk3.lib = "glassgtk3"
+
+BSD.decora = [:]
+BSD.decora.compiler = compiler
+BSD.decora.ccFlags = [ccFlags, "-ffast-math"].flatten()
+BSD.decora.linker = linker
+BSD.decora.linkFlags = [linkFlags].flatten()
+BSD.decora.lib = "decora_sse"
+
+BSD.prism = [:]
+BSD.prism.nativeSource = file("${project(":graphics").projectDir}/src/main/native-prism")
+BSD.prism.compiler = compiler
+BSD.prism.ccFlags = [ccFlags, "-DINLINE=inline"].flatten()
+BSD.prism.linker = linker
+BSD.prism.linkFlags = [linkFlags].flatten()
+BSD.prism.lib = "prism_common"
+
+BSD.prismSW = [:]
+BSD.prismSW.nativeSource = file("${project(":graphics").projectDir}/src/main/native-prism-sw")
+BSD.prismSW.compiler = compiler
+BSD.prismSW.ccFlags = [ccFlags, "-DINLINE=inline"].flatten()
+BSD.prismSW.linker = linker
+BSD.prismSW.linkFlags = [linkFlags].flatten()
+BSD.prismSW.lib = "prism_sw"
+
+BSD.iio = [:]
+BSD.iio.nativeSource = [
+    file("${project("graphics").projectDir}/src/main/native-iio"),
+    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg")]
+BSD.iio.compiler = compiler
+BSD.iio.ccFlags = [ccFlags].flatten()
+BSD.iio.linker = linker
+BSD.iio.linkFlags = [linkFlags].flatten()
+BSD.iio.lib = "javafx_iio"
+
+BSD.prismES2 = [:]
+BSD.prismES2.nativeSource = [
+    file("${project("graphics").projectDir}/src/main/native-prism-es2"),
+    file("${project("graphics").projectDir}/src/main/native-prism-es2/GL"),
+    file("${project("graphics").projectDir}/src/main/native-prism-es2/x11")
+]
+BSD.prismES2.compiler = compiler
+BSD.prismES2.ccFlags = ["-DFREEBSD", ccFlags].flatten()
+BSD.prismES2.linker = linker
+BSD.prismES2.linkFlags =IS_STATIC_BUILD ? linkFlags : [linkFlags, "-lX11", "-lXxf86vm", "-lGL"].flatten()
+BSD.prismES2.lib = "prism_es2"
+
+def closedDir = file("$projectDir/../rt-closed")
+BSD.font = [:]
+BSD.font.compiler = compiler
+BSD.font.nativeSource = [file("${project("graphics").projectDir}/src/main/native-font")]
+BSD.font.ccFlags = ["-DJFXFONT_PLUS", ccFlags].flatten()
+BSD.font.linker = linker
+BSD.font.linkFlags = [linkFlags].flatten()
+BSD.font.lib = "javafx_font"
+
+BSD.fontFreetype = [:]
+BSD.fontFreetype.nativeSource = ["src/main/native-font/freetype.c"]
+BSD.fontFreetype.compiler = compiler
+BSD.fontFreetype.ccFlags = ["-DJFXFONT_PLUS", ccFlags, freetypeCCFlags].flatten()
+BSD.fontFreetype.linker = linker
+BSD.fontFreetype.linkFlags = IS_STATIC_BUILD ? linkFlags : [linkFlags, freetypeLinkFlags].flatten()
+BSD.fontFreetype.lib = "javafx_font_freetype"
+
+BSD.fontPango = [:]
+BSD.fontPango.nativeSource = ["src/main/native-font/pango.c"]
+BSD.fontPango.compiler = compiler
+BSD.fontPango.ccFlags = ["-DJFXFONT_PLUS", ccFlags, pangoCCFlags].flatten()
+BSD.fontPango.linker = linker
+BSD.fontPango.linkFlags =IS_STATIC_BUILD ? linkFlags : [linkFlags, pangoLinkFlags].flatten()
+BSD.fontPango.lib = "javafx_font_pango"
+
+BSD.media = [:]
+BSD.media.compiler = compiler
+BSD.media.linker = linker
+BSD.media.ar = "${toolchainDir}ar"
+
+BSD.webkit = [:]
+BSD.webkit.compiler = compiler
+BSD.webkit.linker = linker
+BSD.webkit.ccFlags = commonFlags.flatten()
+BSD.webkit.linkFlags = linkFlags.flatten()




--- modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java
@@ -69,6 +69,7 @@ public class PlatformUtil {
     private static final boolean WINDOWS_7_OR_LATER = WINDOWS && versionNumberGreaterThanOrEqualTo(6.1f);
     private static final boolean MAC = os.startsWith("Mac");
     private static final boolean LINUX = os.startsWith("Linux") && !ANDROID;
+    private static final boolean FREEBSD = os.startsWith("FreeBSD");
     private static final boolean SOLARIS = os.startsWith("SunOS");
     private static final boolean IOS = os.startsWith("iOS");
 
@@ -124,6 +125,13 @@ public class PlatformUtil {
         return LINUX;
     }
 
+    /**
+     * Returns true if the operating system is a form of FreeBSD.
+     */
+    public static boolean isFreeBSD(){
+        return FREEBSD;
+    }
+
     public static boolean useEGL() {
         return useEGL;
     }
@@ -150,10 +158,10 @@ public class PlatformUtil {
     }
 
     /**
-     * Returns true if the operating system is a form of Linux or Solaris
+     * Returns true if the operating system is a form of Unix
      */
     public static boolean isUnix(){
-        return LINUX || SOLARIS;
+        return LINUX || SOLARIS || FREEBSD;
     }
 
     /**




--- modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java
@@ -54,6 +54,7 @@ import javafx.scene.input.MouseEvent;
 import java.text.Bidi;
 import java.util.function.Predicate;
 
+import static com.sun.javafx.PlatformUtil.isFreeBSD;
 import static com.sun.javafx.PlatformUtil.isLinux;
 import static com.sun.javafx.PlatformUtil.isMac;
 import static com.sun.javafx.PlatformUtil.isWindows;
@@ -122,6 +123,7 @@ public abstract class TextInputControlBehavior<T exten
         final Predicate<KeyEvent> validWhenEditable = e -> !c.isEditable();
         final Predicate<KeyEvent> validOnWindows = e -> !PlatformUtil.isWindows();
         final Predicate<KeyEvent> validOnLinux = e -> !PlatformUtil.isLinux();
+        final Predicate<KeyEvent> validOnFreeBSD = e -> !PlatformUtil.isFreeBSD();
 
         KeyMapping cancelEditMapping;
         KeyMapping fireMapping;
@@ -550,7 +552,7 @@ public abstract class TextInputControlBehavior<T exten
 
     public void selectNextWord() {
         TextInputControl textInputControl = getNode();
-        if (isMac() || isLinux()) {
+        if (isMac() || isLinux() || isFreeBSD()) {
             textInputControl.selectEndOfNextWord();
         } else {
             textInputControl.selectNextWord();
@@ -599,7 +601,7 @@ public abstract class TextInputControlBehavior<T exten
 
     protected void nextWord() {
         TextInputControl textInputControl = getNode();
-        if (isMac() || isLinux()) {
+        if (isMac() || isLinux() || isFreeBSD()) {
             textInputControl.endOfNextWord();
         } else {
             textInputControl.nextWord();




--- modules/javafx.graphics/src/main/java/com/sun/glass/ui/Platform.java.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.graphics/src/main/java/com/sun/glass/ui/Platform.java
@@ -52,6 +52,8 @@ final class Platform {
                    type = WINDOWS;
                 else if (userPlatform.equals("linux"))
                    type = GTK;
+                else if (userPlatform.equals("freebsd"))
+                    type = GTK;
                 else if (userPlatform.equals("gtk"))
                    type = GTK;
                 else if (userPlatform.equals("ios"))
@@ -68,6 +70,8 @@ final class Platform {
             } else if (osNameLowerCase.startsWith("wind")) {
                 type = WINDOWS;
             } else if (osNameLowerCase.startsWith("linux")) {
+                type = GTK;
+            } else if (osNameLowerCase.startsWith("freebsd")) {
                 type = GTK;
             } else if (osNameLowerCase.startsWith("ios")) {
                 type = IOS;




--- modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java
@@ -358,7 +358,7 @@ public class NativeLibLoader {
                     relativeDir = "../bin";
                 } else if (osName.startsWith("Mac")) {
                     relativeDir = ".";
-                } else if (osName.startsWith("Linux")) {
+                } else if (osName.startsWith("Linux") || osName.startsWith("FreeBSD")) {
                     relativeDir = ".";
                 }
 
@@ -374,7 +374,7 @@ public class NativeLibLoader {
                 } else if (osName.startsWith("Mac")) {
                     libPrefix = "lib";
                     libSuffix = ".dylib";
-                } else if (osName.startsWith("Linux")) {
+                } else if (osName.startsWith("Linux") || osName.startsWith("FreeBSD")) {
                     libPrefix = "lib";
                     libSuffix = ".so";
                 }

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.graphics_src_main_java_com_sun_javafx_font_LogicalFont.java (+11 lines)
	1	--- modules/javafx.graphics/src/main/java/com/sun/javafx/font/LogicalFont.java.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.graphics/src/main/java/com/sun/javafx/font/LogicalFont.java
	3	@@ -175,7 +175,7 @@ public class LogicalFont implements CompositeFontResou
	4	styleName = STYLE_BOLD_ITALIC;
	5	}
	6	fullName = familyName + " " + styleName;
	7	- if (PrismFontFactory.isLinux) {
	8	+ if (PrismFontFactory.isLinux \|\| PrismFontFactory.isFreeBSD) {
	9	FontConfigManager.FcCompFont fcCompFont =
	10	FontConfigManager.getFontConfigFont(family, bold, italic);
	11	physicalFullName = fcCompFont.firstFont.fullName;




--- modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java
@@ -51,6 +51,7 @@ public abstract class PrismFontFactory implements Font
     public static final boolean debugFonts;
     public static final boolean isWindows;
     public static final boolean isLinux;
+    public static final boolean isFreeBSD;
     public static final boolean isMacOSX;
     public static final boolean isIOS;
     public static final boolean isAndroid;
@@ -88,6 +89,7 @@ public abstract class PrismFontFactory implements Font
         isWindows = PlatformUtil.isWindows();
         isMacOSX  = PlatformUtil.isMac();
         isLinux   = PlatformUtil.isLinux();
+        isFreeBSD = PlatformUtil.isFreeBSD();
         isIOS     = PlatformUtil.isIOS();
         isAndroid = PlatformUtil.isAndroid();
         isEmbedded = PlatformUtil.isEmbedded();
@@ -164,7 +166,7 @@ public abstract class PrismFontFactory implements Font
     private static String getNativeFactoryName() {
         if (isWindows) return DW_FACTORY;
         if (isMacOSX || isIOS) return CT_FACTORY;
-        if (isLinux || isAndroid) return FT_FACTORY;
+        if (isLinux || isAndroid || isFreeBSD) return FT_FACTORY;
         return null;
     }
 
@@ -851,7 +853,7 @@ public abstract class PrismFontFactory implements Font
                         break;
                     }
                 }
-                if (fontResource == null && isLinux) {
+                if (fontResource == null && (isLinux || isFreeBSD)) {
                     String path = FontConfigManager.getDefaultFontPath();
                     if (path != null) {
                         fontResource = createFontResource(jreDefaultFontLC,
@@ -1770,7 +1772,7 @@ public abstract class PrismFontFactory implements Font
                                                       familyToFontListMap,
                                                       Locale.ENGLISH);
 
-            } else if (isLinux) {
+            } else if (isLinux || isFreeBSD) {
                 FontConfigManager.populateMaps(tmpFontToFileMap,
                                                fontToFamilyNameMap,
                                                familyToFontListMap,

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.graphics_src_main_java_com_sun_javafx_tk_Toolkit.java (+11 lines)
	1	--- modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.graphics/src/main/java/com/sun/javafx/tk/Toolkit.java
	3	@@ -186,6 +186,8 @@ public abstract class Toolkit {
	4	return DEFAULT_TOOLKIT;
	5	} else if (PlatformUtil.isLinux()) {
	6	return DEFAULT_TOOLKIT;
	7	+ } else if (PlatformUtil.isFreeBSD()) {
	8	+ return DEFAULT_TOOLKIT;
	9	} else if (PlatformUtil.isIOS()) {
	10	return DEFAULT_TOOLKIT;
	11	} else if (PlatformUtil.isAndroid()) {




--- modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java
@@ -313,13 +313,13 @@ class GlassSystemMenu implements TKSystemMenu {
         } else if (accelerator instanceof KeyCodeCombination) {
             KeyCodeCombination kcc  = (KeyCodeCombination)accelerator;
             KeyCode            code = kcc.getCode();
-            assert PlatformUtil.isMac() || PlatformUtil.isLinux();
+            assert PlatformUtil.isMac() || PlatformUtil.isLinux() || PlatformUtil.isFreeBSD();
             int modifier = glassModifiers(kcc);
             if (PlatformUtil.isMac()) {
                 int finalCode = code.isLetterKey() ? code.getChar().toUpperCase().charAt(0)
                         : code.getCode();
                 glassSubMenuItem.setShortcut(finalCode, modifier);
-            } else if (PlatformUtil.isLinux()) {
+            } else if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) {
                 String lower = code.getChar().toLowerCase();
                 if ((modifier & KeyEvent.MODIFIER_CONTROL) != 0) {
                     glassSubMenuItem.setShortcut(lower.charAt(0), modifier);
@@ -348,14 +348,14 @@ class GlassSystemMenu implements TKSystemMenu {
             ret += KeyEvent.MODIFIER_ALT;
         }
         if (kcc.getShortcut() == KeyCombination.ModifierValue.DOWN) {
-            if (PlatformUtil.isLinux()) {
+            if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) {
                 ret += KeyEvent.MODIFIER_CONTROL;
             } else if (PlatformUtil.isMac()) {
                 ret += KeyEvent.MODIFIER_COMMAND;
             }
         }
         if (kcc.getMeta() == KeyCombination.ModifierValue.DOWN) {
-            if (PlatformUtil.isLinux()) {
+            if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) {
                 ret += KeyEvent.MODIFIER_WINDOWS;   // RT-19326 - Linux shortcut support
             } else if (PlatformUtil.isMac()) {
                 ret += KeyEvent.MODIFIER_COMMAND;

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.graphics_src_main_java_com_sun_javafx_tk_quantum_WindowStage.java (+11 lines)
	1	--- modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java
	3	@@ -460,7 +460,7 @@ class WindowStage extends GlassStage {
	4	} else if (PlatformUtil.isWindows()) { //Windows Sized Icons
	5	SMALL_ICON_HEIGHT = 32;
	6	SMALL_ICON_WIDTH = 32;
	7	- } else if (PlatformUtil.isLinux()) { //Linux icons
	8	+ } else if (PlatformUtil.isLinux() \|\| PlatformUtil.isFreeBSD()) { //Linux icons
	9	SMALL_ICON_HEIGHT = 128;
	10	SMALL_ICON_WIDTH = 128;
	11	}




--- modules/javafx.graphics/src/main/java/com/sun/prism/impl/PrismSettings.java.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.graphics/src/main/java/com/sun/prism/impl/PrismSettings.java
@@ -221,6 +221,8 @@ public final class PrismSettings {
                     tryOrderArr = new String[] { "es2" };
             } else if (PlatformUtil.isLinux()) {
                 tryOrderArr = new String[] { "es2", "sw" };
+            } else if (PlatformUtil.isFreeBSD()) {
+                tryOrderArr = new String[] { "es2", "sw" };
             } else {
                 tryOrderArr = new String[] { "sw" };
             }
@@ -234,7 +236,7 @@ public final class PrismSettings {
             for (String s : split(rOrder.toLowerCase(), ",")) {
                 switch (s) {
                     case "pisces":
-                        rSpec = PlatformUtil.isEmbedded() || !PlatformUtil.isLinux()
+                        rSpec = PlatformUtil.isEmbedded() || !PlatformUtil.isLinux() || !PlatformUtil.isFreeBSD()
                                 ? RasterizerType.NativePisces
                                 : RasterizerType.JavaPisces;
                         break;
@@ -269,7 +271,7 @@ public final class PrismSettings {
                 boolean doNativePisces;
                 String npprop = systemProperties.getProperty("prism.nativepisces");
                 if (npprop == null) {
-                    doNativePisces = PlatformUtil.isEmbedded() || !PlatformUtil.isLinux();
+                    doNativePisces = PlatformUtil.isEmbedded() || !PlatformUtil.isLinux() || !PlatformUtil.isFreeBSD();
                 } else {
                     doNativePisces = Boolean.parseBoolean(npprop);
                 }

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.graphics_src_main_native-font_fontpath__linux.c (+11 lines)
	1	--- modules/javafx.graphics/src/main/native-font/fontpath_linux.c.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.graphics/src/main/native-font/fontpath_linux.c
	3	@@ -23,7 +23,7 @@
	4	* questions.
	5	*/
	6
	7	-#if defined (__linux__) && ! defined (ANDROID_NDK)
	8	+#if (defined (__linux__) && ! defined (ANDROID_NDK)) \|\| defined(__FreeBSD__)
	9
	10	#include <string.h>
	11	#include <stdio.h>




--- modules/javafx.graphics/src/main/native-font/freetype.c.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.graphics/src/main/native-font/freetype.c
@@ -23,7 +23,6 @@
  * questions.
  */
 
-#if defined __linux__ || ANDROID_NDK
 #if defined _ENABLE_PANGO || _ENABLE_HARFBUZZ
 
 #include <jni.h>
@@ -650,4 +649,3 @@ JNIEXPORT jboolean JNICALL JNICALL OS_NATIVE(isHarfbuz
 }
 
 #endif /* ENABLE_PANGO || ENABLE_HARFBUZZ */
-#endif /* __linux__ || ANDROID_NDK */




--- modules/javafx.graphics/src/main/native-font/pango.c.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.graphics/src/main/native-font/pango.c
@@ -23,7 +23,6 @@
  * questions.
  */
 
-#if defined __linux__
 #if defined _ENABLE_PANGO
 
 #include <jni.h>
@@ -432,4 +431,3 @@ JNIEXPORT void JNICALL OS_NATIVE(pango_1font_1descript
 }
 
 #endif /* ENABLE_PANGO */
-#endif /* __linux__ */

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.graphics_src_main_native-glass_gtk_GlassApplication.cpp (+10 lines)
	1	--- modules/javafx.graphics/src/main/native-glass/gtk/GlassApplication.cpp.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.graphics/src/main/native-glass/gtk/GlassApplication.cpp
	3	@@ -111,6 +111,7 @@ JNIEXPORT jint JNICALL Java_com_sun_glass_ui_gtk_GtkAp
	4
	5	gdk_threads_enter();
	6	gtk_init(NULL, NULL);
	7	+ gdk_threads_leave();
	8
	9	return JNI_TRUE;
	10	}

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.graphics_src_main_native-glass_gtk_glass__evloop.cpp (+11 lines)
	1	--- modules/javafx.graphics/src/main/native-glass/gtk/glass_evloop.cpp.orig 2020-07-24 17:23:31 UTC
	2	+++ modules/javafx.graphics/src/main/native-glass/gtk/glass_evloop.cpp
	3	@@ -25,7 +25,7 @@
	4	#include "glass_evloop.h"
	5
	6	#include <glib.h>
	7	-#include <malloc.h>
	8	+#include <stdlib.h>
	9
	10	static GSList * evloopHookList;
	11




--- modules/javafx.graphics/src/main/native-glass/gtk/glass_window.h.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.graphics/src/main/native-glass/gtk/glass_window.h
@@ -366,7 +366,7 @@ class WindowContextTop: public WindowContextBase {
     jlong screen;
     WindowFrameType frame_type;
     WindowType window_type;
-    struct WindowContext *owner;
+    WindowContext *owner;
     WindowGeometry geometry;
     struct _Resizable{// we can't use set/get gtk_window_resizable function
         _Resizable(): request(REQUEST_NONE), value(true), prev(false),
@@ -472,4 +472,3 @@ class EventsCounterHelper { (public)
 };
 
 #endif        /* GLASS_WINDOW_H */
-

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.graphics_src_main_native-glass_gtk_launcher.c (+10 lines)
	1	--- modules/javafx.graphics/src/main/native-glass/gtk/launcher.c.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.graphics/src/main/native-glass/gtk/launcher.c
	3	@@ -25,7 +25,6 @@
	4
	5	#include <stdio.h>
	6	#include <stdlib.h>
	7	-#include <linux/fb.h>
	8	#include <fcntl.h>
	9	#ifndef __USE_GNU // required for dladdr() & Dl_info
	10	#define __USE_GNU

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.graphics_src_main_native-glass_gtk_wrapped.c (+10 lines)
	1	--- modules/javafx.graphics/src/main/native-glass/gtk/wrapped.c.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.graphics/src/main/native-glass/gtk/wrapped.c
	3	@@ -24,7 +24,6 @@
	4	*/
	5
	6	#include <stdio.h>
	7	-#include <linux/fb.h>
	8	#include <fcntl.h>
	9	#ifndef __USE_GNU // required for dladdr() & Dl_info
	10	#define __USE_GNU

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.graphics_src_main_native-prism-es2_PrismES2Defs.h (+11 lines)
	1	--- modules/javafx.graphics/src/main/native-prism-es2/PrismES2Defs.h.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.graphics/src/main/native-prism-es2/PrismES2Defs.h
	3	@@ -26,7 +26,7 @@
	4	#ifndef _Prism_es2_defs_h_
	5	#define _Prism_es2_defs_h_
	6
	7	-#if defined(SOLARIS) \|\| defined(LINUX) \|\| defined(ANDROID_NDK) /* SOLARIS \|\| LINUX */
	8	+#if defined(SOLARIS) \|\| defined(LINUX) \|\| defined(ANDROID_NDK) \|\| defined(FREEBSD) /* SOLARIS \|\| LINUX */
	9	#define GLX_GLEXT_PROTOTYPES
	10	#define GLX_GLXEXT_PROTOTYPES
	11	#define UNIX




--- modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java
@@ -66,6 +66,10 @@ public class HostUtils {
         return osName.startsWith("linux");
     }
 
+    public static boolean isFreeBSD() {
+        return osName.startsWith("freebsd");
+    }
+
     public static boolean isIOS() {
         return osName.startsWith("ios");
     }

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.media_src_main_java_com_sun_media_jfxmediaimpl_NativeMediaManager.java (+11 lines)
	1	--- modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
	3	@@ -110,7 +110,7 @@ public class NativeMediaManager {
	4	NativeLibLoader.loadLibrary("glib-lite");
	5	}
	6
	7	- if (!HostUtils.isLinux() && !HostUtils.isIOS()) {
	8	+ if (!HostUtils.isFreeBSD() && !HostUtils.isLinux() && !HostUtils.isIOS()) {
	9	NativeLibLoader.loadLibrary("gstreamer-lite");
	10	} else {
	11	dependencies.add("gstreamer-lite");

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.media_src_main_native_gstreamer_projects_build_linux_common_config.h (+11 lines)
	1	--- modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h
	3	@@ -376,7 +376,7 @@
	4	#define HAVE_SYS_POLL_H 1
	5
	6	/* Define to 1 if you have the <sys/prctl.h> header file. */
	7	-#define HAVE_SYS_PRCTL_H 1
	8	+#undef HAVE_SYS_PRCTL_H
	9
	10	/* Define to 1 if you have the <sys/resource.h> header file. */
	11	#undef HAVE_SYS_RESOURCE_H

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.media_src_main_native_jfxmedia_platform_gstreamer_GstPipelineFactory.cpp (+11 lines)
	1	--- modules/javafx.media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp
	3	@@ -338,6 +338,8 @@ GstElement* CGstPipelineFactory::CreateAudioSinkElemen
	4	return CreateElement("directsoundsink");
	5	#elif TARGET_OS_MAC
	6	return CreateElement("osxaudiosink");
	7	+#elif TARGET_OS_BSD
	8	+ return CreateElement("bsdaudiosink");
	9	#elif TARGET_OS_LINUX
	10	return CreateElement("alsasink");
	11	#else




--- modules/javafx.media/src/main/native/jfxmedia/projects/bsd/Makefile.orig	2020-07-19 18:30:00 UTC
+++ modules/javafx.media/src/main/native/jfxmedia/projects/bsd/Makefile
@@ -1,5 +1,5 @@
 #
-# Linux/ARM jfxmedia makefile
+# BSD jfxmedia makefile
 #
 
 BUILD_DIR = $(OUTPUT_DIR)/$(BUILD_TYPE)
@@ -18,6 +18,7 @@ DIRLIST = jni                \
 TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
 
 CFLAGS = -DTARGET_OS_LINUX=1     \
+         -DTARGET_OS_BSD=1       \
          -D_GNU_SOURCE           \
          -DGST_REMOVE_DEPRECATED \
          -DGST_DISABLE_GST_DEBUG \
@@ -26,6 +27,7 @@ CFLAGS = -DTARGET_OS_LINUX=1     \
          -DHAVE_CONFIG_H         \
          -DJFXMEDIA_JNI_EXPORTS  \
          -DLINUX                 \
+         -DG_DISABLE_DEPRECATED  \
          -ffunction-sections -fdata-sections
 
 CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
@@ -42,7 +44,6 @@ ifdef HOST_COMPILE
                   -Wformat-security \
                   -fstack-protector \
                   -Werror=implicit-function-declaration \
-                  -Werror=trampolines \
 		  -msse2 \
 	          -DGSTREAMER_LITE
 
@@ -51,7 +52,7 @@ ifdef HOST_COMPILE
 
 	INCLUDES = $(BASE_INCLUDES) \
 		   -I$(JAVA_HOME)/include \
-		   -I$(JAVA_HOME)/include/linux \
+		   -I$(JAVA_HOME)/include/freebsd \
 	           -I$(GSTREAMER_LITE_DIR)/gstreamer \
 		   -I$(GSTREAMER_LITE_DIR)/gst-plugins-base/gst-libs \
 	           -I$(GSTREAMER_LITE_DIR)/gstreamer/libs \




--- modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java
@@ -1043,7 +1043,7 @@ public class JFXPanel extends JComponent {
         public boolean grabFocus() {
             // On X11 grab is limited to a single XDisplay connection,
             // so we can't delegate it to another GUI toolkit.
-            if (PlatformUtil.isLinux()) return true;
+            if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) return true;
 
             invokeOnClientEDT(() -> {
                 Window window = SwingUtilities.getWindowAncestor(JFXPanel.this);
@@ -1059,7 +1059,7 @@ public class JFXPanel extends JComponent {
         public void ungrabFocus() {
             // On X11 grab is limited to a single XDisplay connection,
             // so we can't delegate it to another GUI toolkit.
-            if (PlatformUtil.isLinux()) return;
+            if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) return;
 
             invokeOnClientEDT(() -> {
                 Window window = SwingUtilities.getWindowAncestor(JFXPanel.this);

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.swing_src_main_java_javafx_embed_swing_SwingNode.java (+11 lines)
	1	--- modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.swing/src/main/java/javafx/embed/swing/SwingNode.java
	3	@@ -807,7 +807,7 @@ public class SwingNode extends Node {
	4	private void ungrabFocus(boolean postUngrabEvent) {
	5	// On X11 grab is limited to a single XDisplay connection,
	6	// so we can't delegate it to another GUI toolkit.
	7	- if (PlatformUtil.isLinux()) return;
	8	+ if (PlatformUtil.isLinux() \|\| PlatformUtil.isFreeBSD()) return;
	9
	10	if (grabbed &&
	11	getScene() != null &&

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_PlatformJava.cmake (+8 lines)
	1	--- modules/javafx.web/src/main/native/Source/PlatformJava.cmake.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.web/src/main/native/Source/PlatformJava.cmake
	3	@@ -1,4 +1 @@
	4	-add_subdirectory(ThirdParty/sqlite)
	5	-add_subdirectory(ThirdParty/icu)
	6	-add_subdirectory(ThirdParty/libxml)
	7	-add_subdirectory(ThirdParty/libxslt)
	8	+

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_WTF_wtf_MemoryPressureHandler.cpp (+11 lines)
	1	--- modules/javafx.web/src/main/native/Source/WTF/wtf/MemoryPressureHandler.cpp.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.web/src/main/native/Source/WTF/wtf/MemoryPressureHandler.cpp
	3	@@ -49,7 +49,7 @@ MemoryPressureHandler& MemoryPressureHandler::singleto
	4	}
	5
	6	MemoryPressureHandler::MemoryPressureHandler()
	7	-#if OS(LINUX)
	8	+#if OS(LINUX) \|\| OS(FREEBSD)
	9	: m_holdOffTimer(RunLoop::main(), this, &MemoryPressureHandler::holdOffTimerFired)
	10	#elif OS(WINDOWS)
	11	: m_windowsMeasurementTimer(RunLoop::main(), this, &MemoryPressureHandler::windowsMeasurementTimerFired)




--- modules/javafx.web/src/main/native/Source/WTF/wtf/MemoryPressureHandler.h.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.web/src/main/native/Source/WTF/wtf/MemoryPressureHandler.h
@@ -66,7 +66,7 @@ class MemoryPressureHandler { (public)
 
     WTF_EXPORT_PRIVATE void setShouldUsePeriodicMemoryMonitor(bool);
 
-#if OS(LINUX)
+#if OS(LINUX) || OS(FREEBSD)
     WTF_EXPORT_PRIVATE void triggerMemoryPressureEvent(bool isCritical);
 #endif
 
@@ -200,7 +200,7 @@ class MemoryPressureHandler { (public)
     Win32Handle m_lowMemoryHandle;
 #endif
 
-#if OS(LINUX)
+#if OS(LINUX) || OS(FREEBSD)
     RunLoop::Timer<MemoryPressureHandler> m_holdOffTimer;
     void holdOffTimerFired();
 #endif




--- modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformJava.cmake.orig	2020-07-24 19:01:56 UTC
+++ modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformJava.cmake
@@ -83,9 +83,8 @@ elseif (UNIX)
     list(APPEND WTF_SOURCES
         generic/RunLoopGeneric.cpp
         generic/WorkQueueGeneric.cpp
-        linux/CurrentProcessMemoryStatus.cpp
-        linux/MemoryFootprintLinux.cpp
-        linux/MemoryPressureHandlerLinux.cpp
+        generic/MemoryFootprintGeneric.cpp
+        unix/MemoryPressureHandlerUnix.cpp
         unix/CPUTimeUnix.cpp
         unix/LanguageUnix.cpp
     )




--- modules/javafx.web/src/main/native/Source/WTF/wtf/generic/MemoryFootprintGeneric.cpp.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.web/src/main/native/Source/WTF/wtf/generic/MemoryFootprintGeneric.cpp
@@ -25,8 +25,9 @@
 
 #include "config.h"
 #include <wtf/MemoryFootprint.h>
+#include <wtf/Platform.h>
 
-#if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC) && OS(LINUX)
+#if !USE(SYSTEM_MALLOC) && (OS(LINUX) || OS(FREEBSD))
 #include <bmalloc/bmalloc.h>
 #endif
 
@@ -34,7 +35,7 @@ namespace WTF {
 
 size_t memoryFootprint()
 {
-#if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC) && OS(LINUX)
+#if !USE(SYSTEM_MALLOC) && (OS(LINUX) || OS(FREEBSD))
     return bmalloc::api::memoryFootprint();
 #else
     return 0;




--- modules/javafx.web/src/main/native/Source/WTF/wtf/linux/MemoryPressureHandlerLinux.cpp.orig	2020-07-17 12:21:33 UTC
+++ modules/javafx.web/src/main/native/Source/WTF/wtf/linux/MemoryPressureHandlerLinux.cpp
@@ -28,13 +28,20 @@
 #include "config.h"
 #include <wtf/MemoryPressureHandler.h>
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <wtf/MainThread.h>
 #include <wtf/MemoryFootprint.h>
-#include <wtf/linux/CurrentProcessMemoryStatus.h>
 #include <wtf/text/WTFString.h>
 
+#if OS(LINUX)
+#include <wtf/linux/CurrentProcessMemoryStatus.h>
+#elif OS(FREEBSD)
+#include <sys/sysctl.h>
+#include <sys/types.h>
+#include <sys/user.h>
+#endif
+
 #define LOG_CHANNEL_PREFIX Log
 
 namespace WTF {
@@ -105,9 +112,28 @@ void MemoryPressureHandler::holdOff(Seconds seconds)
 
 static size_t processMemoryUsage()
 {
+#if OS(LINUX)
     ProcessMemoryStatus memoryStatus;
     currentProcessMemoryStatus(memoryStatus);
     return (memoryStatus.resident - memoryStatus.shared);
+#elif OS(FREEBSD)
+    static size_t pageSize = sysconf(_SC_PAGE_SIZE);
+    struct kinfo_proc info;
+    size_t infolen = sizeof(info);
+
+    int mib[4];
+    mib[0] = CTL_KERN;
+    mib[1] = KERN_PROC;
+    mib[2] = KERN_PROC_PID;
+    mib[3] = getpid();
+
+    if (sysctl(mib, 4, &info, &infolen, nullptr, 0))
+        return 0;
+
+    return static_cast<size_t>(info.ki_rssize - info.ki_tsize) * pageSize;
+#else
+#error "Missing a platform specific way of determining the memory usage"
+#endif
 }
 
 void MemoryPressureHandler::respondToMemoryPressure(Critical critical, Synchronous synchronous)




--- modules/javafx.web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
@@ -37,21 +37,6 @@
 
 #define CharProp(p) com_sun_webkit_dom_CharacterDataImpl_##p
 
-#if PLATFORM(JAVA) && OS(WINDOWS)
-typedef wchar_t UChar;
-#else
-typedef uint16_t UChar;
-#endif
-
-// #ifdef UChar32
-// #undef UChar32
-// #endif
-
-#ifndef __UMACHINE_H__ //XXX: recheck
-typedef uint32_t UChar32;
-#endif
-
-#define U_MASK(x) ((uint32_t)1<<(x))
 #define USE_FAST_PATH(c, fast, slow) ((c) <= 0x7F ? fast((char)c) : slow(c))
 
 #define CHECK_PROPERTY(c, mask, isSet) \




--- modules/javafx.web/src/main/native/Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp.orig	2020-07-19 18:56:35 UTC
+++ modules/javafx.web/src/main/native/Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2011, 2012 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2014 Raspberry Pi Foundation. All Rights Reserved.
+ * Copyright (C) 2018 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include <wtf/MemoryPressureHandler.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <wtf/MainThread.h>
+#include <wtf/MemoryFootprint.h>
+#include <wtf/text/WTFString.h>
+
+#if OS(LINUX)
+#include <wtf/linux/CurrentProcessMemoryStatus.h>
+#elif OS(FREEBSD)
+#include <sys/sysctl.h>
+#include <sys/types.h>
+#include <sys/user.h>
+#endif
+
+#define LOG_CHANNEL_PREFIX Log
+
+namespace WTF {
+
+// Disable memory event reception for a minimum of s_minimumHoldOffTime
+// seconds after receiving an event. Don't let events fire any sooner than
+// s_holdOffMultiplier times the last cleanup processing time. Effectively
+// this is 1 / s_holdOffMultiplier percent of the time.
+// If after releasing the memory we don't free at least s_minimumBytesFreedToUseMinimumHoldOffTime,
+// we wait longer to try again (s_maximumHoldOffTime).
+// These value seems reasonable and testing verifies that it throttles frequent
+// low memory events, greatly reducing CPU usage.
+static const Seconds s_minimumHoldOffTime { 5_s };
+static const Seconds s_maximumHoldOffTime { 30_s };
+static const size_t s_minimumBytesFreedToUseMinimumHoldOffTime = 1 * MB;
+static const unsigned s_holdOffMultiplier = 20;
+
+void MemoryPressureHandler::triggerMemoryPressureEvent(bool isCritical)
+{
+    if (!m_installed)
+        return;
+
+    if (ReliefLogger::loggingEnabled())
+        LOG(MemoryPressure, "Got memory pressure notification (%s)", isCritical ? "critical" : "non-critical");
+
+    setUnderMemoryPressure(true);
+
+    if (isMainThread())
+        respondToMemoryPressure(isCritical ? Critical::Yes : Critical::No);
+    else
+        RunLoop::main().dispatch([this, isCritical] {
+            respondToMemoryPressure(isCritical ? Critical::Yes : Critical::No);
+        });
+
+    if (ReliefLogger::loggingEnabled() && isUnderMemoryPressure())
+        LOG(MemoryPressure, "System is no longer under memory pressure.");
+
+    setUnderMemoryPressure(false);
+}
+
+void MemoryPressureHandler::install()
+{
+    if (m_installed || m_holdOffTimer.isActive())
+        return;
+
+    m_installed = true;
+}
+
+void MemoryPressureHandler::uninstall()
+{
+    if (!m_installed)
+        return;
+
+    m_holdOffTimer.stop();
+
+    m_installed = false;
+}
+
+void MemoryPressureHandler::holdOffTimerFired()
+{
+    install();
+}
+
+void MemoryPressureHandler::holdOff(Seconds seconds)
+{
+    m_holdOffTimer.startOneShot(seconds);
+}
+
+static size_t processMemoryUsage()
+{
+#if OS(LINUX)
+    ProcessMemoryStatus memoryStatus;
+    currentProcessMemoryStatus(memoryStatus);
+    return (memoryStatus.resident - memoryStatus.shared);
+#elif OS(FREEBSD)
+    static size_t pageSize = sysconf(_SC_PAGE_SIZE);
+    struct kinfo_proc info;
+    size_t infolen = sizeof(info);
+
+    int mib[4];
+    mib[0] = CTL_KERN;
+    mib[1] = KERN_PROC;
+    mib[2] = KERN_PROC_PID;
+    mib[3] = getpid();
+
+    if (sysctl(mib, 4, &info, &infolen, nullptr, 0))
+        return 0;
+
+    return static_cast<size_t>(info.ki_rssize - info.ki_tsize) * pageSize;
+#else
+#error "Missing a platform specific way of determining the memory usage"
+#endif
+}
+
+void MemoryPressureHandler::respondToMemoryPressure(Critical critical, Synchronous synchronous)
+{
+    uninstall();
+
+    MonotonicTime startTime = MonotonicTime::now();
+    int64_t processMemory = processMemoryUsage();
+    releaseMemory(critical, synchronous);
+    int64_t bytesFreed = processMemory - processMemoryUsage();
+    Seconds holdOffTime = s_maximumHoldOffTime;
+    if (bytesFreed > 0 && static_cast<size_t>(bytesFreed) >= s_minimumBytesFreedToUseMinimumHoldOffTime)
+        holdOffTime = (MonotonicTime::now() - startTime) * s_holdOffMultiplier;
+    holdOff(std::max(holdOffTime, s_minimumHoldOffTime));
+}
+
+void MemoryPressureHandler::platformReleaseMemory(Critical)
+{
+#if HAVE(MALLOC_TRIM)
+    malloc_trim(0);
+#endif
+}
+
+Optional<MemoryPressureHandler::ReliefLogger::MemoryUsage> MemoryPressureHandler::ReliefLogger::platformMemoryUsage()
+{
+    return MemoryUsage {processMemoryUsage(), memoryFootprint()};
+}
+
+} // namespace WTF




--- modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/AvailableMemory.cpp.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/AvailableMemory.cpp
@@ -47,6 +47,11 @@
 #if BOS(LINUX)
 #include <algorithm>
 #include <fcntl.h>
+#elif BOS(FREEBSD)
+#include "VMAllocate.h"
+#include <sys/sysctl.h>
+#include <sys/types.h>
+#include <sys/user.h>
 #endif
 #include <unistd.h>
 #endif
@@ -184,7 +189,7 @@ size_t availableMemory()
     return availableMemory;
 }
 
-#if BPLATFORM(IOS_FAMILY) || BOS(LINUX)
+#if BPLATFORM(IOS_FAMILY) || BOS(LINUX) || BOS(FREEBSD)
 MemoryStatus memoryStatus()
 {
 #if BPLATFORM(IOS_FAMILY)
@@ -200,6 +205,21 @@ MemoryStatus memoryStatus()
     auto& memory = LinuxMemory::singleton();
     size_t memoryFootprint = memory.footprint();
     double percentInUse = static_cast<double>(memoryFootprint) / static_cast<double>(memory.availableMemory);
+#elif BOS(FREEBSD)
+    struct kinfo_proc info;
+    size_t infolen = sizeof(info);
+
+    int mib[4];
+    mib[0] = CTL_KERN;
+    mib[1] = KERN_PROC;
+    mib[2] = KERN_PROC_PID;
+    mib[3] = getpid();
+
+    size_t memoryFootprint = 0;
+    if (!sysctl(mib, 4, &info, &infolen, nullptr, 0))
+        memoryFootprint = static_cast<size_t>(info.ki_rssize) * vmPageSize();
+
+    double percentInUse = static_cast<double>(memoryFootprint) / static_cast<double>(availableMemory());
 #endif
 
     double percentAvailableMemoryInUse = std::min(percentInUse, 1.0);




--- modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/AvailableMemory.h.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/AvailableMemory.h
@@ -32,7 +32,7 @@ namespace bmalloc {
 
 size_t availableMemory();
 
-#if BPLATFORM(IOS_FAMILY) || BOS(LINUX)
+#if BPLATFORM(IOS_FAMILY) || BOS(LINUX) || BOS(FREEBSD)
 struct MemoryStatus {
     MemoryStatus(size_t memoryFootprint, double percentAvailableMemoryInUse)
         : memoryFootprint(memoryFootprint)
@@ -61,7 +61,7 @@ inline double percentAvailableMemoryInUse()
 
 inline bool isUnderMemoryPressure()
 {
-#if BPLATFORM(IOS_FAMILY) || BOS(LINUX)
+#if BPLATFORM(IOS_FAMILY) || BOS(LINUX) || BOS(FREEBSD)
     return percentAvailableMemoryInUse() > memoryPressureThreshold;
 #else
     return false;

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.web_src_main_native_Source_bmalloc_bmalloc_bmalloc.h (+11 lines)
	1	--- modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/bmalloc.h.orig 2020-07-24 18:56:22 UTC
	2	+++ modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/bmalloc.h
	3	@@ -111,7 +111,7 @@ inline size_t availableMemory()
	4	return bmalloc::availableMemory();
	5	}
	6
	7	-#if BPLATFORM(IOS_FAMILY) \|\| BOS(LINUX)
	8	+#if BPLATFORM(IOS_FAMILY) \|\| BOS(LINUX) \|\| BOS(FREEBSD)
	9	inline size_t memoryFootprint()
	10	{
	11	return bmalloc::memoryFootprint();




--- modules/javafx.web/src/main/native/Source/cmake/OptionsJava.cmake.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.web/src/main/native/Source/cmake/OptionsJava.cmake
@@ -31,14 +31,10 @@ endif ()
 set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
 set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
 
-set(SQLITE_LIBRARIES SqliteJava)
-set(LIBXML2_LIBRARIES XMLJava)
-set(LIBXSLT_LIBRARIES XSLTJava)
-
-set(ICU_LIBRARIES icuuc icudata)
-set(ICU_I18N_LIBRARIES icui18n icuuc icudata)
-set(ICU_DATA_LIBRARIES icudata)
-
+find_package(LibXml2 2.8.0 REQUIRED)
+find_package(LibXslt REQUIRED)
+find_package(Sqlite REQUIRED)
+find_package(ICU REQUIRED)
 find_package(JNI REQUIRED)
 find_package(Threads REQUIRED)
 




--- modules/javafx.web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
@@ -231,10 +231,6 @@ if (NOT MSVC)
     string(REGEX MATCHALL "-fsanitize=[^ ]*" ENABLED_COMPILER_SANITIZERS ${CMAKE_CXX_FLAGS})
 endif ()
 
-if (UNIX AND NOT APPLE AND NOT ENABLED_COMPILER_SANITIZERS)
-    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
-endif ()
-
 
 # CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0.  Since this
 # version, -P does not output empty lines, which currently breaks make_names.pl in




https://github.com/WebKit/webkit/commit/35a79bf4c2e0ecb4a37e672de347a25254ea0601

* DumpRenderTree/TestRunner.cpp:
(TestRunner::runUIScript):
Manually convert between UChar and UniChar/unichar where needed.


--- modules/javafx.web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp.orig	2020-07-19 19:13:03 UTC
+++ modules/javafx.web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp
@@ -2463,7 +2463,7 @@ void TestRunner::runUIScript(JSContextRef context, JSS
     if (!m_UIScriptContext)
         m_UIScriptContext = makeUniqueWithoutFastMallocCheck<WTR::UIScriptContext>(*this);
 
-    String scriptString(JSStringGetCharactersPtr(script), JSStringGetLength(script));
+    String scriptString(reinterpret_cast<const UChar*>(JSStringGetCharactersPtr(script)), JSStringGetLength(script));
     m_UIScriptContext->runUIScript(scriptString, callbackID);
 }
 




--- modules/javafx.web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt
@@ -72,9 +72,5 @@ add_library(DumpRenderTreeJava SHARED ${DumpRenderTree
 add_definitions(-DWEBCORE_EXPORT=WTF_IMPORT -DWEBCORE_TESTSUPPORT_EXPORT=WTF_IMPORT)
 add_dependencies(DumpRenderTreeJava DumpRenderTreeBindings)
 
-if (UNIX AND NOT APPLE)
-  set_target_properties(DumpRenderTreeJava PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
-endif ()
-
 set_target_properties(DumpRenderTreeJava PROPERTIES OUTPUT_NAME "DumpRenderTreeJava")
 target_link_libraries(DumpRenderTreeJava ${DumpRenderTree_LIBRARIES})




%%JAVA_HOME%%/jmods/javafx.base.jmod
%%JAVA_HOME%%/jmods/javafx.controls.jmod
%%JAVA_HOME%%/jmods/javafx.fxml.jmod
%%JAVA_HOME%%/jmods/javafx.graphics.jmod
%%JAVA_HOME%%/jmods/javafx.media.jmod
%%JAVA_HOME%%/jmods/javafx.swing.jmod
%%JAVA_HOME%%/jmods/javafx.web.jmod
%%JAVA_HOME%%/lib/javafx.base.jar
%%JAVA_HOME%%/lib/javafx.controls.jar
%%JAVA_HOME%%/lib/javafx.fxml.jar
%%JAVA_HOME%%/lib/javafx.graphics.jar
%%JAVA_HOME%%/lib/javafx.media.jar
%%JAVA_HOME%%/lib/javafx.properties
%%JAVA_HOME%%/lib/javafx.swing.jar
%%JAVA_HOME%%/lib/javafx.web.jar
%%MEDIA%%%%JAVA_HOME%%/lib/libavplugin.so
%%JAVA_HOME%%/lib/libdecora_sse.so
%%MEDIA%%%%JAVA_HOME%%/lib/libfxplugins.so
%%JAVA_HOME%%/lib/libglass.so
%%JAVA_HOME%%/lib/libglassgtk2.so
%%JAVA_HOME%%/lib/libglassgtk3.so
%%MEDIA%%%%JAVA_HOME%%/lib/libgstreamer-lite.so
%%JAVA_HOME%%/lib/libjavafx_font.so
%%JAVA_HOME%%/lib/libjavafx_font_freetype.so
%%JAVA_HOME%%/lib/libjavafx_font_pango.so
%%JAVA_HOME%%/lib/libjavafx_iio.so
%%MEDIA%%%%JAVA_HOME%%/lib/libjfxmedia.so
%%WEBKIT%%%%JAVA_HOME%%/lib/libjfxwebkit.so
%%JAVA_HOME%%/lib/libprism_common.so
%%JAVA_HOME%%/lib/libprism_es2.so
%%JAVA_HOME%%/lib/libprism_sw.so
%%JAVA_HOME%%/lib/javafx-src.zip
%%SWT%%%%JAVA_HOME%%/lib/javafx-swt.jar

Return to bug 248248

Lines 1-49 Link Here

(-)java/openjfx14/Makefile (-58 / +49 lines)
1	# Created by: Tobias Kortkamp <t@tobik.me>
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= openjfx8	3	PORTNAME= openjfx
5	DISTVERSION= 8u202-b07	4	DISTVERSION= 14.0.2.1+1
6	PORTREVISION= 7	5	CATEGORIES= x11-toolkits java devel
7	PORTEPOCH= 1	6	PKGNAMESUFFIX= 14
8	CATEGORIES= java x11-toolkits devel
9	MASTER_SITES= https://github.com/t6/openjfx/releases/download/release/ \
10	http://hg.openjdk.java.net/openjfx/8u/rt/archive/${DISTVERSION}${EXTRACT_SUFX}?dummy=/
11	PKGNAMESUFFIX= -devel
12		7
13	MAINTAINER= tobik@FreeBSD.org	8	MAINTAINER= mikael@FreeBSD.org
14	COMMENT= JavaFX SDK overlay for OpenJDK 8	9	COMMENT= JavaFX SDK overlay for OpenJDK 11
15		10
16	LICENSE= GPLv2	11	LICENSE= GPLv2
17	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
18		13
19	DEPRECATED= No longer maintained upstream	14	ONLY_FOR_ARCHS= aarch64 amd64 powerpc64
20	EXPIRATION_DATE= 2020-11-30
21	ONLY_FOR_ARCHS= amd64 i386
22		15
23	BUILD_DEPENDS= apache-ant>0:devel/apache-ant \	16	BUILD_DEPENDS= zip:archivers/zip \
24	antlr3>0:devel/antlr3 \	17	apache-ant>0:devel/apache-ant \
25	gradle4>=4.8:devel/gradle4 \	18	antlr4>0:devel/antlr4 \
		19	gradle62>=6.2:devel/gradle62 \
26	${JAVALIBDIR}/junit.jar:java/junit	20	${JAVALIBDIR}/junit.jar:java/junit
27	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \	21	LIB_DEPENDS= libasound.so:audio/alsa-lib \
		22	libfontconfig.so:x11-fonts/fontconfig \
28	libfreetype.so:print/freetype2	23	libfreetype.so:print/freetype2
29		24
30	USES= gettext-runtime gl gnome jpeg localbase:ldflags pkgconfig \	25	USES= gettext-runtime gl gnome jpeg localbase:ldflags ninja pkgconfig \
31	sqlite xorg	26	sqlite xorg
		27
		28	USE_GITHUB= yes
		29	GH_ACCOUNT= openjdk
		30	GH_PROJECT= jfx
32	USE_GL= gl	31	USE_GL= gl
33	USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango	32	USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango
34	USE_JAVA= yes	33	USE_JAVA= yes
35	JAVA_VERSION= 1.8	34	JAVA_VERSION= 11
36	USE_LDCONFIG= yes	35	USE_LDCONFIG= yes
37	USE_XORG= x11 xtst xxf86vm	36	USE_XORG= x11 xtst xxf86vm
38		37
39	CFLAGS+= -Wno-unused-command-line-argument	38	CFLAGS+= -Wno-unused-command-line-argument
40		39
41	WRKSRC= ${WRKDIR}/rt-${DISTVERSION}	40	PLIST_SUB= JAVA_HOME=${JAVA_HOME}
42		41
43	PLIST_SUB= ARCH=${ARCH} \
44	JAVA_HOME=${JAVA_HOME}
45
46	OPTIONS_DEFINE= MEDIA SWT TEST WEBKIT	42	OPTIONS_DEFINE= MEDIA SWT TEST WEBKIT
		43	OPTIONS_EXCLUDE_aarch64= WEBKIT
		44	OPTIONS_EXCLUDE_powerpc64= WEBKIT
47	OPTIONS_DEFAULT= MEDIA WEBKIT	45	OPTIONS_DEFAULT= MEDIA WEBKIT
48	OPTIONS_SUB= yes	46	OPTIONS_SUB= yes
49		47
Lines 66-72 Link Here
66	WEBKIT_IMPLIES= MEDIA	64	WEBKIT_IMPLIES= MEDIA
67	WEBKIT_BUILD_DEPENDS= cmake:devel/cmake	65	WEBKIT_BUILD_DEPENDS= cmake:devel/cmake
68	WEBKIT_LIB_DEPENDS= libicui18n.so:devel/icu	66	WEBKIT_LIB_DEPENDS= libicui18n.so:devel/icu
69	WEBKIT_USES= bison compiler:c++14-lang gmake gperf perl5 python:2.7,build	67	WEBKIT_USES= bison gmake gperf perl5 python:2.7,build
70	WEBKIT_USE= GNOME=libxslt,libxml2 \	68	WEBKIT_USE= GNOME=libxslt,libxml2 \
71	PERL5=build \	69	PERL5=build \
72	RUBY=yes \	70	RUBY=yes \
Lines 76-131 Link Here
76	# Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle	74	# Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle
77	_GRADLE_ENV= CC=${WRKDIR}/bin/ccwrapper \	75	_GRADLE_ENV= CC=${WRKDIR}/bin/ccwrapper \
78	CXX=${WRKDIR}/bin/cxxwrapper \	76	CXX=${WRKDIR}/bin/cxxwrapper \
79	GRADLE_USER_HOME=${WRKDIR}/gradle-home	77	GRADLE_USER_HOME=${WRKDIR}/gradle-home \
80	_GRADLE_RUN= ${SETENV} ${_GRADLE_ENV} gradle4 --no-daemon	78	JAVA_VERSION=${JAVA_VERSION}
		79	_GRADLE_RUN= ${SETENV} ${_GRADLE_ENV} gradle62 --no-daemon
81		80
82	# NOTE: This port won't build if ${JAVA_HOME}/jre/lib/ext/jfxrt.jar
83	# already exists on your system. This is not a problem in Poudriere
84	# or Synth but something to be aware of if you're trying to build this
85	# port in a non-pristine environment.
86
87	# The BSD Makefiles for GStreamer-lite and Jfxmedia are based on the	81	# The BSD Makefiles for GStreamer-lite and Jfxmedia are based on the
88	# Linux versions. Prepare the tree, so that we only see the changes	82	# Linux versions. Prepare the tree, so that we only see the changes
89	# from Linux's Makefile in our own patches.	83	# from Linux's Makefile in our own patches.
90	pre-patch:	84	pre-patch:
91	@${CP} -r ${WRKSRC}/modules/media/src/main/native/jfxmedia/projects/linux \	85	@${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/linux \
92	${WRKSRC}/modules/media/src/main/native/jfxmedia/projects/bsd	86	${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/bsd
93	@${CP} -r ${WRKSRC}/modules/media/src/main/native/gstreamer/projects/linux \	87	@${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/linux \
94	${WRKSRC}/modules/media/src/main/native/gstreamer/projects/bsd	88	${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/bsd
95		89
96	post-patch:	90	post-patch:
97	@${MKDIR} ${WRKDIR}/bin	91	@${MKDIR} ${WRKDIR}/bin
98	@${PRINTF} '#!/bin/sh\nexec ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper	92	@${PRINTF} '#!/bin/sh\nexec ${CCACHE_BIN} ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper
99	@${PRINTF} '#!/bin/sh\nexec ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper	93	@${PRINTF} '#!/bin/sh\nexec ${CCACHE_BIN} ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper
100	@${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper	94	@${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper
101	@${SED} -e 's@/linux@/freebsd@g' -e 's@-DLINUX@-DFREEBSD@g' -e 's@LINUX@BSD@g' \	95	@${REINPLACE_CMD} -e 's\|gcc\|${WRKDIR}/bin/ccwrapper\|g' \
102	-e 's@linux_@bsd_@g' -e 's@"-static-libgcc", "-static-libstdc++",@@g' \	96	-e 's\|g\+\+\|${WRKDIR}/bin/cxxwrapper\|g' \
103	-e 's@"gcc"@"${WRKDIR}/bin/ccwrapper"@g' -e 's@"g\+\+"@"${WRKDIR}/bin/cxxwrapper"@g' \	97	${WRKSRC}/buildSrc/bsd.gradle
104	${WRKSRC}/buildSrc/linux.gradle > ${WRKSRC}/buildSrc/bsd.gradle
105	# Add a *BSD native audio sink to GStreamer-lite instead of using the	98	# Add a *BSD native audio sink to GStreamer-lite instead of using the
106	# bundled ALSA sink. Currently we add an sndio sink, but this is an extension	99	# bundled ALSA sink. Currently we add an sndio sink, but this is an extension
107	# point for eventually adding an OSS backend (or others) as an option as well.	100	# point for eventually adding an OSS backend (or others) as an option as well.
108	# If you add a new one make sure it registers itself as "bsdaudiosink" as defined	101	# If you add a new one make sure it registers itself as "bsdaudiosink" as defined
109	# in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp	102	# in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp
110	@${MKDIR} ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio	103	@${MKDIR} ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
111	@${CP} ${FILESDIR}/gstsndio.* ${FILESDIR}/sndiosink.* \	104	@${CP} ${FILESDIR}/gstsndio.* ${FILESDIR}/sndiosink.* \
112	${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio	105	${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
113	@cd ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \	106	@cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \
114	${LN} -s gstsndio.c gstbsdaudio.c && \	107	${LN} -s gstsndio.c gstbsdaudio.c && \
115	${LN} -s sndiosink.c bsdaudiosink.c	108	${LN} -s sndiosink.c bsdaudiosink.c
116	# Pull Java dependencies from LOCALBASE	109	# Pull Java dependencies from LOCALBASE
117	@${REINPLACE_CMD} 's@/usr/local@${LOCALBASE}@g' \	110	@${REINPLACE_CMD} 's\|/usr/local\|${LOCALBASE}\|g' \
118	${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle	111	${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle
119	# Remove bundled libraries. We use the system's versions instead.	112	# Remove bundled libraries. We use the system's versions instead.
120	@cd ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty && \	113	@cd ${WRKSRC}/modules/javafx.web/src/main/native/Source/ThirdParty && \
121	${RM} -r icu libxml libxslt sqlite	114	${RM} -r icu libxml libxslt sqlite
122	@${RM} -r ${WRKSRC}/modules/web/src/main/native/Source/WTF/icu	115	@${RM} -r ${WRKSRC}/modules/javafx.web/src/main/native/Source/WTF/icu
123	@cd ${WRKSRC}/modules/media/src/main/native/gstreamer/3rd_party && \	116	@cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/3rd_party && \
124	${RM} -r glib libffi	117	${RM} -r glib libffi
125		118
126	post-patch-SWT-off:
127	@${RM} -r ${WRKSRC}/modules/graphics/src/main/java/com/sun/glass/ui/swt
128
129	do-configure:	119	do-configure:
130	@${MKDIR} ${WRKDIR}/gradle-home	120	@${MKDIR} ${WRKDIR}/gradle-home
131	@${ECHO_CMD} "NUM_COMPILE_THREADS = ${MAKE_JOBS_NUMBER}" > ${WRKSRC}/gradle.properties	121	@${ECHO_CMD} "NUM_COMPILE_THREADS = ${MAKE_JOBS_NUMBER}" > ${WRKSRC}/gradle.properties
Lines 135-147 Link Here
135	@${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle	125	@${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle
136		126
137	do-build:	127	do-build:
138	@cd ${WRKSRC} && ${_GRADLE_RUN} zips	128	@cd ${WRKSRC} && ${SETENV} ${_GRADLE_RUN} zips
139		129
140	do-install:	130	do-install:
141	@${MKDIR} ${STAGEDIR}${JAVA_HOME}	131	@${MKDIR} ${STAGEDIR}${JAVA_HOME}/lib ${STAGEDIR}${JAVA_HOME}/jmods
142	@${TAR} -C ${STAGEDIR}${JAVA_HOME} \	132	(cd ${WRKSRC}/build/artifacts/javafx-sdk-14.0.2.1/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVA_HOME}/lib)
143	-xf ${WRKSRC}/build/bundles/javafx-sdk-overlay.zip	133	@${MV} ${STAGEDIR}${JAVA_HOME}/lib/src.zip ${STAGEDIR}${JAVA_HOME}/lib/javafx-src.zip
144	@${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \;	134	(cd ${WRKSRC}/build/artifacts/javafx-jmods-14.0.2.1 && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVA_HOME}/jmods)
		135	@${FIND} ${STAGEDIR}${JAVA_HOME}/lib -name '*.so' -exec ${STRIP_CMD} \{\} \;
145		136
146	do-test-TEST-on:	137	do-test-TEST-on:
147	@cd ${WRKSRC} && ${_GRADLE_RUN} check test	138	@cd ${WRKSRC} && ${_GRADLE_RUN} check test

Line 0 Link Here

(-)java/openjfx14/files/patch-buildSrc_bsd.gradle (+332 lines)
		1	--- buildSrc/bsd.gradle.orig 2020-07-21 10:33:26 UTC
		2	+++ buildSrc/bsd.gradle
		3	@@ -0,0 +1,329 @@
		4	+/*
		5	+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
		6	+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
		7	+ *
		8	+ * This code is free software; you can redistribute it and/or modify it
		9	+ * under the terms of the GNU General Public License version 2 only, as
		10	+ * published by the Free Software Foundation. Oracle designates this
		11	+ * particular file as subject to the "Classpath" exception as provided
		12	+ * by Oracle in the LICENSE file that accompanied this code.
		13	+ *
		14	+ * This code is distributed in the hope that it will be useful, but WITHOUT
		15	+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
		16	+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
		17	+ * version 2 for more details (a copy is included in the LICENSE file that
		18	+ * accompanied this code).
		19	+ *
		20	+ * You should have received a copy of the GNU General Public License version
		21	+ * 2 along with this work; if not, write to the Free Software Foundation,
		22	+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
		23	+ *
		24	+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
		25	+ * or visit www.oracle.com if you need additional information or have any
		26	+ * questions.
		27	+ */
		28	+
		29	+ext.BSD = [:]
		30	+
		31	+// Declare whether this particular target file applies to the current system
		32	+BSD.canBuild = IS_BSD;
		33	+if (!BSD.canBuild) return;
		34	+
		35	+// All desktop related packages should be built
		36	+BSD.compileSwing = true;
		37	+BSD.compileSWT = true;
		38	+
		39	+// Libraries end up in the lib/$OS_ARCH directory for Linux
		40	+BSD.libDest = "lib"
		41	+
		42	+// Lambda for naming the generated libs
		43	+BSD.library = { name -> return (IS_STATIC_BUILD ? "lib${name}.a" : "lib${name}.so") as String }
		44	+
		45	+// A set of common parameters to use for both compiling and linking
		46	+def commonFlags = [
		47	+ "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
		48	+ "-fstack-protector",
		49	+ "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses"] // warning flags
		50	+
		51	+if (!IS_64) {
		52	+ commonFlags += "-m32"
		53	+}
		54	+
		55	+if (IS_STATIC_BUILD) {
		56	+ commonFlags += "-DSTATIC_BUILD"
		57	+}
		58	+
		59	+// Specify the compilation parameters and link parameters
		60	+def ccFlags = [
		61	+ commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/freebsd", "-c",
		62	+ "-ffunction-sections", "-fdata-sections",
		63	+ IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
		64	+def ccFlagsGTK3 = ccFlags
65	+//ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
66	+def dynamicLinkFlags = [ "-shared", commonFlags,
67	+ "-z", "relro",
68	+ "-Wl,--gc-sections"].flatten()
69	+
70	+def staticLinkFlags = [].flatten()
71	+
72	+def linkFlags = IS_STATIC_BUILD ? staticLinkFlags : dynamicLinkFlags;
73	+
74	+if (IS_DEBUG_NATIVE) {
75	+ linkFlags += "-g"
76	+}
77	+
78	+def toolchainDir
79	+if (hasProperty('toolchainDir')) {
80	+ toolchainDir = ext.toolchainDir + "/"
81	+} else {
82	+ toolchainDir = ""
83	+}
84	+
85	+def gtk2CCFlags = [ ];
86	+def gtk3CCFlags = [ "-Wno-deprecated-declarations" ];
87	+def gtk2LinkFlags = [ ];
88	+def gtk3LinkFlags = [ ];
89	+
90	+// Create $buildDir/freebsd_tools.properties file and load props from it
91	+setupTools("bsd_gtk2",
92	+ { propFile ->
93	+ ByteArrayOutputStream results1 = new ByteArrayOutputStream();
94	+ exec {
95	+ commandLine("${toolchainDir}pkg-config", "--cflags", "gtk+-2.0", "gthread-2.0", "xtst")
96	+ setStandardOutput(results1);
97	+ }
98	+ propFile << "cflagsGTK2=" << results1.toString().trim() << "\n";
99	+
100	+ ByteArrayOutputStream results3 = new ByteArrayOutputStream();
101	+ exec {
102	+ commandLine("${toolchainDir}pkg-config", "--libs", "gtk+-2.0", "gthread-2.0", "xtst")
103	+ setStandardOutput(results3);
104	+ }
105	+ propFile << "libsGTK2=" << results3.toString().trim() << "\n";
106	+ },
107	+ { properties ->
108	+ def cflagsGTK2 = properties.getProperty("cflagsGTK2")
109	+ def libsGTK2 = properties.getProperty("libsGTK2")
110	+ if (cflagsGTK2 && libsGTK2) {
111	+ gtk2CCFlags.addAll(cflagsGTK2.split(" "))
112	+ gtk2LinkFlags.addAll(libsGTK2.split(" "))
113	+ } else {
114	+ throw new IllegalStateException("GTK2 development packages not found. If GTK2 packages are installed, please remove the build directory and try again.")
115	+ }
116	+ }
117	+)
118	+
119	+setupTools("bsd_gtk3",
120	+ { propFile ->
121	+ ByteArrayOutputStream results2 = new ByteArrayOutputStream();
122	+ exec {
123	+ commandLine("${toolchainDir}pkg-config", "--cflags", "gtk+-3.0", "gthread-2.0", "xtst")
124	+ setStandardOutput(results2);
125	+ }
126	+ propFile << "cflagsGTK3=" << results2.toString().trim() << "\n";
127	+
128	+ ByteArrayOutputStream results4 = new ByteArrayOutputStream();
129	+ exec {
130	+ commandLine("${toolchainDir}pkg-config", "--libs", "gtk+-3.0", "gthread-2.0", "xtst")
131	+ setStandardOutput(results4);
132	+ }
133	+ propFile << "libsGTK3=" << results4.toString().trim() << "\n";
134	+
135	+ },
136	+ { properties ->
137	+ def cflagsGTK3 = properties.getProperty("cflagsGTK3")
138	+ def libsGTK3 = properties.getProperty("libsGTK3")
139	+ if (cflagsGTK3 && libsGTK3) {
140	+ gtk3CCFlags.addAll(cflagsGTK3.split(" "))
141	+ gtk3LinkFlags.addAll(libsGTK3.split(" "))
142	+ } else {
143	+ throw new IllegalStateException("GTK3 development packages not found. If GTK3 packages are installed, please remove the build directory and try again.")
144	+ }
145	+ }
146	+)
147	+
148	+def pangoCCFlags = ["-D_ENABLE_PANGO"];
149	+def pangoLinkFlags = [];
150	+setupTools("bsd_pango_tools",
151	+ { propFile ->
152	+ ByteArrayOutputStream results = new ByteArrayOutputStream();
153	+ exec {
154	+ commandLine "${toolchainDir}pkg-config", "--cflags", "pangoft2"
155	+ standardOutput = results
156	+ }
157	+ propFile << "cflags=" << results.toString().trim() << "\n";
158	+
159	+ results = new ByteArrayOutputStream();
160	+ exec {
161	+ commandLine "${toolchainDir}pkg-config", "--libs", "pangoft2"
162	+ standardOutput = results
163	+ }
164	+ propFile << "libs=" << results.toString().trim();
165	+ },
166	+ { properties ->
167	+ def cflags = properties.getProperty("cflags")
168	+ def libs = properties.getProperty("libs")
169	+ if (cflags && libs) {
170	+ pangoCCFlags.addAll(cflags.split(" "))
171	+ pangoLinkFlags.addAll(libs.split(" "))
172	+ } else {
173	+ throw new IllegalStateException("Linux pango packages not found.\nIf pango packages are installed, please remove the build directory and try again.")
174	+ }
175	+ }
176	+)
177	+
178	+def freetypeCCFlags = [ext.IS_COMPILE_PANGO ? "-D_ENABLE_PANGO" :
179	+ ext.IS_COMPILE_HARFBUZZ ? "-D_ENABLE_HARFBUZZ" : ""]
180	+def freetypeLinkFlags = []
181	+setupTools("bsd_freetype_tools",
182	+ { propFile ->
183	+ ByteArrayOutputStream results = new ByteArrayOutputStream();
184	+ exec {
185	+ commandLine "${toolchainDir}pkg-config", "--cflags", "freetype2"
186	+ standardOutput = results
187	+ }
188	+ propFile << "cflags=" << results.toString().trim() << "\n";
189	+
190	+ results = new ByteArrayOutputStream();
191	+ exec {
192	+ commandLine "${toolchainDir}pkg-config", "--libs", "freetype2"
193	+ standardOutput = results
194	+ }
195	+ propFile << "libs=" << results.toString().trim();
196	+ },
197	+ { properties ->
198	+ def cflags = properties.getProperty("cflags")
199	+ def libs = properties.getProperty("libs")
200	+ if (cflags && libs) {
201	+ freetypeCCFlags.addAll(cflags.split(" "))
202	+ if (!IS_STATIC_BUILD) {
203	+ freetypeLinkFlags.addAll(libs.split(" "))
204	+ }
205	+ } else {
206	+ throw new IllegalStateException("Linux freetype packages not found.\nIf freetype pacakges are installed, please remove the build directory and try again.")
207	+ }
208	+ }
209	+)
210	+
211	+def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "${toolchainDir}gcc";
212	+def linker = IS_STATIC_BUILD ? "ar" : IS_COMPILE_PARFAIT ? "parfait-g++" : "${toolchainDir}g++";
213	+
214	+BSD.glass = [:]
215	+BSD.glass.variants = ["glass", "glassgtk2", "glassgtk3"]
216	+
217	+FileTree ft_gtk_launcher = fileTree("${project(":graphics").projectDir}/src/main/native-glass/gtk/") {
218	+ include("**/launcher.c")
219	+}
220	+
221	+FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-glass/gtk/") {
222	+ exclude("**/launcher.c")
223	+}
224	+
225	+BSD.glass.glass = [:]
226	+BSD.glass.glass.nativeSource = ft_gtk_launcher.getFiles()
227	+BSD.glass.glass.compiler = compiler
228	+BSD.glass.glass.ccFlags = [ccFlags].flatten()
229	+BSD.glass.glass.linker = linker
230	+BSD.glass.glass.linkFlags = IS_STATIC_BUILD? linkFlags : [linkFlags, "-lX11", "-ldl"].flatten()
231	+BSD.glass.glass.lib = "glass"
232	+
233	+BSD.glass.glassgtk2 = [:]
234	+BSD.glass.glassgtk2.nativeSource = ft_gtk.getFiles()
235	+BSD.glass.glassgtk2.compiler = compiler
236	+BSD.glass.glassgtk2.ccFlags = IS_STATIC_BUILD ?
237	+ ["-fno-threadsafe-statics", ccFlags, gtk2CCFlags].flatten() :
238	+ [ccFlags, gtk2CCFlags].flatten()
239	+BSD.glass.glassgtk2.linker = linker
240	+BSD.glass.glassgtk2.linkFlags = IS_STATIC_BUILD ? linkFlags : [linkFlags, gtk2LinkFlags].flatten()
241	+BSD.glass.glassgtk2.lib = "glassgtk2"
242	+
243	+BSD.glass.glassgtk3 = [:]
244	+BSD.glass.glassgtk3.nativeSource = ft_gtk.getFiles()
245	+BSD.glass.glassgtk3.compiler = compiler
246	+BSD.glass.glassgtk3.ccFlags = IS_STATIC_BUILD ?
247	+ ["-fno-threadsafe-statics", ccFlags, gtk3CCFlags].flatten() :
248	+ [ccFlags, gtk3CCFlags].flatten()
249	+BSD.glass.glassgtk3.linker = linker
250	+BSD.glass.glassgtk3.linkFlags = IS_STATIC_BUILD ? linkFlags : [linkFlags, gtk3LinkFlags].flatten()
251	+BSD.glass.glassgtk3.lib = "glassgtk3"
252	+
253	+BSD.decora = [:]
254	+BSD.decora.compiler = compiler
255	+BSD.decora.ccFlags = [ccFlags, "-ffast-math"].flatten()
256	+BSD.decora.linker = linker
257	+BSD.decora.linkFlags = [linkFlags].flatten()
258	+BSD.decora.lib = "decora_sse"
259	+
260	+BSD.prism = [:]
261	+BSD.prism.nativeSource = file("${project(":graphics").projectDir}/src/main/native-prism")
262	+BSD.prism.compiler = compiler
263	+BSD.prism.ccFlags = [ccFlags, "-DINLINE=inline"].flatten()
264	+BSD.prism.linker = linker
265	+BSD.prism.linkFlags = [linkFlags].flatten()
266	+BSD.prism.lib = "prism_common"
267	+
268	+BSD.prismSW = [:]
269	+BSD.prismSW.nativeSource = file("${project(":graphics").projectDir}/src/main/native-prism-sw")
270	+BSD.prismSW.compiler = compiler
271	+BSD.prismSW.ccFlags = [ccFlags, "-DINLINE=inline"].flatten()
272	+BSD.prismSW.linker = linker
273	+BSD.prismSW.linkFlags = [linkFlags].flatten()
274	+BSD.prismSW.lib = "prism_sw"
275	+
276	+BSD.iio = [:]
277	+BSD.iio.nativeSource = [
278	+ file("${project("graphics").projectDir}/src/main/native-iio"),
279	+ file("${project("graphics").projectDir}/src/main/native-iio/libjpeg")]
280	+BSD.iio.compiler = compiler
281	+BSD.iio.ccFlags = [ccFlags].flatten()
282	+BSD.iio.linker = linker
283	+BSD.iio.linkFlags = [linkFlags].flatten()
284	+BSD.iio.lib = "javafx_iio"
285	+
286	+BSD.prismES2 = [:]
287	+BSD.prismES2.nativeSource = [
288	+ file("${project("graphics").projectDir}/src/main/native-prism-es2"),
289	+ file("${project("graphics").projectDir}/src/main/native-prism-es2/GL"),
290	+ file("${project("graphics").projectDir}/src/main/native-prism-es2/x11")
291	+]
292	+BSD.prismES2.compiler = compiler
293	+BSD.prismES2.ccFlags = ["-DFREEBSD", ccFlags].flatten()
294	+BSD.prismES2.linker = linker
295	+BSD.prismES2.linkFlags =IS_STATIC_BUILD ? linkFlags : [linkFlags, "-lX11", "-lXxf86vm", "-lGL"].flatten()
296	+BSD.prismES2.lib = "prism_es2"
297	+
298	+def closedDir = file("$projectDir/../rt-closed")
299	+BSD.font = [:]
300	+BSD.font.compiler = compiler
301	+BSD.font.nativeSource = [file("${project("graphics").projectDir}/src/main/native-font")]
302	+BSD.font.ccFlags = ["-DJFXFONT_PLUS", ccFlags].flatten()
303	+BSD.font.linker = linker
304	+BSD.font.linkFlags = [linkFlags].flatten()
305	+BSD.font.lib = "javafx_font"
306	+
307	+BSD.fontFreetype = [:]
308	+BSD.fontFreetype.nativeSource = ["src/main/native-font/freetype.c"]
309	+BSD.fontFreetype.compiler = compiler
310	+BSD.fontFreetype.ccFlags = ["-DJFXFONT_PLUS", ccFlags, freetypeCCFlags].flatten()
311	+BSD.fontFreetype.linker = linker
312	+BSD.fontFreetype.linkFlags = IS_STATIC_BUILD ? linkFlags : [linkFlags, freetypeLinkFlags].flatten()
313	+BSD.fontFreetype.lib = "javafx_font_freetype"
314	+
315	+BSD.fontPango = [:]
316	+BSD.fontPango.nativeSource = ["src/main/native-font/pango.c"]
317	+BSD.fontPango.compiler = compiler
318	+BSD.fontPango.ccFlags = ["-DJFXFONT_PLUS", ccFlags, pangoCCFlags].flatten()
319	+BSD.fontPango.linker = linker
320	+BSD.fontPango.linkFlags =IS_STATIC_BUILD ? linkFlags : [linkFlags, pangoLinkFlags].flatten()
321	+BSD.fontPango.lib = "javafx_font_pango"
322	+
323	+BSD.media = [:]
324	+BSD.media.compiler = compiler
325	+BSD.media.linker = linker
326	+BSD.media.ar = "${toolchainDir}ar"
327	+
328	+BSD.webkit = [:]
329	+BSD.webkit.compiler = compiler
330	+BSD.webkit.linker = linker
331	+BSD.webkit.ccFlags = commonFlags.flatten()
332	+BSD.webkit.linkFlags = linkFlags.flatten()

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.base_src_main_java_com_sun_javafx_PlatformUtil.java (+37 lines)
	1	--- modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.base/src/main/java/com/sun/javafx/PlatformUtil.java
	3	@@ -69,6 +69,7 @@ public class PlatformUtil {
	4	private static final boolean WINDOWS_7_OR_LATER = WINDOWS && versionNumberGreaterThanOrEqualTo(6.1f);
	5	private static final boolean MAC = os.startsWith("Mac");
	6	private static final boolean LINUX = os.startsWith("Linux") && !ANDROID;
	7	+ private static final boolean FREEBSD = os.startsWith("FreeBSD");
	8	private static final boolean SOLARIS = os.startsWith("SunOS");
	9	private static final boolean IOS = os.startsWith("iOS");
	10
	11	@@ -124,6 +125,13 @@ public class PlatformUtil {
	12	return LINUX;
	13	}
	14
	15	+ /**
	16	+ * Returns true if the operating system is a form of FreeBSD.
	17	+ */
	18	+ public static boolean isFreeBSD(){
	19	+ return FREEBSD;
	20	+ }
	21	+
	22	public static boolean useEGL() {
	23	return useEGL;
	24	}
	25	@@ -150,10 +158,10 @@ public class PlatformUtil {
	26	}
	27
	28	/**
	29	- * Returns true if the operating system is a form of Linux or Solaris
	30	+ * Returns true if the operating system is a form of Unix
	31	*/
	32	public static boolean isUnix(){
	33	- return LINUX \|\| SOLARIS;
	34	+ return LINUX \|\| SOLARIS \|\| FREEBSD;
	35	}
	36
	37	/**

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.controls_src_main_java_com_sun_javafx_scene_TextInputControlBehavior.java (+36 lines)
	1	--- modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java.orig 2020-07-17 10:21:33 UTC
	2	+++ modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java
	3	@@ -54,6 +54,7 @@ import javafx.scene.input.MouseEvent;
	4	import java.text.Bidi;
	5	import java.util.function.Predicate;
	6
	7	+import static com.sun.javafx.PlatformUtil.isFreeBSD;
	8	import static com.sun.javafx.PlatformUtil.isLinux;
	9	import static com.sun.javafx.PlatformUtil.isMac;
	10	import static com.sun.javafx.PlatformUtil.isWindows;
	11	@@ -122,6 +123,7 @@ public abstract class TextInputControlBehavior<T exten
	12	final Predicate<KeyEvent> validWhenEditable = e -> !c.isEditable();
	13	final Predicate<KeyEvent> validOnWindows = e -> !PlatformUtil.isWindows();
	14	final Predicate<KeyEvent> validOnLinux = e -> !PlatformUtil.isLinux();
	15	+ final Predicate<KeyEvent> validOnFreeBSD = e -> !PlatformUtil.isFreeBSD();
	16
	17	KeyMapping cancelEditMapping;
	18	KeyMapping fireMapping;
	19	@@ -550,7 +552,7 @@ public abstract class TextInputControlBehavior<T exten
	20
	21	public void selectNextWord() {
	22	TextInputControl textInputControl = getNode();
	23	- if (isMac() \|\| isLinux()) {
	24	+ if (isMac() \|\| isLinux() \|\| isFreeBSD()) {
	25	textInputControl.selectEndOfNextWord();
	26	} else {
	27	textInputControl.selectNextWord();
	28	@@ -599,7 +601,7 @@ public abstract class TextInputControlBehavior<T exten
	29
	30	protected void nextWord() {
	31	TextInputControl textInputControl = getNode();
	32	- if (isMac() \|\| isLinux()) {
	33	+ if (isMac() \|\| isLinux() \|\| isFreeBSD()) {
	34	textInputControl.endOfNextWord();
	35	} else {
	36	textInputControl.nextWord();

Line 0 Link Here

(-)java/openjfx14/files/patch-modules_javafx.web_src_main_native_Tools_DumpRenderTree_TestRunner.cpp (+18 lines)
	1	https://github.com/WebKit/webkit/commit/35a79bf4c2e0ecb4a37e672de347a25254ea0601
	2
	3	* DumpRenderTree/TestRunner.cpp:
	4	(TestRunner::runUIScript):
	5	Manually convert between UChar and UniChar/unichar where needed.
	6
	7
	8	--- modules/javafx.web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp.orig 2020-07-19 19:13:03 UTC
	9	+++ modules/javafx.web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp
	10	@@ -2463,7 +2463,7 @@ void TestRunner::runUIScript(JSContextRef context, JSS
	11	if (!m_UIScriptContext)
	12	m_UIScriptContext = makeUniqueWithoutFastMallocCheck<WTR::UIScriptContext>(*this);
	13
	14	- String scriptString(JSStringGetCharactersPtr(script), JSStringGetLength(script));
	15	+ String scriptString(reinterpret_cast<const UChar*>(JSStringGetCharactersPtr(script)), JSStringGetLength(script));
	16	m_UIScriptContext->runUIScript(scriptString, callbackID);
	17	}
	18

Lines 1-24 Link Here

(-)java/openjfx14/pkg-plist (-24 / +33 lines)
1	%%JAVA_HOME%%/bin/javafxpackager	1	%%JAVA_HOME%%/jmods/javafx.base.jmod
2	%%JAVA_HOME%%/bin/javapackager	2	%%JAVA_HOME%%/jmods/javafx.controls.jmod
3	%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libavplugin.so	3	%%JAVA_HOME%%/jmods/javafx.fxml.jmod
4	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libdecora_sse.so	4	%%JAVA_HOME%%/jmods/javafx.graphics.jmod
5	%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libfxplugins.so	5	%%JAVA_HOME%%/jmods/javafx.media.jmod
6	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libglass.so	6	%%JAVA_HOME%%/jmods/javafx.swing.jmod
7	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libglassgtk2.so	7	%%JAVA_HOME%%/jmods/javafx.web.jmod
8	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libglassgtk3.so	8	%%JAVA_HOME%%/lib/javafx.base.jar
9	%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libgstreamer-lite.so	9	%%JAVA_HOME%%/lib/javafx.controls.jar
10	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font.so	10	%%JAVA_HOME%%/lib/javafx.fxml.jar
11	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font_freetype.so	11	%%JAVA_HOME%%/lib/javafx.graphics.jar
12	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font_pango.so	12	%%JAVA_HOME%%/lib/javafx.media.jar
13	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_iio.so	13	%%JAVA_HOME%%/lib/javafx.properties
14	%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjfxmedia.so	14	%%JAVA_HOME%%/lib/javafx.swing.jar
15	%%WEBKIT%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjfxwebkit.so	15	%%JAVA_HOME%%/lib/javafx.web.jar
16	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libprism_common.so	16	%%MEDIA%%%%JAVA_HOME%%/lib/libavplugin.so
17	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libprism_es2.so	17	%%JAVA_HOME%%/lib/libdecora_sse.so
18	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libprism_sw.so	18	%%MEDIA%%%%JAVA_HOME%%/lib/libfxplugins.so
19	%%JAVA_HOME%%/jre/lib/ext/jfxrt.jar	19	%%JAVA_HOME%%/lib/libglass.so
20	%%JAVA_HOME%%/jre/lib/javafx.properties	20	%%JAVA_HOME%%/lib/libglassgtk2.so
21	%%SWT%%%%JAVA_HOME%%/jre/lib/jfxswt.jar	21	%%JAVA_HOME%%/lib/libglassgtk3.so
22	%%JAVA_HOME%%/lib/ant-javafx.jar	22	%%MEDIA%%%%JAVA_HOME%%/lib/libgstreamer-lite.so
23	%%JAVA_HOME%%/lib/javafx-mx.jar	23	%%JAVA_HOME%%/lib/libjavafx_font.so
24	%%JAVA_HOME%%/lib/packager.jar	24	%%JAVA_HOME%%/lib/libjavafx_font_freetype.so
		25	%%JAVA_HOME%%/lib/libjavafx_font_pango.so
		26	%%JAVA_HOME%%/lib/libjavafx_iio.so
		27	%%MEDIA%%%%JAVA_HOME%%/lib/libjfxmedia.so
		28	%%WEBKIT%%%%JAVA_HOME%%/lib/libjfxwebkit.so
		29	%%JAVA_HOME%%/lib/libprism_common.so
		30	%%JAVA_HOME%%/lib/libprism_es2.so
		31	%%JAVA_HOME%%/lib/libprism_sw.so
		32	%%JAVA_HOME%%/lib/javafx-src.zip
		33	%%SWT%%%%JAVA_HOME%%/lib/javafx-swt.jar