Attachment #206000 for bug #237443

View | Details | Raw Unified | Return to bug 237443
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	openjfx8
DISTVERSION=	8u202-b07
PORTREVISION=	7
PORTEPOCH=	1
CATEGORIES=	java x11-toolkits devel
MASTER_SITES=	https://github.com/t6/openjfx/releases/download/release/ \

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

DEPRECATED=	No longer maintained upstream
ONLY_FOR_ARCHS=	amd64 i386

BUILD_DEPENDS=	apache-ant>0:devel/apache-ant \
		antlr3>0:devel/antlr3 \
		gradle4>=4.8:devel/gradle4 \
		${JAVALIBDIR}/junit.jar:java/junit
LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2

USES=		gettext-runtime gl gnome jpeg localbase:ldflags pkgconfig sqlite
USE_GL=		gl
USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango
USE_JAVA=	yes
JAVA_VERSION=	1.8
USE_LDCONFIG=	yes
USE_XORG=	x11 xtst xxf86vm

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

WRKSRC=		${WRKDIR}/rt-${DISTVERSION}

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

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

TEST_VARS=	AWT_TEST=true FULL_TEST=true

# Gradle calls CMake during the build
WEBKIT_IMPLIES=	MEDIA
WEBKIT_BUILD_DEPENDS=	cmake:devel/cmake
WEBKIT_IMPLIES=	MEDIA
WEBKIT_LIB_DEPENDS=	libicui18n.so:devel/icu
WEBKIT_USES=	bison compiler:c++14-lang gmake gperf perl5 python:2.7,build
WEBKIT_USE=	GNOME=libxslt,libxml2 \

WEBKIT_VARS=	RUBY_NO_RUN_DEPENDS=yes COMPILE_WEBKIT=true

# 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
_GRADLE_RUN=	${SETENV} ${_GRADLE_ENV} gradle4 --no-daemon

PLIST_SUB=	ARCH=${ARCH} \
		JAVA_HOME=${JAVA_HOME}
WRKSRC=		${WRKDIR}/rt-${DISTVERSION}

# 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

		${WRKSRC}/modules/media/src/main/native/gstreamer/projects/bsd

post-patch:
	@${MKDIR} ${WRKDIR}/bin
	@${PRINTF} '#!/bin/sh\nexec ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper
	@${PRINTF} '#!/bin/sh\nexec ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper
	@${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper
	@${SED} -e 's@/linux@/freebsd@g' -e 's@-DLINUX@-DFREEBSD@g' -e 's@LINUX@BSD@g' \
		-e 's@linux_@bsd_@g' -e 's@"-static-libgcc", "-static-libstdc++",@@g' \
		-e 's@"gcc"@"${WRKDIR}/bin/ccwrapper"@g' -e 's@"g\+\+"@"${WRKDIR}/bin/cxxwrapper"@g' \
		${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/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
	@${CP} ${FILESDIR}/gstsndio.* ${FILESDIR}/sndiosink.* \
		${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
	@cd ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \
		${LN} -s gstsndio.c gstbsdaudio.c && \

# Remove bundled libraries.  We use the system's versions instead.
	@cd ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty && \
		${RM} -r icu libxml libxslt sqlite
	@${RM} -r ${WRKSRC}/modules/web/src/main/native/Source/WTF/icu
	@cd ${WRKSRC}/modules/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

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

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

do-install:
	@${MKDIR} ${STAGEDIR}${JAVA_HOME}

	@${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \;

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

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)java/openjfx8-devel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524062144	1	TIMESTAMP = 1563779003
2	SHA256 (openjfx8-8u172-b11.tar.gz) = 2e88966dadaa93d172a67b6bd6e9f32002ac41e5c4eabf625c143c53f4ed6391	2	SHA256 (openjfx8-8u202-b07.tar.gz) = ca98b6d0721a0e4b91d62672e81594c80a47cfb5ded241de50f10ade9884c400
3	SIZE (openjfx8-8u172-b11.tar.gz) = 107629343	3	SIZE (openjfx8-8u202-b07.tar.gz) = 70669594




/*
 * Copyright (c) 2013, 2015, 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.compileFXPackager = true;

// Libraries end up in the sdk/rt/lib/$OS_ARCH directory for freebsd
BSD.libDest = "lib/$OS_ARCH"

// Lambda for naming the generated libs
BSD.library = { name -> return "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
        "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags

if (!IS_64) {
    commonFlags += "-m32"
}

// Specify the compilation parameters and link parameters
def ccFlags = [
        commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/freebsd", "-c",
        IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
//ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
def linkFlags = ["-shared", commonFlags].flatten()

// Create $buildDir/bsd_tools.properties file and load props from it
setupTools("bsd_tools",
    { propFile ->
        ByteArrayOutputStream results = new ByteArrayOutputStream();
        exec {
		commandLine("pkg-config", "--cflags", "gtk+-2.0", "gthread-2.0", "xtst");
            setStandardOutput(results);
        }
        propFile << "cflags=" << results.toString().trim() << "\n";

        results = new ByteArrayOutputStream();
        exec {
            commandLine "pkg-config", "--libs", "gtk+-2.0", "gthread-2.0", "xtst"
            standardOutput = results
        }
        propFile << "libs=" << results.toString().trim();
    },
    { properties ->
        ccFlags.addAll(properties.getProperty("cflags").split(" "))
        linkFlags.addAll(properties.getProperty("libs").split(" "))
    }
)

def pangoCCFlags = ["-D_ENABLE_PANGO"];
def pangoLinkFlags = [];
setupTools("bsd_pango_tools",
    { propFile ->
        ByteArrayOutputStream results = new ByteArrayOutputStream();
        exec {
            commandLine "pkg-config", "--cflags", "pangoft2"
            standardOutput = results
        }
        propFile << "cflags=" << results.toString().trim() << "\n";

        results = new ByteArrayOutputStream();
        exec {
            commandLine "pkg-config", "--libs", "pangoft2"
            standardOutput = results
        }
        propFile << "libs=" << results.toString().trim();
    },
    { properties ->
        pangoCCFlags.addAll(properties.getProperty("cflags").split(" "))
        pangoLinkFlags.addAll(properties.getProperty("libs").split(" "))
    }
)

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 "pkg-config", "--cflags", "freetype2"
            standardOutput = results
        }
        propFile << "cflags=" << results.toString().trim() << "\n";

        results = new ByteArrayOutputStream();
        exec {
            commandLine "pkg-config", "--libs", "freetype2"
            standardOutput = results
        }
        propFile << "libs=" << results.toString().trim();
    },
    { properties ->
        freetypeCCFlags.addAll(properties.getProperty("cflags").split(" "))
        freetypeLinkFlags.addAll(properties.getProperty("libs").split(" "))
    }
)

def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "cc";
def linker = IS_COMPILE_PARFAIT ? "parfait-g++" : "c++";

BSD.glass = [:]
BSD.glass.javahInclude = [
    "com/sun/glass/events/**",
    "com/sun/glass/ui/*",
    "com/sun/glass/ui/gtk/*"]
BSD.glass.nativeSource = file("modules/graphics/src/main/native-glass/gtk")
BSD.glass.compiler = compiler
BSD.glass.ccFlags = [ccFlags, "-Werror"].flatten()
BSD.glass.linker = linker
BSD.glass.linkFlags = [linkFlags].flatten()
BSD.glass.lib = "glass"

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.javahInclude = ["com/sun/prism/impl/**/*", "com/sun/prism/PresentableState*"]
BSD.prism.nativeSource = file("modules/graphics/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.javahInclude = ["com/sun/pisces/**/*"]
BSD.prismSW.nativeSource = file("modules/graphics/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.launcher = [:]
BSD.launcher.compiler = compiler
BSD.launcher.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/freebsd", "-c"]
BSD.launcher.linker = linker
BSD.launcher.linkFlags = ["-ldl"]
if (!IS_64) {
    BSD.launcher.ccFlags += "-m32"
    BSD.launcher.linkFlags += "-m32"
}

BSD.launcherlibrary = [:]
BSD.launcherlibrary.compiler = compiler
BSD.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/freebsd", "-c", "-fPIC"]
BSD.launcherlibrary.linker = linker
BSD.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared"]
if (!IS_64) {
    BSD.launcherlibrary.ccFlags += "-m32"
    BSD.launcherlibrary.linkFlags += "-m32"
}

BSD.iio = [:]
BSD.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
BSD.iio.nativeSource = [file("modules/graphics/src/main/native-iio")]
BSD.iio.compiler = compiler
BSD.iio.ccFlags = [ccFlags].flatten()
BSD.iio.linker = linker
BSD.iio.linkFlags = [linkFlags].flatten()
BSD.iio.linkFlags += "-ljpeg"
BSD.iio.lib = "javafx_iio"

BSD.prismES2 = [:]
BSD.prismES2.javahInclude = ["com/sun/prism/es2/**/*"]
BSD.prismES2.nativeSource = [
    file("modules/graphics/src/main/native-prism-es2"),
    file("modules/graphics/src/main/native-prism-es2/GL"),
    file("modules/graphics/src/main/native-prism-es2/x11")
]
BSD.prismES2.compiler = compiler
BSD.prismES2.ccFlags = ["-DFREEBSD", ccFlags].flatten()
BSD.prismES2.linker = linker
BSD.prismES2.linkFlags = [linkFlags, "-lX11", "-lXxf86vm", "-lGL"].flatten()
BSD.prismES2.lib = "prism_es2"

def closedDir = file("$projectDir/../rt-closed")
BSD.font = [:]
BSD.font.javahInclude = [
     "com/sun/javafx/font/**/*",
     "com/sun/javafx/text/**/*"]
BSD.font.compiler = compiler
BSD.font.nativeSource = [file("modules/graphics/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.fontT2K = [:]
BSD.fontT2K.javahInclude = ["com/sun/javafx/font/t2k/**/*"]
BSD.fontT2K.nativeSource = [
        file("$closedDir/javafx-font-t2k-native/src"),
        file("$closedDir/javafx-font-t2k-native/src/layout")]
BSD.fontT2K.compiler = compiler
BSD.fontT2K.ccFlags = ["-DJFXFONT_PLUS", "-DLE_STANDALONE", ccFlags].flatten()
BSD.fontT2K.linker = linker
BSD.fontT2K.linkFlags = [linkFlags].flatten()
BSD.fontT2K.lib = "javafx_font_t2k"

BSD.fontFreetype = [:]
BSD.fontFreetype.javahInclude = ["com/sun/javafx/font/freetype/OSFreetype.class"]
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 = [linkFlags, freetypeLinkFlags].flatten()
BSD.fontFreetype.lib = "javafx_font_freetype"

BSD.fontPango = [:]
BSD.fontPango.javahInclude = ["com/sun/javafx/font/freetype/OSPango.class"]
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 = [linkFlags, pangoLinkFlags].flatten()
BSD.fontPango.lib = "javafx_font_pango"

BSD.media = [:]
BSD.media.compiler = compiler
BSD.media.linker = linker
BSD.media.lib = "ar"

Lines 1-5 Link Here

(-)java/openjfx8-devel/files/gstsndio.c (-11 / +365 lines)
1	/*	1	/*
2	* Copyright (C) <2008> Jacob Meuser <jakemsr@sdf.lonestar.org>	2	* Copyright (C) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
		3	* Copyright (C) 2012 Alexandre Ratchov <alex@caoua.org>
3	*	4	*
4	* Permission to use, copy, modify, and distribute this software for any	5	* Permission to use, copy, modify, and distribute this software for any
5	* purpose with or without fee is hereby granted, provided that the above	6	* purpose with or without fee is hereby granted, provided that the above
Lines 17-42 Link Here
17	#ifdef HAVE_CONFIG_H	18	#ifdef HAVE_CONFIG_H
18	#include "config.h"	19	#include "config.h"
19	#endif	20	#endif
20	#include "sndiosink.h"
21		21
		22	#include <stdio.h>
		23	#include "gstsndio.h"
		24
22	GST_DEBUG_CATEGORY (gst_sndio_debug);	25	GST_DEBUG_CATEGORY (gst_sndio_debug);
		26	#define GST_CAT_DEFAULT gst_sndio_debug
23		27
		28	GType gst_sndiosink_get_type (void);
		29
24	gboolean	30	gboolean
25	plugin_init_alsa (GstPlugin * plugin)	31	plugin_init_alsa (GstPlugin * plugin)
26	{	32	{
27	if (!gst_element_register (plugin, "bsdaudiosink", GST_RANK_PRIMARY,	33	GST_DEBUG_CATEGORY_INIT (gst_sndio_debug, "sndio", 0, "sndio plugins");
28	GST_TYPE_SNDIOSINK)) {	34
		35	/* prefer sndiosink over pulsesink (GST_RANK_PRIMARY + 10) */
		36	if (!gst_element_register (plugin, "bsdaudiosink", GST_RANK_PRIMARY + 20,
		37	gst_sndiosink_get_type()))
29	return FALSE;	38	return FALSE;
		39	return TRUE;
		40	}
		41
		42	GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
		43	GST_VERSION_MINOR,
		44	sndio,
		45	"sndio plugin library",
		46	plugin_init_alsa, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
		47
		48	/*
		49	* common code to src and sink
		50	*/
		51
		52	void
		53	gst_sndio_init (struct gstsndio sio, GObject obj)
		54	{
		55	sio->obj = obj;
		56	sio->hdl = NULL;
		57	sio->device = g_strdup (SIO_DEVANY);
		58	}
		59
		60	void
		61	gst_sndio_finalize (struct gstsndio *sio)
		62	{
		63	gst_caps_replace (&sio->cur_caps, NULL);
		64	g_free (sio->device);
		65	}
		66
		67	GstCaps *
		68	gst_sndio_getcaps (struct gstsndio sio, GstCaps filter)
		69	{
		70	if (sio->cur_caps == NULL) {
		71	/* XXX */
		72	GST_LOG_OBJECT (sio->obj, "getcaps called, returning template caps");
		73	return NULL;
30	}	74	}
31		75
32	GST_DEBUG_CATEGORY_INIT (gst_sndio_debug, "sndio", 0, "sndio elements");	76	GST_LOG_OBJECT (sio->obj, "returning %" GST_PTR_FORMAT, sio->cur_caps);
33		77
34	#ifdef ENABLE_NLS	78	if (filter) {
35	GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,	79	return gst_caps_intersect_full (filter,
36	LOCALEDIR);	80	sio->cur_caps, GST_CAPS_INTERSECT_FIRST);
37	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);	81	} else {
38	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");	82	return gst_caps_ref (sio->cur_caps);
39	#endif /* ENABLE_NLS */	83	}
		84	}
40		85
		86	static void
		87	gst_sndio_onvol (void *arg, unsigned int vol)
		88	{
		89	struct gstsndio *sio = arg;
		90	sio->volume = vol;
		91	g_object_notify (G_OBJECT (sio->obj), "mute");
		92	g_object_notify (G_OBJECT (sio->obj), "volume");
		93	}
		94
		95	gboolean
		96	gst_sndio_open (struct gstsndio *sio, gint mode)
		97	{
		98	GValue list = G_VALUE_INIT, item = G_VALUE_INIT;
		99	GstStructure *s;
		100	GstCaps *caps;
		101	struct sio_enc *enc;
		102	struct sio_cap cap;
		103	char fmt[16];
		104	int i, chan;
		105
		106	GST_DEBUG_OBJECT (sio->obj, "open");
		107
		108	sio->hdl = sio_open (sio->device, mode, 0);
		109	if (sio->hdl == NULL) {
		110	GST_ELEMENT_ERROR (sio->obj, RESOURCE, OPEN_READ_WRITE,
		111	("Couldn't open sndio device"), (NULL));
		112	return FALSE;
		113	}
		114	sio->mode = mode;
		115
		116	if (!sio_getcap(sio->hdl, &cap)) {
		117	GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
		118	("Couldn't get device capabilities"), (NULL));
		119	sio_close(sio->hdl);
		120	sio->hdl = NULL;
		121	return FALSE;
		122	}
		123	if (cap.nconf == 0) {
		124	GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
		125	("Device has empty capabilities"), (NULL));
		126	sio_close(sio->hdl);
		127	sio->hdl = NULL;
		128	return FALSE;
		129	}
		130	sio_onvol (sio->hdl, gst_sndio_onvol, sio);
		131
		132	caps = gst_caps_new_empty ();
		133	s = gst_structure_new ("audio/x-raw", (char )NULL, (void )NULL);
		134
		135	/*
		136	* scan supported rates
		137	*/
		138	g_value_init (&list, GST_TYPE_LIST);
		139	g_value_init (&item, G_TYPE_INT);
		140	for (i = 0; i < SIO_NRATE; i++) {
		141	if ((cap.confs[0].rate & (1 << i)) == 0)
		142	continue;
		143	g_value_set_int(&item, cap.rate[i]);
		144	gst_value_list_append_value (&list, &item);
		145	}
		146	gst_structure_set_value (s, "rate", &list);
		147	g_value_unset (&item);
		148	g_value_unset (&list);
		149
150	/*
151	* scan supported channels
152	*/
153	g_value_init (&list, GST_TYPE_LIST);
154	g_value_init (&item, G_TYPE_INT);
155	chan = (mode == SIO_PLAY) ? cap.confs[0].pchan : cap.confs[0].rchan;
156	for (i = 0; i < SIO_NCHAN; i++) {
157	if ((chan & (1 << i)) == 0)
158	continue;
159	g_value_set_int(&item, (mode == SIO_PLAY) ? cap.pchan[i] : cap.rchan[i]);
160	gst_value_list_append_value (&list, &item);
161	}
162	gst_structure_set_value (s, "channels", &list);
163	g_value_unset (&item);
164	g_value_unset (&list);
165
166	/*
167	* scan supported encodings
168	*/
169	g_value_init (&list, GST_TYPE_LIST);
170	g_value_init (&item, G_TYPE_STRING);
171	for (i = 0; i < SIO_NENC; i++) {
172	if ((cap.confs[0].enc & (1 << i)) == 0)
173	continue;
174	enc = cap.enc + i;
175	if (enc->bits % 8 != 0)
176	continue;
177	if (enc->bits < enc->bps * 8 && enc->msb)
178	continue;
179	if (enc->bits == enc->bps * 8) {
180	snprintf(fmt, sizeof(fmt), "%s%u%s",
181	enc->sig ? "S" : "U",
182	enc->bits,
183	enc->bps > 1 ? (enc->le ? "LE" : "BE") : "");
184	} else {
185	snprintf(fmt, sizeof(fmt), "%s%u_%u%s",
186	enc->sig ? "S" : "U",
187	enc->bits,
188	enc->bps * 8,
189	enc->bps > 1 ? (enc->le ? "LE" : "BE") : "");
190	}
191	g_value_set_string(&item, fmt);
192	gst_value_list_append_value (&list, &item);
193	}
194	gst_structure_set_value (s, "format", &list);
195	g_value_unset (&item);
196	g_value_unset (&list);
197
198	/*
199	* add the only supported layout: interleaved
200	*/
201	g_value_init (&item, G_TYPE_STRING);
202	g_value_set_string(&item, "interleaved");
203	gst_structure_set_value (s, "layout", &item);
204	g_value_unset (&item);
205
206	gst_caps_append_structure (caps, s);
207	sio->cur_caps = caps;
208	GST_DEBUG ("caps are %s", gst_caps_to_string(caps));
41	return TRUE;	209	return TRUE;
42	}	210	}
		211
		212	gboolean
		213	gst_sndio_close (struct gstsndio *sio)
		214	{
		215	GST_DEBUG_OBJECT (sio->obj, "close");
		216
		217	gst_caps_replace (&sio->cur_caps, NULL);
		218	sio_close (sio->hdl);
		219	sio->hdl = NULL;
		220	return TRUE;
		221	}
		222
		223	static void
		224	gst_sndio_cb (void *addr, int delta)
		225	{
		226	struct gstsndio *sio = addr;
		227
		228	delta *= sio->bpf;
		229	if (sio->mode == SIO_PLAY)
		230	sio->delay -= delta;
		231	else
		232	sio->delay += delta;
		233	}
		234
		235	gboolean
		236	gst_sndio_prepare (struct gstsndio sio, GstAudioRingBufferSpec spec)
		237	{
		238	struct sio_par par, retpar;
		239	unsigned nchannels;
		240
		241	GST_DEBUG_OBJECT (sio, "prepare");
		242
		243	if (spec->type != GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW) {
		244	GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
		245	("Only raw buffer format supported by sndio"), (NULL));
		246	return FALSE;
		247	}
		248	if (!GST_AUDIO_INFO_IS_INTEGER(&spec->info)) {
		249	GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
		250	("Only integer format supported"), (NULL));
		251	return FALSE;
		252	}
		253	if (GST_AUDIO_INFO_DEPTH(&spec->info) % 8) {
		254	GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
		255	("Only depths multiple of 8 are supported"), (NULL));
		256	return FALSE;
		257	}
		258
		259	sio_initpar (&par);
		260	switch (GST_AUDIO_INFO_FORMAT (&spec->info)) {
		261	case GST_AUDIO_FORMAT_S8:
		262	case GST_AUDIO_FORMAT_U8:
		263	case GST_AUDIO_FORMAT_S16LE:
		264	case GST_AUDIO_FORMAT_S16BE:
		265	case GST_AUDIO_FORMAT_U16LE:
		266	case GST_AUDIO_FORMAT_U16BE:
		267	case GST_AUDIO_FORMAT_S32LE:
		268	case GST_AUDIO_FORMAT_S32BE:
		269	case GST_AUDIO_FORMAT_U32LE:
		270	case GST_AUDIO_FORMAT_U32BE:
		271	case GST_AUDIO_FORMAT_S24_32LE:
		272	case GST_AUDIO_FORMAT_S24_32BE:
		273	case GST_AUDIO_FORMAT_U24_32LE:
		274	case GST_AUDIO_FORMAT_U24_32BE:
275	case GST_AUDIO_FORMAT_S24LE:
276	case GST_AUDIO_FORMAT_S24BE:
277	case GST_AUDIO_FORMAT_U24LE:
278	case GST_AUDIO_FORMAT_U24BE:
279	break;
280	default:
281	GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
282	("Unsupported audio format"),
283	("format = %d", GST_AUDIO_INFO_FORMAT (&spec->info)));
284	return FALSE;
285	}
286	par.sig = GST_AUDIO_INFO_IS_SIGNED(&spec->info);
287	par.bits = GST_AUDIO_INFO_WIDTH(&spec->info);
288	par.bps = GST_AUDIO_INFO_DEPTH(&spec->info) / 8;
289	if (par.bps > 1)
290	par.le = GST_AUDIO_INFO_IS_LITTLE_ENDIAN(&spec->info);
291	if (par.bits < par.bps * 8)
292	par.msb = 0;
293	par.rate = GST_AUDIO_INFO_RATE(&spec->info);
294	if (sio->mode == SIO_PLAY)
295	par.pchan = GST_AUDIO_INFO_CHANNELS(&spec->info);
296	else
297	par.rchan = GST_AUDIO_INFO_CHANNELS(&spec->info);
298	par.round = par.rate / 1000000. * spec->latency_time;
299	par.appbufsz = par.rate / 1000000. * spec->buffer_time;
300
301	if (!sio_setpar (sio->hdl, &par)) {
302	GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
303	("Unsupported audio encoding"), (NULL));
304	return FALSE;
305	}
306	if (!sio_getpar (sio->hdl, &retpar)) {
307	GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
308	("Couldn't get audio device parameters"), (NULL));
309	return FALSE;
310	}
311	#if 0
312	GST_DEBUG ("format = %s, "
313	"requested: sig = %d, bits = %d, bps = %d, le = %d, msb = %d, "
314	"rate = %d, pchan = %d, round = %d, appbufsz = %d; "
315	"returned: sig = %d, bits = %d, bps = %d, le = %d, msb = %d, "
316	"rate = %d, pchan = %d, round = %d, appbufsz = %d, bufsz = %d",
317	GST_AUDIO_INFO_NAME(&spec->info),
318	par.sig, par.bits, par.bps, par.le, par.msb,
319	par.rate, par.pchan, par.round, par.appbufsz,
320	retpar.sig, retpar.bits, retpar.bps, retpar.le, retpar.msb,
321	retpar.rate, retpar.pchan, retpar.round, retpar.appbufsz, retpar.bufsz);
322	#endif
323	if (par.bits != retpar.bits \|\|
324	par.bps != retpar.bps \|\|
325	par.rate != retpar.rate \|\|
326	(sio->mode == SIO_PLAY && par.pchan != retpar.pchan) \|\|
327	(sio->mode == SIO_REC && par.rchan != retpar.rchan) \|\|
328	(par.bps > 1 && par.le != retpar.le) \|\|
329	(par.bits < par.bps * 8 && par.msb != retpar.msb)) {
330	GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
331	("Audio device refused requested parameters"), (NULL));
332	return FALSE;
333	}
334
335	nchannels = (sio->mode == SIO_PLAY) ? retpar.pchan : retpar.rchan;
336	spec->segsize = retpar.round * retpar.bps * nchannels;
337	spec->segtotal = retpar.bufsz / retpar.round;
338	sio->bpf = retpar.bps * nchannels;
339	sio->delay = 0;
340	sio_onmove (sio->hdl, gst_sndio_cb, sio);
341
342	if (!sio_start (sio->hdl)) {
343	GST_ELEMENT_ERROR (sio->obj, RESOURCE, OPEN_READ_WRITE,
344	("Could not start sndio"), (NULL));
345	return FALSE;
346	}
347	return TRUE;
348	}
349
350	gboolean
351	gst_sndio_unprepare (struct gstsndio *sio)
352	{
353	if (sio->hdl)
354	sio_stop (sio->hdl);
355	return TRUE;
356	}
357
358	void
359	gst_sndio_set_property (struct gstsndio *sio, guint prop_id,
360	const GValue * value, GParamSpec * pspec)
361	{
362	switch (prop_id) {
363	case PROP_DEVICE:
364	g_free (sio->device);
365	sio->device = g_value_dup_string (value);
366	break;
367	case PROP_VOLUME:
368	sio_setvol (sio->hdl, g_value_get_double (value) * SIO_MAXVOL);
369	break;
370	case PROP_MUTE:
371	if (g_value_get_boolean (value))
372	sio_setvol (sio->hdl, 0);
373	break;
374	default:
375	break;
376	}
377	}
378
379	void
380	gst_sndio_get_property (struct gstsndio *sio, guint prop_id,
381	GValue * value, GParamSpec * pspec)
382	{
383	switch (prop_id) {
384	case PROP_DEVICE:
385	g_value_set_string (value, sio->device);
386	break;
387	case PROP_VOLUME:
388	g_value_set_double (value, (gdouble)sio->volume / SIO_MAXVOL);
389	break;
390	case PROP_MUTE:
391	g_value_set_boolean (value, (sio->volume == 0));
392	break;
393	default:
394	G_OBJECT_WARN_INVALID_PROPERTY_ID (sio->obj, prop_id, pspec);
395	}
396	}




/*
 * Copyright (C) 2012 Alexandre Ratchov <alex@caoua.org>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
 * copyright notice and this permission notice appear in all copies.
 *
 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
#ifndef __GST_SNDIO_H__
#define __GST_SNDIO_H__

#include <sndio.h>
#include <gst/gst.h>
#include <gst/audio/gstaudiosink.h>
#include <gst/audio/gstaudiosrc.h>
#include <gst/audio/streamvolume.h>

enum
{
  PROP_0,
  PROP_DEVICE,
  PROP_VOLUME,
  PROP_MUTE
};

#define GST_SNDIO_CAPS_STRING					\
	"audio/x-raw, "						\
        "format = (string) { "					\
		     "S8, U8, "					\
		     "S16LE, S16BE, U16LE, U16BE, "		\
		     "S32LE, S32BE, U32LE, U32BE, "		\
		     "S24_32LE, S24_32BE, U24_32LE, "		\
		     "U24_32BE, S24LE, S24BE, U24LE, U24BE "	\
	"}, "							\
        "layout = (string) interleaved, "			\
        "rate = (int) [ 8000, 192000 ], "			\
        "channels = (int) [1, 16]"

/*
 * data common to src and sink
 */
struct gstsndio {
    struct sio_hdl *hdl;
    gchar *device;
    gint mode;
    gint bpf;		/* bytes per frame */
    gint delay;		/* bytes stored in the audio fifo */
    guint volume;	/* volume level */
    GstCaps *cur_caps;  /* saved capabilities of opened device */
    GObject *obj;	/* for logging */
};

#define GST_SNDIO_DELAY(s) ((s)->delay / (s)->bpf)

void gst_sndio_init (struct gstsndio *sio, GObject *obj);
void gst_sndio_finalize (struct gstsndio *sio);
GstCaps *gst_sndio_getcaps (struct gstsndio *sio, GstCaps * filter);
gboolean gst_sndio_open (struct gstsndio *sio, gint mode);
gboolean gst_sndio_close (struct gstsndio *sio);
gboolean gst_sndio_prepare (struct gstsndio *sio, GstAudioRingBufferSpec *spec);
gboolean gst_sndio_unprepare (struct gstsndio *sio);
void gst_sndio_set_property (struct gstsndio *sio, guint prop_id,
     const GValue * value, GParamSpec * pspec);
void gst_sndio_get_property (struct gstsndio *sio, guint prop_id,
     GValue * value,  GParamSpec * pspec);

int gst_sndio_setpar(gpointer sio, GstAudioRingBufferSpec * spec,
     int mode, struct sio_hdl *hdl);
GstCaps *gst_sndio_caps (gpointer sio, int mode, struct sio_hdl *hdl);

#endif




--- build.gradle.orig	2018-12-10 16:30:22 UTC
+++ build.gradle
@@ -253,6 +253,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")

 
 // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified,
 // 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)
 
 // COMPILE_PANGO specifies whether to build javafx_font_pango.

 ext.IS_COMPILE_PANGO = Boolean.parseBoolean(COMPILE_PANGO)
 
 // COMPILE_HARFBUZZ specifies whether to use Harfbuzz.
@@ -344,7 +345,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_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.105.3.v20170228-0512" :
+    IS_BSD ? "/usr/local/share/java/classes/swt-devel.jar" : ""
 
 // Build javadocs only if BUILD_JAVADOC=true
 defineProperty("BUILD_JAVADOC", "false")
@@ -404,6 +406,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.
@@ -444,7 +452,7 @@ defineProperty("RELEASE_MILESTONE", jfxReleaseMileston
 // 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
@@ -551,7 +559,7 @@ void fetchExternalTools(String configName, List packag
                 def File pkgdir = file("$destdir/$basename")
 
                 if (pkgname.endsWith(".tgz")) {

                         // use native tar to support symlinks
                         pkgdir.mkdirs()
                         exec {
@@ -676,7 +684,7 @@ compileTargets { t ->
     if (!targetProperties.containsKey('includeMonocle')) targetProperties.includeMonocle = false
     if (!targetProperties.containsKey('includeEGL')) targetProperties.includeEGL = false
 

 
     // This value is used to under ./build/${sdkDirName} to allow for
     // 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_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 {

         if (BUILD_CLOSED && DO_JCOV)  {
             testCompile name: "jcov"
         }
@@ -1303,12 +1312,15 @@ project(":graphics") {
 
     dependencies {
         compile project(":base"), BUILD_SRC

     }
 
     // Create a single "native" task which will depend on all the individual native tasks for graphics
@@ -1599,9 +1611,7 @@ project(":graphics") {
                 copy {
                     into libsDir
                     from f.getParentFile()
-                    include "**/antlr-3.1.3.jar"
-                    include "**/stringtemplate-3.2.jar"
-                    include "**/antlr-runtime-3.1.3.jar"
+                    include "**/antlr-3.5.2-complete.jar"
                     includeEmptyDirs = false
                 }
                 // Have to rename the swt jar because it is some platform specific name but
         description = "Generates JNI Headers for Decora SSE Natives"
         source file("$buildDir/classes/jsl-decora")
-        source file("$buildDir/classes/main")
+        source file("$buildDir/classes/java/main")
         include("com/sun/scenario/effect/impl/sw/sse/*");
-        classpath = files("$buildDir/classes/main", "$buildDir/classes/jsl-decora")
+        classpath = files("$buildDir/classes/java/main", "$buildDir/classes/jsl-decora")
         output = file("$buildDir/generated-src/headers/jsl-decora")
     }
 
@@ -1602,9 +1614,7 @@ project(":graphics") {
             copy {
                 into libsDir
                 from f.getParentFile()
-                include "**/antlr-3.1.3.jar"
-                include "**/stringtemplate-3.2.jar"
-                include "**/antlr-runtime-3.1.3.jar"
+                include "**/antlr-3.5.2-complete.jar"
                 includeEmptyDirs = false
             }
             // Have to rename the swt jar because it is some platform specific name but
@@ -1651,7 +1661,7 @@ project(":controls") {
             javaexec {
                 executable = JAVA
                 workingDir = "modules/controls"
-                classpath files("$buildDir/classes/main",
+                classpath files("$buildDir/classes/java/main",
                         project(":graphics").sourceSets.main.output,
                         project(":base").sourceSets.main.output)
                 main = "com.sun.javafx.css.parser.Css2Bin"
@@ -1688,7 +1698,11 @@ project(":swt") {
     }
     dependencies {

     }
 }
 
@@ -1794,7 +1808,7 @@ project(":fxpackager") {
     }
 
     dependencies {

     }
 
     // When producing the jar, we need to relocate a few class files
@@ -2055,23 +2069,6 @@ project(":fxpackager") {
         description = "Creates the packager.jar"
         archiveName = "packager.jar";
         includeEmptyDirs = false
-        from("$buildDir/classes/main");
+        from("$buildDir/classes/java/main");
         from("$buildDir/resources/main");
         include('jdk/packager/**')
 
@@ -2048,21 +2062,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 antLib = new File(libsDir, "ant-1.8.2.jar")
-            libsDir.mkdirs();
-            for (File f : configurations.compile.files) {
-                copy {
-                    into libsDir
-                    from f.getParentFile()
-                    include "**/ant-1.8.2.jar"
-                    includeEmptyDirs = false
-                }
-            }
-        }
-    }

     task packagerFakeJar(type: Jar) {
         dependsOn compileTestJava
         from compileTestJava.destinationDir
@@ -2250,7 +2247,7 @@ project(":media") {
 
             doLast {
                 exec {

                     args("JAVA_HOME=${JDK_HOME}", "GENERATED_HEADERS_DIR=${generatedHeadersDir}",
                          "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=jfxmedia",
                          "COMPILE_PARFAIT=${compileParfait}")
@@ -2260,7 +2257,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}")

                             args(IS_64 ? "ARCH=x64" : "ARCH=x32")
                         }
 
@@ -2282,7 +2279,7 @@ project(":media") {
                 enabled = IS_COMPILE_MEDIA
                 doLast {
                     exec {

                         args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=gstreamer-lite")
 
                         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}")

                                 args(IS_64 ? "ARCH=x64" : "ARCH=x32")
                             }
                         }
@@ -2311,7 +2308,7 @@ project(":media") {
 
                 doLast {
                     exec {

                         args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=fxplugins",
                              "ON2_SRCDIR=${project.ext.ON2_SRCDIR}", "ON2_LIB=${project.ext.ON2_LIB}")
 
@@ -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}")

                                 args(IS_64 ? "ARCH=x64" : "ARCH=x32")
                             }
                         }
@@ -2338,7 +2335,7 @@ project(":media") {
 
             buildNative.dependsOn buildPlugins
 

                 def buildAVPlugin = task( "buildAVPlugin", dependsOn: [buildPlugins]) {
                     enabled = IS_COMPILE_MEDIA
 
@@ -2349,7 +2346,7 @@ project(":media") {
                                 File dir = file(libavDir)
                                 if (dir.exists()) {
                                     exec {

                                         args("CC=${mediaProperties.compiler}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
                                              "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}",
                                              "SUFFIX=", IS_64 ? "ARCH=x64" : "ARCH=x32")
@@ -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}",
@@ -2373,7 +2370,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/${t.name}/avplugin")
                                 args("CC=${mediaProperties.compiler}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
                                      "BASE_NAME=avplugin", IS_64 ? "ARCH=x64" : "ARCH=x32")
                             }
@@ -2423,7 +2420,7 @@ project(":media") {
                     doLast {
                         exec {
                             environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT)

                             args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite",
                                  IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.glibRcFile}")
                         }
@@ -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}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
                         }
@@ -2562,7 +2559,7 @@ project(":web") {
 
     task generateHeaders(dependsOn: compileJava) {
         doLast {
-            def classpath = files("$buildDir/classes/main",
+            def classpath = files("$buildDir/classes/java/main",
                                   project(":graphics").sourceSets.main.output.classesDir)
             def dest = file("$buildDir/generated-src/headers");
             mkdir dest;
@@ -2525,7 +2524,7 @@ project(":web") {
 
     compileTargets { t ->
         def targetProperties = project.rootProject.ext[t.upper]
         def webkitProperties = targetProperties.webkit
-        def classifier = (t.name != "linux" && t.name != "win") ? t.name :
+        def classifier = (t.name != "linux" && t.name != "bsd" && t.name != "win") ? t.name :
                           IS_64 ? "${t.name}-amd64" : "${t.name}-i586"
 
         def webkitOutputDir = cygpath("$buildDir/${t.name}")
@@ -2638,6 +2635,9 @@ project(":web") {
                     }
                 }
 
                     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,
                         "--cmakeargs=${cmakeArgs}")
@@ -3132,7 +3132,7 @@ compileTargets { t ->
         archiveName = "drt.jar"
         destinationDir = file("$buildDir/test")
-        from "$buildDir/classes/main"
+        from "$buildDir/classes/java/main"
         include drtClasses
     }
     if (IS_COMPILE_WEBKIT) {
@@ -2886,22 +2888,22 @@ compileTargets { t ->
         description = "Creates the jfxrt.jar for the $t.name target"
         archiveName = "build/${sdkDirName}/rt/lib/ext/jfxrt.jar";
         includeEmptyDirs = false
-        from("modules/base/build/classes/main",
+        from("modules/base/build/classes/java/main",
              "modules/base/build/resources/main",
-             "modules/builders/build/classes/main",
-             "modules/graphics/build/classes/main",
+             "modules/builders/build/classes/java/main",
+             "modules/graphics/build/classes/java/main",
              "modules/graphics/build/resources/main",
-             "modules/controls/build/classes/main",
+             "modules/controls/build/classes/java/main",
              "modules/controls/build/resources/main",
-             "modules/fxml/build/classes/main",
+             "modules/fxml/build/classes/java/main",
              "modules/fxml/build/resources/main",
              "modules/graphics/build/classes/jsl-decora",
              "modules/graphics/build/resources/jsl-decora",
              "modules/graphics/build/classes/jsl-prism",
              "modules/graphics/build/resources/jsl-prism",
-             "modules/media/build/classes/main",
+             "modules/media/build/classes/java/main",
              "modules/media/build/resources/main")
-        if (COMPILE_SWING) from ("modules/swing/build/classes/main", "modules/swing/build/resources/main")
+        if (COMPILE_SWING) from ("modules/swing/build/classes/java/main", "modules/swing/build/resources/main")
 
         if (!IS_MAC) {
             exclude ("modules/media/build/classes/main/com/sun/media/jfxmediaimpl/platform/osx/**",
@@ -2966,7 +2968,7 @@ compileTargets { t ->
                   "modules/web/build/resources/ios",
                   "modules/extensions/build/classes/ios")
         } else {
-            from ("modules/web/build/classes/main", "modules/web/build/resources/main")
+            from ("modules/web/build/classes/java/main", "modules/web/build/resources/main")
         }
 
         exclude("**/javafx/embed/swt/**")
@@ -3007,8 +3009,8 @@ compileTargets { t ->
         description = "Creates the jfxswt.jar for the $t.name target"
         archiveName = "build/${sdkDirName}/rt/lib/jfxswt.jar";
         includeEmptyDirs = false
-        from("modules/swt/build/classes/main");
-        from("modules/builders/build/classes/main");
+        from("modules/swt/build/classes/java/main");
+        from("modules/builders/build/classes/java/main");
         include("**/javafx/embed/swt/**")
         exclude("**/*.java");  // Builder java files are in build/classes and should be excluded
 
@@ -3029,7 +3031,7 @@ compileTargets { t ->
         description = "Creates the javafx-mx.jar"
         archiveName = "build/${sdkDirName}/lib/javafx-mx.jar";
         includeEmptyDirs = false
-        from "modules/jmx/build/classes/main"
+        from "modules/jmx/build/classes/java/main"
         from "modules/jmx/build/resources/main"
         dependsOn project(":jmx").assemble
     }
@@ -3084,7 +3086,7 @@ compileTargets { t ->
                         // OSX media natives
                         [ "jfxmedia_qtkit", "jfxmedia_avf" ].each { name ->
                             from ("modules/media/build/native/${t.name}/${mediaBuildType}/${library(name)}") }
-                    } else if (t.name == "linux") {
+                    } else if (t.name == "linux" || t.name == "bsd") {
                         from("modules/media/build/native/${t.name}/${mediaBuildType}") { include "libavplugin*.so" }
                     }
                 } else {
@@ -3145,7 +3145,7 @@ compileTargets { t ->
                         // copy libjfxmedia_{avf,qtkit}.dylib if they exist
                         [ "jfxmedia_qtkit", "jfxmedia_avf" ].each { name ->
                             from ("$LIBRARY_STUB/${library(name)}") }
-                    } else if (t.name == "linux") {
+                    } else if (t.name == "linux" || t.name == "bsd") {
                         from(LIBRARY_STUB) { include "libavplugin*.so" }
                     }
                 }
@@ -3207,7 +3207,7 @@ compileTargets { t ->
             }
 
             // Copy over the javapackager executable

                 copy {
                     from "modules/fxpackager/build/javapackager"
                     into "build/${sdkDirName}/bin"
@@ -3264,6 +3264,7 @@ ext.JFXRT_CP =
             "modules/web/build/classes/java/main",
         project(":swing").sourceSets.main.output.classesDir, //NOTE - used by 3Dviewer
         project(":builders").sourceSets.main.output.classesDir,
-            "modules/media/build/classes/main",
-            "modules/web/build/classes/main",
+            "modules/media/build/classes/java/main",
+            "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)
     }




--- modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java.orig	2019-07-22 19:05:36 UTC
+++ modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java
@@ -362,7 +362,7 @@ public abstract class TextInputControlBehavior<T exten
 
     protected void selectNextWord() {
         TextInputControl textInputControl = getControl();
-        if (isMac() || isLinux()) {
+        if (isMac() || isLinux() || isFreeBSD()) {
             textInputControl.selectEndOfNextWord();
         } else {
             textInputControl.selectNextWord();
@@ -401,7 +401,7 @@ public abstract class TextInputControlBehavior<T exten
 
     protected void nextWord() {
         TextInputControl textInputControl = getControl();
-        if (isMac() || isLinux()) {
+        if (isMac() || isLinux() || isFreeBSD()) {
             textInputControl.endOfNextWord();
         } else {
             textInputControl.nextWord();

Line 0 Link Here

(-)java/openjfx8-devel/files/patch-modules_controls_src_main_java_com_sun_javafx_scene_control_behavior_TextInputControlBindings.java (+11 lines)
	1	--- modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBindings.java.orig 2019-07-22 19:06:01 UTC
	2	+++ modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBindings.java
	3	@@ -134,7 +134,7 @@ public class TextInputControlBindings {
	4	BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED, "SelectRightWord").ctrl().shift());
	5	BINDINGS.add(new KeyBinding(A, KEY_PRESSED, "SelectAll").ctrl());
	6	BINDINGS.add(new KeyBinding(BACK_SLASH, KEY_PRESSED, "Unselect").ctrl());
	7	- if (PlatformUtil.isLinux()) {
	8	+ if (PlatformUtil.isLinux() \|\| PlatformUtil.isFreeBSD()) {
	9	BINDINGS.add(new KeyBinding(Z, KEY_PRESSED, "Undo").ctrl());
	10	BINDINGS.add(new KeyBinding(Z, KEY_PRESSED, "Redo").ctrl().shift());
	11	} else { // Windows




http://pkgs.fedoraproject.org/cgit/rpms/openjfx.git/tree/0001-Fix-wait-call-in-PosixPlatform.patch

--- modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp.orig	2018-12-10 16:30:22 UTC
+++ modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
@@ -231,13 +231,7 @@ bool PosixProcess::Wait() {
     int status = 0;
     pid_t wpid = 0;
 
-    //TODO Use waitpid instead of wait
-#ifdef LINUX
-    wait(&status);
-#endif
-#ifdef MAC
     wpid = wait(&status);

Line 0 Link Here

(-)java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_font_LogicalFont.java (+11 lines)
	1	--- modules/graphics/src/main/java/com/sun/javafx/font/LogicalFont.java.orig 2019-07-22 19:00:13 UTC
	2	+++ modules/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;

Lines 1-4 Link Here

(-)java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_font_PrismFontFactory.java (-2 / +2 lines)
1	--- modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java.orig 2017-09-08 16:56:55 UTC	1	--- modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java.orig 2018-12-10 16:30:22 UTC
2	+++ modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java	2	+++ modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java
3	@@ -51,6 +51,7 @@ public abstract class PrismFontFactory implements Font	3	@@ -51,6 +51,7 @@ public abstract class PrismFontFactory implements Font
4	public static final boolean debugFonts;	4	public static final boolean debugFonts;
Lines 39-45 Link Here
39	}	39	}
40	}	40	}
41	- if (fontResource == null && isLinux) {	41	- if (fontResource == null && isLinux) {
42	+ if (fontResource == null && isLinux && isFreeBSD) {	42	+ if (fontResource == null && (isLinux \|\| isFreeBSD)) {
43	String path = FontConfigManager.getDefaultFontPath();	43	String path = FontConfigManager.getDefaultFontPath();
44	if (path != null) {	44	if (path != null) {
45	fontResource = createFontResource(jreDefaultFontLC,	45	fontResource = createFontResource(jreDefaultFontLC,




--- modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java.orig	2019-07-22 19:03:56 UTC
+++ modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java
@@ -317,13 +317,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.impl_getChar().toUpperCase().charAt(0)
                         : code.impl_getCode();
                 glassSubMenuItem.setShortcut(finalCode, modifier);
-            } else if (PlatformUtil.isLinux()) {
+            } else if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) {
                 String lower = code.impl_getChar().toLowerCase();
                 if ((modifier & KeyEvent.MODIFIER_CONTROL) != 0) {
                     glassSubMenuItem.setShortcut(lower.charAt(0), modifier);
@@ -352,14 +352,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/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_quantum_WindowStage.java (+11 lines)
	1	--- modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java.orig 2019-07-22 19:05:13 UTC
	2	+++ modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java
	3	@@ -432,7 +432,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/graphics/src/main/java/com/sun/prism/impl/PrismSettings.java.orig	2018-12-10 16:30:22 UTC
+++ modules/graphics/src/main/java/com/sun/prism/impl/PrismSettings.java
@@ -212,6 +212,8 @@ public final class PrismSettings {
                     tryOrderArr = new String[] { "es2" };

             } else {
                 tryOrderArr = new String[] { "sw" };
             }
@@ -221,7 +223,7 @@ public final class PrismSettings {
 
         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/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_GlassApplication.cpp (+10 lines)
	1	--- modules/graphics/src/main/native-glass/gtk/GlassApplication.cpp.orig 2019-07-22 07:18:58 UTC
	2	+++ modules/graphics/src/main/native-glass/gtk/GlassApplication.cpp
	3	@@ -101,6 +101,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	}

Lines 1-10 Link Here

(-)java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_glass__general.cpp (-10 lines)
1	--- modules/graphics/src/main/native-glass/gtk/glass_general.cpp.orig 2017-09-08 16:56:55 UTC
2	+++ modules/graphics/src/main/native-glass/gtk/glass_general.cpp
3	@@ -372,6 +372,7 @@ JNI_OnLoad(JavaVM jvm, void reserved)
4
5	gdk_threads_enter();
6	gtk_init(NULL, NULL);
7	+ gdk_threads_leave();
8
9	return JNI_VERSION_1_6;
10	}

Lines 1-4 Link Here

(-)java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h (-2 / +2 lines)
1	--- modules/graphics/src/main/native-glass/gtk/glass_window.h.orig 2017-09-08 16:56:55 UTC	1	--- modules/graphics/src/main/native-glass/gtk/glass_window.h.orig 2018-12-10 16:30:22 UTC
2	+++ modules/graphics/src/main/native-glass/gtk/glass_window.h	2	+++ modules/graphics/src/main/native-glass/gtk/glass_window.h
3	@@ -365,7 +365,7 @@ class WindowContextChild: public WindowContextBase { (	3	@@ -365,7 +365,7 @@ class WindowContextChild: public WindowContextBase { (
4	class WindowContextTop: public WindowContextBase {	4	class WindowContextTop: public WindowContextBase {
Lines 7-14 Link Here
7	- struct WindowContext *owner;	7	- struct WindowContext *owner;
8	+ WindowContext *owner;	8	+ WindowContext *owner;
9	WindowGeometry geometry;	9	WindowGeometry geometry;
10	int stale_config_notifications;
11	struct _Resizable{// we can't use set/get gtk_window_resizable function	10	struct _Resizable{// we can't use set/get gtk_window_resizable function
		11	_Resizable(): request(REQUEST_NONE), value(true), prev(false),
12	@@ -455,4 +455,3 @@ class EventsCounterHelper { (public)	12	@@ -455,4 +455,3 @@ class EventsCounterHelper { (public)
13	};	13	};
14		14

Line 0 Link Here

(-)java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_launcher.c (+10 lines)
	1	--- modules/graphics/src/main/native-glass/gtk/launcher.c.orig 2019-07-22 07:33:51 UTC
	2	+++ modules/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/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_wrapped.c (+10 lines)
	1	--- modules/graphics/src/main/native-glass/gtk/wrapped.c.orig 2019-07-22 07:33:14 UTC
	2	+++ modules/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




--- modules/media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java.orig	2019-07-22 19:01:46 UTC
+++ modules/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/openjfx8-devel/files/patch-modules_media_src_main_java_com_sun_media_jfxmediaimpl_NativeMediaManager.java (+11 lines)
	1	--- modules/media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java.orig 2019-07-22 19:02:57 UTC
	2	+++ modules/media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
	3	@@ -108,7 +108,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	}
	11

Line 0 Link Here

(-)java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_gstreamer_gst_gstregistry.c (+11 lines)
	1	--- modules/media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c.orig 2019-07-23 04:09:55 UTC
	2	+++ modules/media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
	3	@@ -143,7 +143,7 @@ static const int AVCODEC_LIBAV_EXPLICIT_VERSIONS[] = {
	4	// For ffmpeg (libavcodec-ffmpeg.so)
	5	static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 };
	6	// For libav or ffmpeg (libavcodec.so)
	7	-static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57 };
	8	+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 58, 57 };
	9
	10	/*
	11	* Callback passed to dl_iterate_phdr(): finds the path of




--- modules/media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h.orig	2019-07-22 15:39:06 UTC
+++ modules/media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h
@@ -264,7 +264,7 @@
 #define HAVE_SYS_POLL_H 1
 
 /* Define to 1 if you have the <sys/prctl.h> header file. */
-#define HAVE_SYS_PRCTL_H 1
+#undef HAVE_SYS_PRCTL_H
 
 /* Define to 1 if you have the <sys/socket.h> header file. */
 #define HAVE_SYS_SOCKET_H 1
@@ -430,4 +430,4 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
-#define DISABLE_ORC
\ No newline at end of file
+#define DISABLE_ORC




--- modules/media/src/main/native/gstreamer/projects/bsd/avplugin/Makefile.orig	2019-07-22 15:50:27 UTC
+++ modules/media/src/main/native/gstreamer/projects/bsd/avplugin/Makefile
@@ -43,19 +43,23 @@ else
     CFLAGS += -g -Wall
 endif
 
+PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
+PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
+
 INCLUDES= -I../../../plugins                          \
           -I../../../plugins/av                       \
           -I../../../gstreamer-lite/gstreamer         \
           -I../../../gstreamer-lite/gstreamer/libs    \
           -I$(GLIB_DIR)                               \
           -I$(GLIB_DIR)/glib                          \
-          -I$(GLIB_DIR)/gmodule
+          -I$(GLIB_DIR)/gmodule \
+          $(PACKAGES_INCLUDES)
 
 LDFLAGS = -L$(BUILD_DIR)    \
           -z relro          \
           -lgstreamer-lite  \
-          -lglib-lite  \
-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
+          $(PACKAGES_LIBS) \
+          -Wl,--gc-sections
 
 ifneq ($(strip $(LIBAV_DIR)),)
 INCLUDES += -I$(LIBAV_DIR)/include




--- modules/media/src/main/native/gstreamer/projects/bsd/fxplugins/Makefile.orig	2019-07-22 15:43:47 UTC
+++ modules/media/src/main/native/gstreamer/projects/bsd/fxplugins/Makefile
@@ -45,17 +45,21 @@ else
 endif
 
 
+PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
+PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
+
 INCLUDES = -I$(SRCBASE_DIR) \
 	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
            -I../../../gstreamer-lite/gstreamer       \
            -I../../../gstreamer-lite/gstreamer/libs  \
            -I$(GLIB_DIR)                             \
            -I$(GLIB_DIR)/glib                        \
-           -I$(GLIB_DIR)/gmodule
+           -I$(GLIB_DIR)/gmodule \
+           $(PACKAGES_INCLUDES)
 
-LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
-          -z relro \
-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
+LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite \
+          -z relro -Wl,--gc-sections \
+          $(PACKAGES_LIBS)
 
 ifeq ($(ARCH), x32)
     CFLAGS += -m32




--- modules/media/src/main/native/gstreamer/projects/bsd/gstreamer-lite/Makefile.orig	2019-07-22 07:19:58 UTC
+++ modules/media/src/main/native/gstreamer/projects/bsd/gstreamer-lite/Makefile
@@ -31,7 +31,7 @@ DIRLIST = gstreamer/gst \
           gst-plugins-base/gst/volume \
           gst-plugins-good/gst/audioparsers \
           gst-plugins-good/gst/isomp4 \

           gst-plugins-good/gst/audiofx \
           gst-plugins-good/gst/equalizer \
           gst-plugins-good/gst/spectrum \
@@ -80,13 +80,11 @@ INCLUDES = -I$(BASE_DIR)/plugins                      
            -I$(GLIB_DIR)/glib                             \
            -I$(GLIB_DIR)/gmodule           
 
-PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa)
-PACKAGES_LIBS := $(shell pkg-config --libs alsa)
+PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
+PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
+ 
+LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) -l sndio -z relro
 
-LDFLAGS = -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \
-          -z relro \
-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
-
 ifeq ($(ARCH), x32)
     CFLAGS += -m32
     LDFLAGS += -m32
@@ -264,10 +262,8 @@ SOURCES = \
             gstreamer/plugins/elements/gsttypefindelement.c \
             gst-plugins-base/gst/volume/gstvolume.c \
             gst-plugins-base/gst/volume/gstvolumeorc-dist.c \
-            gst-plugins-base/ext/alsa/gstalsaplugin.c \
-            gst-plugins-base/ext/alsa/gstalsa.c \
-            gst-plugins-base/ext/alsa/gstalsadeviceprobe.c \
-            gst-plugins-base/ext/alsa/gstalsasink.c \
+            gst-plugins-base/ext/bsdaudio/gstbsdaudio.c \
+            gst-plugins-base/ext/bsdaudio/bsdaudiosink.c \
             projects/plugins/gstplugins-lite.c
 
 OBJ_DIRS = $(addprefix $(OBJBASE_DIR)/,$(DIRLIST))

Lines 1-4 Link Here

(-)java/openjfx8-devel/files/patch-modules_media_src_main_native_jfxmedia_projects_bsd_Makefile (-2 / +26 lines)
1	--- modules/media/src/main/native/jfxmedia/projects/bsd/Makefile.orig 2017-10-03 19:30:23 UTC	1	--- modules/media/src/main/native/jfxmedia/projects/bsd/Makefile.orig 2019-07-22 15:35:34 UTC
2	+++ modules/media/src/main/native/jfxmedia/projects/bsd/Makefile	2	+++ modules/media/src/main/native/jfxmedia/projects/bsd/Makefile
3	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
4	#	4	#
Lines 15-22 Link Here
15	-D_GNU_SOURCE \	15	-D_GNU_SOURCE \
16	-DGST_REMOVE_DEPRECATED \	16	-DGST_REMOVE_DEPRECATED \
17	-DGST_DISABLE_GST_DEBUG \	17	-DGST_DISABLE_GST_DEBUG \
18	@@ -46,7 +47,7 @@ ifdef HOST_COMPILE	18	@@ -34,6 +35,9 @@ CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sectio
		19	BASE_INCLUDES = -I$(SRCBASE_DIR) \
		20	-I$(GENERATED_HEADERS_DIR)
19		21
		22	+PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
		23	+PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
		24	+
		25	ifdef HOST_COMPILE
		26	GSTREAMER_LITE_DIR = ../../../gstreamer/gstreamer-lite
		27	GLIB_LITE_DIR = ../../../gstreamer/3rd_party/glib/glib-2.56.1
		28	@@ -49,17 +53,17 @@ ifdef HOST_COMPILE
		29
20	INCLUDES = $(BASE_INCLUDES) \	30	INCLUDES = $(BASE_INCLUDES) \
21	-I$(JAVA_HOME)/include \	31	-I$(JAVA_HOME)/include \
22	- -I$(JAVA_HOME)/include/linux \	32	- -I$(JAVA_HOME)/include/linux \
Lines 24-26 Link Here
24	-I$(GSTREAMER_LITE_DIR)/gstreamer \	34	-I$(GSTREAMER_LITE_DIR)/gstreamer \
25	-I$(GSTREAMER_LITE_DIR)/gst-plugins-base/gst-libs \	35	-I$(GSTREAMER_LITE_DIR)/gst-plugins-base/gst-libs \
26	-I$(GSTREAMER_LITE_DIR)/gstreamer/libs \	36	-I$(GSTREAMER_LITE_DIR)/gstreamer/libs \
		37	-I$(GLIB_LITE_DIR)/ \
		38	-I$(GLIB_LITE_DIR)/glib \
		39	- -I$(GLIB_LITE_DIR)/gmodule
		40	+ -I$(GLIB_LITE_DIR)/gmodule \
		41	+ $(PACKAGES_INCLUDES)
		42
		43	- LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
		44	- -z relro \
		45	- -static-libgcc -static-libstdc++ -Wl,--gc-sections
		46	+ LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite \
		47	+ -z relro $(PACKAGES_LIBS) -Wl,--gc-sections
		48	else
		49	CFLAGS += $(EXTRA_CFLAGS)
		50	INCLUDES = $(BASE_INCLUDES)




--- modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java.orig	2019-07-22 18:59:20 UTC
+++ modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java
@@ -995,7 +995,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);
@@ -1013,7 +1013,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/openjfx8-devel/files/patch-modules_swing_src_main_java_javafx_embed_swing_SwingNode.java (+11 lines)
	1	--- modules/swing/src/main/java/javafx/embed/swing/SwingNode.java.orig 2019-07-22 18:58:46 UTC
	2	+++ modules/swing/src/main/java/javafx/embed/swing/SwingNode.java
	3	@@ -860,7 +860,7 @@ public class SwingNode extends Node {
	4	SwingFXUtils.runOnFxThread(() -> {
	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	SwingNode swingNode = swingNodeRef.get();
	11	if (swingNode != null) {

Lines 1-8 Link Here

(-)java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_JavaScriptCore_PlatformJava.cmake (-8 lines)
1	--- modules/web/src/main/native/Source/JavaScriptCore/PlatformJava.cmake.orig 2017-09-08 16:56:55 UTC
2	+++ modules/web/src/main/native/Source/JavaScriptCore/PlatformJava.cmake
3	@@ -46,4 +46,4 @@ list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
4	${JDK_INCLUDE_DIRS}
5	)
6
7	-add_dependencies(WTF icudatagen)
8	+#add_dependencies(WTF icudatagen)

Lines 1-6 Link Here

(-)java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_CMakeLists.txt (-2 / +2 lines)
1	--- modules/web/src/main/native/Source/WTF/wtf/CMakeLists.txt.orig 2018-01-16 01:40:56 UTC	1	--- modules/web/src/main/native/Source/WTF/wtf/CMakeLists.txt.orig 2018-07-27 01:38:45 UTC
2	+++ modules/web/src/main/native/Source/WTF/wtf/CMakeLists.txt	2	+++ modules/web/src/main/native/Source/WTF/wtf/CMakeLists.txt
3	@@ -343,6 +343,7 @@ list(APPEND WTF_SOURCES	3	@@ -464,6 +464,7 @@ list(APPEND WTF_SOURCES
4	)	4	)
5	set(WTF_SYSTEM_INCLUDE_DIRECTORIES	5	set(WTF_SYSTEM_INCLUDE_DIRECTORIES
6	${ICU_INCLUDE_DIRS}	6	${ICU_INCLUDE_DIRS}

Lines 1-6 Link Here

(-)java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h (-2 / +2 lines)
1	--- modules/web/src/main/native/Source/WTF/wtf/Optional.h.orig 2018-03-23 23:53:57 UTC	1	--- modules/web/src/main/native/Source/WTF/wtf/Optional.h.orig 2018-12-10 16:30:22 UTC
2	+++ modules/web/src/main/native/Source/WTF/wtf/Optional.h	2	+++ modules/web/src/main/native/Source/WTF/wtf/Optional.h
3	@@ -295,12 +295,14 @@ struct nullopt_t	3	@@ -291,12 +291,14 @@ struct nullopt_t
4	constexpr nullopt_t nullopt{nullopt_t::init()};	4	constexpr nullopt_t nullopt{nullopt_t::init()};
5		5
6		6

Lines 1-10 Link Here

(-)java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_CMakeLists.txt (-10 lines)
1	--- modules/web/src/main/native/Source/WebCore/CMakeLists.txt.orig 2018-03-23 23:53:57 UTC
2	+++ modules/web/src/main/native/Source/WebCore/CMakeLists.txt
3	@@ -131,6 +131,7 @@ set(WebCore_INCLUDE_DIRECTORIES
4
5	set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
6	${ICU_INCLUDE_DIRS}
7	+ ${CMAKE_INSTALL_PREFIX}/include/libxml2
8	)
9
10	set(WebCore_IDL_INCLUDES




--- modules/web/src/main/native/Source/WebCore/PlatformJava.cmake.orig	2018-03-23 23:53:57 UTC
+++ modules/web/src/main/native/Source/WebCore/PlatformJava.cmake
@@ -188,8 +188,8 @@ elseif (APPLE)
 endif ()
 
 list(APPEND WebCore_LIBRARIES
-    XMLJava
-    XSLTJava
+    ${CMAKE_INSTALL_PREFIX}/lib/libxml2.so
+    ${CMAKE_INSTALL_PREFIX}/lib/libxslt.so
 )
 
 list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
@@ -225,7 +225,7 @@ set(WebCore_FORWARDING_HEADERS_FILES
 set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/java/RenderThemeJava.cpp)
 
 list(APPEND WebCore_LIBRARIES
-    SqliteJava
+    ${CMAKE_INSTALL_PREFIX}/lib/libsqlite3.so
     ${ICU_I18N_LIBRARIES}
     ${ICU_LIBRARIES}
 )




--- modules/web/src/main/native/Source/cmake/OptionsJava.cmake.orig	2018-12-10 16:30:22 UTC
+++ modules/web/src/main/native/Source/cmake/OptionsJava.cmake
@@ -26,14 +26,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")
     #### ICU ####
-    set(ICU_JAVA_COMMON_LIB icuuc)
-    set(ICU_I18N_LIBRARIES icui18n)
-    set(ICU_JAVA_DATA_LIB ${CMAKE_BINARY_DIR}/lib/libicudata.a)
+    set(ICU_JAVA_COMMON_LIB ${CMAKE_INSTALL_PREFIX}/lib/libicuuc.so)
+    set(ICU_I18N_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/libicui18n.so)
+    set(ICU_JAVA_DATA_LIB ${CMAKE_INSTALL_PREFIX}/lib/libicudata.so)
     #### ICU-END ####
 
-set(SQLITE_LIBRARIES SqliteJava)
-set(LIBXML2_LIBRARIES XMLJava)
-set(LIBXSLT_LIBRARIES XSLTJava)
 
 set(ICU_INCLUDE_DIRS
+    "${CMAKE_INSTALL_PREFIX}/include"
     "${THIRDPARTY_DIR}/icu/source/common"
     "${THIRDPARTY_DIR}/icu/source/i18n"
 )
 set(ICU_LIBRARIES ${ICU_JAVA_COMMON_LIB} ${ICU_JAVA_DATA_LIB})
-
-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/web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake.orig	2019-07-22 23:29:21 UTC
+++ modules/web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
@@ -176,10 +176,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

Lines 1-6 Link Here

(-)java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_TestRunner.cpp (-2 / +2 lines)
1	--- modules/web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp.orig 2018-01-16 01:40:56 UTC	1	--- modules/web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp.orig 2018-12-10 16:30:22 UTC
2	+++ modules/web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp	2	+++ modules/web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp
3	@@ -2400,7 +2400,7 @@ void TestRunner::runUIScript(JSContextRef context, JSS	3	@@ -2415,7 +2415,7 @@ void TestRunner::runUIScript(JSContextRef context, JSS
4	if (!m_UIScriptContext)	4	if (!m_UIScriptContext)
5	m_UIScriptContext = std::make_unique<WTR::UIScriptContext>(*this);	5	m_UIScriptContext = std::make_unique<WTR::UIScriptContext>(*this);
6		6




--- modules/web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt.orig	2019-07-22 18:32:25 UTC
+++ modules/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})
   install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/DumpRenderTreeJava.dll DESTINATION ${CMAKE_BINARY_DIR}/lib OPTIONAL)

Lines 1-11 Link Here

(-)java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_Scripts_webkitdirs.pm (-4 / +4 lines)
1	--- modules/web/src/main/native/Tools/Scripts/webkitdirs.pm.orig 2018-01-16 01:40:56 UTC	1	--- modules/web/src/main/native/Tools/Scripts/webkitdirs.pm.orig 2018-07-27 01:38:45 UTC
2	+++ modules/web/src/main/native/Tools/Scripts/webkitdirs.pm	2	+++ modules/web/src/main/native/Tools/Scripts/webkitdirs.pm
3	@@ -2061,7 +2061,7 @@ sub generateBuildSystemFromCMakeProject	3	@@ -2148,7 +2148,7 @@ sub generateBuildSystemFromCMakeProject
4	chdir($buildPath) or die;	4	chdir($buildPath) or die;
5		5
6	# We try to be smart about when to rerun cmake, so that we can have faster incremental builds.	6	# We try to be smart about when to rerun cmake, so that we can have faster incremental builds.
7	- my $willUseNinja = canUseNinja() && canUseNinjaGenerator();	7	- my $willUseNinja = canUseNinja();
8	+ my $willUseNinja = 0; # canUseNinja() && canUseNinjaGenerator();	8	+ my $willUseNinja = 0; # canUseNinja();
9	if (-e cmakeCachePath() && -e cmakeGeneratedBuildfile($willUseNinja)) {	9	if (-e cmakeCachePath() && -e cmakeGeneratedBuildfile($willUseNinja)) {
10	return 0;	10	return 0;
11	}	11	}




/*
 * Copyright (C) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
 * Copyright (C) 2012 Alexandre Ratchov <alex@caoua.org>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

#include "sndiosink.h"
#include <unistd.h>
#include <errno.h>

#define _(x) x

GST_DEBUG_CATEGORY_EXTERN (gst_sndio_debug);
#define GST_CAT_DEFAULT gst_sndio_debug

#define gst_sndiosink_parent_class parent_class
{
  PROP_0,
  PROP_HOST
};

static GstStaticPadTemplate sndiosink_factory =
    GST_STATIC_PAD_TEMPLATE ("sink",
	GST_PAD_SINK,
	GST_PAD_ALWAYS,
	GST_STATIC_CAPS (GST_SNDIO_CAPS_STRING)
        "endianness = (int) { 1234, 4321 }, "
        "signed = (boolean) { TRUE, FALSE }, "
        "width = (int) { 8, 16, 24, 32 }, "
        "depth = (int) { 8, 16, 24, 32 }, "
        "rate = (int) [ 8000, 192000 ], "
        "channels = (int) [ 1, 16 ] ")
    );

G_DEFINE_TYPE_WITH_CODE (GstSndioSink, gst_sndiosink, GST_TYPE_AUDIO_SINK,
	G_IMPLEMENT_INTERFACE (GST_TYPE_STREAM_VOLUME, NULL));

static void gst_sndiosink_finalize (GObject * object);
static GstCaps *gst_sndiosink_getcaps (GstBaseSink * bsink,
    GstCaps * filter);

static gboolean gst_sndiosink_open (GstAudioSink * asink);
static gboolean gst_sndiosink_close (GstAudioSink * asink);
static gboolean gst_sndiosink_prepare (GstAudioSink * asink,
    GstAudioRingBufferSpec * spec);
static gboolean gst_sndiosink_unprepare (GstAudioSink * asink);
static gint gst_sndiosink_write (GstAudioSink * asink, gpointer data,
    guint length);
static guint gst_sndiosink_delay (GstAudioSink * asink);
static void gst_sndiosink_reset (GstAudioSink * asink);

static void gst_sndiosink_set_property (GObject * object, guint prop_id,
    const GValue * value, GParamSpec * pspec);
static void gst_sndiosink_get_property (GObject * object, guint prop_id,
    GValue * value, GParamSpec * pspec);
static void gst_sndiosink_cb(void * addr, int delta);

GST_BOILERPLATE (GstSndioSink, gst_sndiosink, GstAudioSink, GST_TYPE_AUDIO_SINK);

static void
gst_sndiosink_init (GstSndioSink * sink)
{
  gst_sndio_init (&sink->sndio, G_OBJECT(sink));

  gst_element_class_set_details_simple (element_class,
    "Sndio audio sink", "Sink/Audio", "Plays audio through sndio",
    "Jacob Meuser <jakemsr@sdf.lonestar.org>");

  gst_element_class_add_pad_template (element_class,
      gst_static_pad_template_get (&sndio_sink_factory));
}

static void
gst_sndiosink_class_init (GstSndioSinkClass * klass)
{
  GObjectClass *gobject_class;
  GstBaseSinkClass *gstbasesink_class;
  GstBaseAudioSinkClass *gstbaseaudiosink_class;
  GstAudioSinkClass *gstaudiosink_class;

  gobject_class = (GObjectClass *) klass;
  gstbasesink_class = (GstBaseSinkClass *) klass;
  gstbaseaudiosink_class = (GstBaseAudioSinkClass *) klass;
  gstaudiosink_class = (GstAudioSinkClass *) klass;

  parent_class = g_type_class_peek_parent (klass);

  gobject_class->finalize = gst_sndiosink_finalize;

  gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_sndiosink_getcaps);

  gstaudiosink_class->open = GST_DEBUG_FUNCPTR (gst_sndiosink_open);
  gstaudiosink_class->close = GST_DEBUG_FUNCPTR (gst_sndiosink_close);
  gstaudiosink_class->prepare = GST_DEBUG_FUNCPTR (gst_sndiosink_prepare);
  gstaudiosink_class->unprepare = GST_DEBUG_FUNCPTR (gst_sndiosink_unprepare);
  gstaudiosink_class->write = GST_DEBUG_FUNCPTR (gst_sndiosink_write);
  gstaudiosink_class->delay = GST_DEBUG_FUNCPTR (gst_sndiosink_delay);
  gstaudiosink_class->reset = GST_DEBUG_FUNCPTR (gst_sndiosink_reset);

  gobject_class->set_property = gst_sndiosink_set_property;
  gobject_class->get_property = gst_sndiosink_get_property;

  /* default value is filled in the _init method */
  g_object_class_install_property (gobject_class, PROP_HOST,
      g_param_spec_string ("host", "Host",
          "Device or socket sndio will access", NULL, G_PARAM_READWRITE));
}

static void
gst_sndiosink_init (GstSndioSink * sndiosink, GstSndioSinkClass * klass)
{
  sndiosink->hdl = NULL;
  sndiosink->host = g_strdup (g_getenv ("AUDIODEVICE"));
}

static void
gst_sndiosink_finalize (GObject * object)
{
  GstSndioSink *sink = GST_SNDIOSINK (object);

  gst_sndio_finalize (&sink->sndio);
  g_free (sndiosink->host);

  G_OBJECT_CLASS (parent_class)->finalize (object);
}

static GstCaps *
gst_sndiosink_getcaps (GstBaseSink * bsink, GstCaps * filter)
{
  GstSndioSink *sink = GST_SNDIOSINK (bsink);

  return gst_sndio_getcaps (&sink->sndio, filter);

  /* no hdl, we're done with the template caps */
  if (sndiosink->cur_caps == NULL) {
    GST_LOG_OBJECT (sndiosink, "getcaps called, returning template caps");
    return NULL;
  }

  GST_LOG_OBJECT (sndiosink, "returning %" GST_PTR_FORMAT, sndiosink->cur_caps);

  return gst_caps_ref (sndiosink->cur_caps);
}

static gboolean
gst_sndiosink_open (GstAudioSink * asink)
{
  GstSndioSink *sink = GST_SNDIOSINK (asink);
  GstSndioSink *sndiosink;
  struct sio_par par;
  struct sio_cap cap;
  GArray *rates, *chans;
  GValue rates_v = { 0 };
  GValue chans_v = { 0 };
  GValue value = { 0 };
  struct sio_enc enc;
  struct sio_conf conf;
  int confs[SIO_NCONF];
  int rate, chan;
  int i, j, k;
  int nconfs;

  return gst_sndio_open (&sink->sndio, SIO_PLAY);

  GST_DEBUG_OBJECT (sndiosink, "open");

  /* conect */
  sndiosink->hdl = sio_open (sndiosink->host, SIO_PLAY, 0);

  if (sndiosink->hdl == NULL)
    goto couldnt_connect;

  /* Use sndio defaults as the only encodings, but get the supported
   * sample rates and number of channels.
   */

  if (!sio_getpar(sndiosink->hdl, &par))
    goto no_server_info;

  if (!sio_getcap(sndiosink->hdl, &cap))
    goto no_server_info;

  rates = g_array_new(FALSE, FALSE, sizeof(int));
  chans = g_array_new(FALSE, FALSE, sizeof(int));

  /* find confs that have the default encoding */
  nconfs = 0;
  for (i = 0; i < cap.nconf; i++) {
    for (j = 0; j < SIO_NENC; j++) {
      if (cap.confs[i].enc & (1 << j)) {
        enc = cap.enc[j];
        if (enc.bits == par.bits && enc.sig == par.sig && enc.le == par.le) {
            confs[nconfs] = i;
            nconfs++;
            break;
        }
      }
    }
  }

  /* find the rates and channels of the confs that have the default encoding */
  for (i = 0; i < nconfs; i++) {
    conf = cap.confs[confs[i]];
    /* rates */
    for (j = 0; j < SIO_NRATE; j++) {
      if (conf.rate & (1 << j)) {
        rate = cap.rate[j];
        for (k = 0; k < rates->len && rate; k++) {
          if (rate == g_array_index(rates, int, k))
            rate = 0;
        }
        /* add in ascending order */
        if (rate) {
          for (k = 0; k < rates->len; k++) {
            if (rate < g_array_index(rates, int, k)) {
              g_array_insert_val(rates, k, rate);
              break;
            }
          }
          if (k == rates->len)
            g_array_append_val(rates, rate);
        }
      }
    }
    /* channels */
    for (j = 0; j < SIO_NCHAN; j++) {
      if (conf.pchan & (1 << j)) {
        chan = cap.pchan[j];
        for (k = 0; k < chans->len && chan; k++) {
          if (chan == g_array_index(chans, int, k))
            chan = 0;
        }
        /* add in ascending order */
        if (chan) {
          for (k = 0; k < chans->len; k++) {
            if (chan < g_array_index(chans, int, k)) {
              g_array_insert_val(chans, k, chan);
              break;
            }
          }
          if (k == chans->len)
            g_array_append_val(chans, chan);
        }
      }
    }
  }
  /* not sure how this can happen, but it might */
  if (cap.nconf == 0) {
    g_array_append_val(rates, par.rate);
    g_array_append_val(chans, par.pchan);
  }

  g_value_init(&rates_v, GST_TYPE_LIST);
  g_value_init(&chans_v, GST_TYPE_LIST);
  g_value_init(&value, G_TYPE_INT);

  for (i = 0; i < rates->len; i++) {
    g_value_set_int(&value, g_array_index(rates, int, i));
    gst_value_list_append_value(&rates_v, &value);
  }
  for (i = 0; i < chans->len; i++) {
    g_value_set_int(&value, g_array_index(chans, int, i));
    gst_value_list_append_value(&chans_v, &value);
  }

  g_array_free(rates, TRUE);
  g_array_free(chans, TRUE);

  pad_template = gst_static_pad_template_get (&sndio_sink_factory);
  sndiosink->cur_caps = gst_caps_copy (gst_pad_template_get_caps (pad_template));
  gst_object_unref (pad_template);

  for (i = 0; i < sndiosink->cur_caps->structs->len; i++) {
    GstStructure *s;

    s = gst_caps_get_structure (sndiosink->cur_caps, i);
    gst_structure_set (s, "endianness", G_TYPE_INT, par.le ? 1234 : 4321, NULL);
    gst_structure_set (s, "signed", G_TYPE_BOOLEAN, par.sig ? TRUE : FALSE, NULL);
    gst_structure_set (s, "width", G_TYPE_INT, par.bits, NULL);
    // gst_structure_set (s, "depth", G_TYPE_INT, par.bps * 8, NULL); /* XXX */
    gst_structure_set_value (s, "rate", &rates_v);
    gst_structure_set_value (s, "channels", &chans_v);
  }

  return TRUE;

  /* ERRORS */
couldnt_connect:
  {
    GST_ELEMENT_ERROR (sndiosink, RESOURCE, OPEN_WRITE,
        (_("Could not establish connection to sndio")),
        ("can't open connection to sndio"));
    return FALSE;
  }
no_server_info:
  {
    GST_ELEMENT_ERROR (sndiosink, RESOURCE, OPEN_WRITE,
        (_("Failed to query sndio capabilities")),
        ("couldn't get sndio info!"));
    return FALSE;
  }
}

static gboolean
gst_sndiosink_close (GstAudioSink * asink)
{
  GstSndioSink *sink = GST_SNDIOSINK (asink);

  return gst_sndio_close (&sink->sndio);

  gst_caps_replace (&sndiosink->cur_caps, NULL);
  sio_close (sndiosink->hdl);
  sndiosink->hdl = NULL;

  return TRUE;
}

static void
gst_sndiosink_cb(void *addr, int delta)
{
  GstSndioSink *sndiosink = GST_SNDIOSINK ((GstAudioSink *)addr);

  sndiosink->realpos += delta;

  if (sndiosink->realpos >= sndiosink->playpos)
    sndiosink->latency = 0;
  else
    sndiosink->latency = sndiosink->playpos - sndiosink->realpos;
}

static gboolean
gst_sndiosink_prepare (GstAudioSink * asink, GstAudioRingBufferSpec * spec)
{
  GstSndioSink *sink = GST_SNDIOSINK (asink);
  struct sio_par par;
  int spec_bpf;

  return gst_sndio_prepare (&sink->sndio, spec);

  sndiosink->playpos = sndiosink->realpos = sndiosink->latency = 0;

  sio_initpar(&par);
  par.sig = spec->sign;
  par.le = !spec->bigend;
  par.bits = spec->width;
  // par.bps = spec->depth / 8;  /* XXX */
  par.rate = spec->rate;
  par.pchan = spec->channels;

  spec_bpf = ((spec->width / 8) * spec->channels);

  par.appbufsz = (spec->segsize * spec->segtotal) / spec_bpf;

  if (!sio_setpar(sndiosink->hdl, &par))
    goto cannot_configure;

  sio_getpar(sndiosink->hdl, &par);

  spec->sign = par.sig;
  spec->bigend = !par.le;
  spec->width = par.bits;
  // spec->depth = par.bps * 8;  /* XXX */
  spec->rate = par.rate;
  spec->channels = par.pchan;

  sndiosink->bpf = par.bps * par.pchan;

  spec->segsize = par.round * par.pchan * par.bps;
  spec->segtotal = par.bufsz / par.round;

  /* FIXME: this is wrong for signed ints (and the
   * audioringbuffers should do it for us anyway) */
  spec->silence_sample[0] = 0;
  spec->silence_sample[1] = 0;
  spec->silence_sample[2] = 0;
  spec->silence_sample[3] = 0;

  sio_onmove(sndiosink->hdl, gst_sndiosink_cb, sndiosink);

  if (!sio_start(sndiosink->hdl))
    goto cannot_start;

  GST_INFO_OBJECT (sndiosink, "successfully opened connection to sndio");

  return TRUE;

  /* ERRORS */
cannot_configure:
  {
    GST_ELEMENT_ERROR (sndiosink, RESOURCE, OPEN_WRITE,
        (_("Could not configure sndio")),
        ("can't configure sndio"));
    return FALSE;
  }
cannot_start:
  {
    GST_ELEMENT_ERROR (sndiosink, RESOURCE, OPEN_WRITE,
        (_("Could not start sndio")),
        ("can't start sndio"));
    return FALSE;
  }
}

static gboolean
gst_sndiosink_unprepare (GstAudioSink * asink)
{
  GstSndioSink *sink = GST_SNDIOSINK (asink);

  return gst_sndio_unprepare (&sink->sndio);
    return TRUE;

  sio_stop(sndiosink->hdl);

  return TRUE;
}

static gint
gst_sndiosink_write (GstAudioSink * asink, gpointer data, guint length)
{
  GstSndioSink *sink = GST_SNDIOSINK (asink);
  guint done;

  if (length == 0)

  if (done == 0)
    goto write_error;

  sndiosink->playpos += (done / sndiosink->bpf);

  data = (char *) data + done;

  return done;

  /* ERRORS */
write_error:
  {
    GST_ELEMENT_ERROR (sndiosink, RESOURCE, WRITE,
        ("Failed to write data to sndio"), GST_ERROR_SYSTEM);
    return 0;
  done = sio_write (sink->sndio.hdl, data, length);
  if (done == 0) {
      GST_ELEMENT_ERROR (sink, RESOURCE, WRITE,
	("Failed to write data to sndio"), (NULL));
      return 0;
  }
  sink->sndio.delay += done;
  return done;
}

static guint
gst_sndiosink_delay (GstAudioSink * asink)
{
  GstSndioSink *sink = GST_SNDIOSINK (asink);

  return GST_SNDIO_DELAY(&sink->sndio);
    GST_WARNING_OBJECT (asink, "couldn't get latency");
    return 0;
  }

  GST_DEBUG_OBJECT (asink, "got latency: %u", sndiosink->latency);

  return sndiosink->latency;
}

static void
gst_sndiosink_reset (GstAudioSink * asink)
{
  /* no way to flush the buffers with sndio ? */

  GST_DEBUG_OBJECT (asink, "reset called");
}

static void
gst_sndiosink_set_property (GObject * object, guint prop_id,
    const GValue * value, GParamSpec * pspec)
{
  GstSndioSink *sink = GST_SNDIOSINK (object);

  gst_sndio_set_property (&sink->sndio, prop_id, value, pspec);
    case PROP_HOST:
      g_free (sndiosink->host);
      sndiosink->host = g_value_dup_string (value);
      break;
    default:
      break;
  }
}

static void

gst_sndiosink_get_property (GObject * object, guint prop_id, GValue * value,
    GParamSpec * pspec)
{
  GstSndioSink *sink = GST_SNDIOSINK (object);

  gst_sndio_get_property (&sink->sndio, prop_id, value, pspec);
    case PROP_HOST:
      g_value_set_string (value, sndiosink->host);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
  }
}

static void
gst_sndiosink_class_init (GstSndioSinkClass * klass)
{
  GObjectClass *gobject_class;
  GstElementClass *gstelement_class;
  GstBaseSinkClass *gstbasesink_class;
  GstAudioBaseSinkClass *gstbaseaudiosink_class;
  GstAudioSinkClass *gstaudiosink_class;

  gobject_class = (GObjectClass *) klass;
  gstelement_class = (GstElementClass *) klass;
  gstbasesink_class = (GstBaseSinkClass *) klass;
  gstbaseaudiosink_class = (GstAudioBaseSinkClass *) klass;
  gstaudiosink_class = (GstAudioSinkClass *) klass;

  parent_class = g_type_class_peek_parent (klass);

  gobject_class->finalize = gst_sndiosink_finalize;
  gobject_class->get_property = gst_sndiosink_get_property;
  gobject_class->set_property = gst_sndiosink_set_property;

  gst_element_class_set_static_metadata (gstelement_class,
      "Audio sink (sndio)", "Sink/Audio",
      "Output to a sound card via sndio",
      "Jacob Meuser <jakemsr@sdf.lonestar.org>");

  gst_element_class_add_pad_template (gstelement_class,
      gst_static_pad_template_get (&sndiosink_factory));

  gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_sndiosink_getcaps);
  gstaudiosink_class->open = GST_DEBUG_FUNCPTR (gst_sndiosink_open);
  gstaudiosink_class->prepare = GST_DEBUG_FUNCPTR (gst_sndiosink_prepare);
  gstaudiosink_class->unprepare = GST_DEBUG_FUNCPTR (gst_sndiosink_unprepare);
  gstaudiosink_class->close = GST_DEBUG_FUNCPTR (gst_sndiosink_close);
  gstaudiosink_class->write = GST_DEBUG_FUNCPTR (gst_sndiosink_write);
  gstaudiosink_class->delay = GST_DEBUG_FUNCPTR (gst_sndiosink_delay);
  gstaudiosink_class->reset = GST_DEBUG_FUNCPTR (gst_sndiosink_reset);

  g_object_class_install_property (gobject_class, PROP_DEVICE,
      g_param_spec_string ("device", "Device",
          "sndio device as defined in sndio(7)",
          SIO_DEVANY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
  g_object_class_install_property (gobject_class, PROP_VOLUME,
      g_param_spec_double ("volume", "Volume",
	  "Linear volume of this stream, 1.0=100%", 0.0, 1.0,
	  1.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
  g_object_class_install_property (gobject_class, PROP_MUTE,
      g_param_spec_boolean ("mute", "Mute",
	  "Mute state of this stream", FALSE,
	  G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}




/*
 * Copyright (C) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
 * Copyright (C) 2012 Alexandre Ratchov <alex@caoua.org>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above


#include <gst/gst.h>
#include <gst/audio/gstaudiosink.h>
#include "gstsndio.h"

G_BEGIN_DECLS


typedef struct _GstSndioSinkClass GstSndioSinkClass;

struct _GstSndioSink {
  GstAudioSink sink;
  struct gstsndio sndio;
  struct sio_hdl *hdl;
  gchar    *host;

  /* bytes per frame */
  int bpf;

  /* frames counts */
  volatile long long realpos;
  volatile long long playpos;
  volatile guint latency;

  GstCaps  *cur_caps;
};

struct _GstSndioSinkClass {

Lines 4-9 Link Here

(-)java/openjfx8-devel/pkg-plist (+2 lines)
4	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libdecora_sse.so	4	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libdecora_sse.so
5	%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libfxplugins.so	5	%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libfxplugins.so
6	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libglass.so	6	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libglass.so
		7	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libglassgtk2.so
		8	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libglassgtk3.so
7	%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libgstreamer-lite.so	9	%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libgstreamer-lite.so
8	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font.so	10	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font.so
9	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font_freetype.so	11	%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font_freetype.so

Lines 2-8 Link Here

(-)devel/gradle4/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gradle	4	PORTNAME= gradle
5	PORTVERSION= 4.6	5	PORTVERSION= 4.10.3
6	CATEGORIES= devel java	6	CATEGORIES= devel java
7	MASTER_SITES= https://downloads.gradle.org/distributions/	7	MASTER_SITES= https://downloads.gradle.org/distributions/
8	PKGNAMESUFFIX= 4	8	PKGNAMESUFFIX= 4

Lines 1-3 Link Here

(-)devel/gradle4/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1499872390	1	TIMESTAMP = 1563780722
2	SHA256 (gradle-4.6-bin.zip) = 98bd5fd2b30e070517e03c51cbb32beee3e2ee1a84003a5a5d748996d4b1b915	2	SHA256 (gradle-4.10.3-bin.zip) = 8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e
3	SIZE (gradle-4.6-bin.zip) = 74176889	3	SIZE (gradle-4.10.3-bin.zip) = 78422006




bin/gradle%%PKGNAMESUFFIX%%
%%DATADIR%%/lib/annotations-13.0.jar
%%DATADIR%%/lib/ant-1.9.11.jar
%%DATADIR%%/lib/ant-launcher-1.9.11.jar
%%DATADIR%%/lib/asm-6.2.jar
%%DATADIR%%/lib/asm-analysis-6.2.jar
%%DATADIR%%/lib/asm-commons-6.2.jar
%%DATADIR%%/lib/asm-tree-6.2.jar
%%DATADIR%%/lib/commons-collections-3.2.2.jar
%%DATADIR%%/lib/commons-compress-1.14.jar
%%DATADIR%%/lib/commons-io-2.4.jar
%%DATADIR%%/lib/commons-lang-2.6.jar
%%DATADIR%%/lib/fastutil-7.2.1-min.jar
%%DATADIR%%/lib/gradle-api-metadata-4.10.3.jar
%%DATADIR%%/lib/gradle-base-services-4.10.3.jar
%%DATADIR%%/lib/gradle-base-services-groovy-4.10.3.jar
%%DATADIR%%/lib/gradle-build-cache-4.10.3.jar
%%DATADIR%%/lib/gradle-build-option-4.10.3.jar
%%DATADIR%%/lib/gradle-cli-4.10.3.jar
%%DATADIR%%/lib/gradle-core-4.10.3.jar
%%DATADIR%%/lib/gradle-core-api-4.10.3.jar
%%DATADIR%%/lib/gradle-docs-4.10.3.jar
%%DATADIR%%/lib/gradle-installation-beacon-4.10.3.jar
%%DATADIR%%/lib/gradle-jvm-services-4.10.3.jar
%%DATADIR%%/lib/gradle-kotlin-dsl-1.0-rc-6.jar
%%DATADIR%%/lib/gradle-kotlin-dsl-provider-plugins-1.0-rc-6.jar
%%DATADIR%%/lib/gradle-kotlin-dsl-tooling-builders-1.0-rc-6.jar
%%DATADIR%%/lib/gradle-kotlin-dsl-tooling-models-1.0-rc-6.jar
%%DATADIR%%/lib/gradle-launcher-4.10.3.jar
%%DATADIR%%/lib/gradle-logging-4.10.3.jar
%%DATADIR%%/lib/gradle-messaging-4.10.3.jar
%%DATADIR%%/lib/gradle-model-core-4.10.3.jar
%%DATADIR%%/lib/gradle-model-groovy-4.10.3.jar
%%DATADIR%%/lib/gradle-native-4.10.3.jar
%%DATADIR%%/lib/gradle-persistent-cache-4.10.3.jar
%%DATADIR%%/lib/gradle-process-services-4.10.3.jar
%%DATADIR%%/lib/gradle-resources-4.10.3.jar
%%DATADIR%%/lib/gradle-runtime-api-info-4.10.3.jar
%%DATADIR%%/lib/gradle-tooling-api-4.10.3.jar
%%DATADIR%%/lib/gradle-wrapper-4.10.3.jar
%%DATADIR%%/lib/groovy-all-2.4.15.jar
%%DATADIR%%/lib/guava-jdk5-17.0.jar
%%DATADIR%%/lib/jansi-1.14.jar
%%DATADIR%%/lib/javax.inject-1.jar

%%DATADIR%%/lib/jcl-over-slf4j-1.7.16.jar
%%DATADIR%%/lib/jsr305-2.0.1.jar
%%DATADIR%%/lib/jul-to-slf4j-1.7.16.jar
%%DATADIR%%/lib/kotlin-compiler-embeddable-1.2.61.jar
%%DATADIR%%/lib/kotlin-reflect-1.2.61.jar
%%DATADIR%%/lib/kotlin-sam-with-receiver-compiler-plugin-1.2.61.jar
%%DATADIR%%/lib/kotlin-script-runtime-1.2.61.jar
%%DATADIR%%/lib/kotlin-stdlib-1.2.61.jar
%%DATADIR%%/lib/kotlin-stdlib-common-1.2.61.jar
%%DATADIR%%/lib/kotlin-stdlib-jdk7-1.2.61.jar
%%DATADIR%%/lib/kotlin-stdlib-jdk8-1.2.61.jar
%%DATADIR%%/lib/kryo-2.20.jar
%%DATADIR%%/lib/log4j-over-slf4j-1.7.16.jar
%%DATADIR%%/lib/minlog-1.2.jar

%%DATADIR%%/lib/plugins/aether-spi-1.13.1.jar
%%DATADIR%%/lib/plugins/aether-util-1.13.1.jar
%%DATADIR%%/lib/plugins/apiguardian-api-1.0.0.jar
%%DATADIR%%/lib/plugins/asm-util-6.2.jar
%%DATADIR%%/lib/plugins/aws-java-sdk-core-1.11.267.jar
%%DATADIR%%/lib/plugins/aws-java-sdk-kms-1.11.267.jar
%%DATADIR%%/lib/plugins/aws-java-sdk-s3-1.11.267.jar

%%DATADIR%%/lib/plugins/google-http-client-1.23.0.jar
%%DATADIR%%/lib/plugins/google-http-client-jackson2-1.23.0.jar
%%DATADIR%%/lib/plugins/google-oauth-client-1.23.0.jar
%%DATADIR%%/lib/plugins/gradle-announce-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-antlr-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-build-cache-http-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-build-comparison-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-build-init-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-code-quality-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-composite-builds-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-dependency-management-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-diagnostics-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-ear-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-ide-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-ide-native-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-ide-play-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-ivy-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-jacoco-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-javascript-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-language-groovy-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-language-java-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-language-jvm-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-language-native-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-language-scala-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-maven-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-osgi-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-platform-base-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-platform-jvm-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-platform-native-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-platform-play-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-plugin-development-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-plugin-use-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-plugins-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-publish-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-reporting-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-resources-gcs-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-resources-http-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-resources-s3-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-resources-sftp-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-scala-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-signing-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-test-kit-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-testing-base-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-testing-junit-platform-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-testing-jvm-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-testing-native-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-tooling-api-builders-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-tooling-native-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-version-control-4.10.3.jar
%%DATADIR%%/lib/plugins/gradle-workers-4.10.3.jar
%%DATADIR%%/lib/plugins/gson-2.7.jar
%%DATADIR%%/lib/plugins/hamcrest-core-1.3.jar
%%DATADIR%%/lib/plugins/httpclient-4.5.5.jar

%%DATADIR%%/lib/plugins/httpcore-4.4.9.jar
%%DATADIR%%/lib/plugins/ion-java-1.0.2.jar
%%DATADIR%%/lib/plugins/ivy-2.2.0.jar
%%DATADIR%%/lib/plugins/jackson-annotations-2.9.4.jar
%%DATADIR%%/lib/plugins/jackson-core-2.9.4.jar
%%DATADIR%%/lib/plugins/jackson-databind-2.9.4.jar
%%DATADIR%%/lib/plugins/jatl-0.2.2.jar
%%DATADIR%%/lib/plugins/jcifs-1.3.17.jar
%%DATADIR%%/lib/plugins/jcommander-1.47.jar

%%DATADIR%%/lib/plugins/wagon-http-shared4-2.4.jar
%%DATADIR%%/lib/plugins/wagon-provider-api-2.4.jar
%%DATADIR%%/lib/plugins/xbean-reflect-3.4.jar
%%DATADIR%%/lib/plugins/xercesImpl-2.12.0.jar
%%DATADIR%%/lib/reflectasm-1.07-shaded.jar
%%DATADIR%%/lib/slf4j-api-1.7.16.jar
%%DATADIR%%/lib/xml-apis-1.4.01.jar

Return to bug 237443

Lines 2-9 Link Here

(-)java/openjfx8-devel/Makefile (-17 / +31 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openjfx8	4	PORTNAME= openjfx8
5	DISTVERSION= 8u172-b11	5	DISTVERSION= 8u202-b07
6	PORTREVISION= 7
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= java x11-toolkits devel	7	CATEGORIES= java x11-toolkits devel
9	MASTER_SITES= https://github.com/t6/openjfx/releases/download/release/ \	8	MASTER_SITES= https://github.com/t6/openjfx/releases/download/release/ \
Lines 16-38 Link Here
16	LICENSE= GPLv2	15	LICENSE= GPLv2
17	LICENSE_FILE= ${WRKSRC}/LICENSE	16	LICENSE_FILE= ${WRKSRC}/LICENSE
18		17
		18	DEPRECATED= No longer maintained upstream
19	ONLY_FOR_ARCHS= amd64 i386	19	ONLY_FOR_ARCHS= amd64 i386
20		20
21	BUILD_DEPENDS= apache-ant>0:devel/apache-ant \	21	BUILD_DEPENDS= apache-ant>0:devel/apache-ant \
22	antlr3>0:devel/antlr3 \	22	antlr3>0:devel/antlr3 \
23	gradle4>=4.0:devel/gradle4 \	23	gradle4>=4.8:devel/gradle4 \
24	${JAVALIBDIR}/junit.jar:java/junit	24	${JAVALIBDIR}/junit.jar:java/junit
25	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \	25	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
26	libfreetype.so:print/freetype2	26	libfreetype.so:print/freetype2
27		27
28	USES= gettext-runtime gl gnome jpeg pkgconfig sqlite	28	USES= gettext-runtime gl gnome jpeg localbase:ldflags pkgconfig sqlite
29	USE_GL= gl	29	USE_GL= gl
30	USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango	30	USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango
31	USE_JAVA= yes	31	USE_JAVA= yes
32	JAVA_VERSION= 1.8	32	JAVA_VERSION= 1.8
33	USE_LDCONFIG= yes	33	USE_LDCONFIG= yes
34	USE_XORG= x11 xtst xxf86vm	34	USE_XORG= x11 xtst xxf86vm
35		35
		36	CFLAGS+= -Wno-unused-command-line-argument
		37
		38	WRKSRC= ${WRKDIR}/rt-${DISTVERSION}
		39
		40	PLIST_SUB= ARCH=${ARCH} \
		41	JAVA_HOME=${JAVA_HOME}
		42
36	OPTIONS_DEFINE= MEDIA SWT TEST WEBKIT	43	OPTIONS_DEFINE= MEDIA SWT TEST WEBKIT
37	OPTIONS_DEFAULT= MEDIA WEBKIT	44	OPTIONS_DEFAULT= MEDIA WEBKIT
38	OPTIONS_SUB= yes	45	OPTIONS_SUB= yes
Lines 53-60 Link Here
53	TEST_VARS= AWT_TEST=true FULL_TEST=true	60	TEST_VARS= AWT_TEST=true FULL_TEST=true
54		61
55	# Gradle calls CMake during the build	62	# Gradle calls CMake during the build
		63	WEBKIT_IMPLIES= MEDIA
56	WEBKIT_BUILD_DEPENDS= cmake:devel/cmake	64	WEBKIT_BUILD_DEPENDS= cmake:devel/cmake
57	WEBKIT_IMPLIES= MEDIA
58	WEBKIT_LIB_DEPENDS= libicui18n.so:devel/icu	65	WEBKIT_LIB_DEPENDS= libicui18n.so:devel/icu
59	WEBKIT_USES= bison compiler:c++14-lang gmake gperf perl5 python:2.7,build	66	WEBKIT_USES= bison compiler:c++14-lang gmake gperf perl5 python:2.7,build
60	WEBKIT_USE= GNOME=libxslt,libxml2 \	67	WEBKIT_USE= GNOME=libxslt,libxml2 \
Lines 64-77 Link Here
64	WEBKIT_VARS= RUBY_NO_RUN_DEPENDS=yes COMPILE_WEBKIT=true	71	WEBKIT_VARS= RUBY_NO_RUN_DEPENDS=yes COMPILE_WEBKIT=true
65		72
66	# Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle	73	# Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle
67	GRADLE_ENV= GRADLE_USER_HOME=${WRKDIR}/gradle-home \	74	_GRADLE_ENV= CC=${WRKDIR}/bin/ccwrapper \
68	CC=${CC} CXX=${CXX}	75	CXX=${WRKDIR}/bin/cxxwrapper \
69	GRADLE_RUN= ${SETENV} ${GRADLE_ENV} gradle4 --no-daemon	76	GRADLE_USER_HOME=${WRKDIR}/gradle-home
		77	_GRADLE_RUN= ${SETENV} ${_GRADLE_ENV} gradle4 --no-daemon
70		78
71	PLIST_SUB= ARCH=${ARCH} \
72	JAVA_HOME=${JAVA_HOME}
73	WRKSRC= ${WRKDIR}/rt-${DISTVERSION}
74
75	# NOTE: This port won't build if ${JAVA_HOME}/jre/lib/ext/jfxrt.jar	79	# NOTE: This port won't build if ${JAVA_HOME}/jre/lib/ext/jfxrt.jar
76	# already exists on your system. This is not a problem in Poudriere	80	# already exists on your system. This is not a problem in Poudriere
77	# or Synth but something to be aware of if you're trying to build this	81	# or Synth but something to be aware of if you're trying to build this
Lines 87-93 Link Here
87	${WRKSRC}/modules/media/src/main/native/gstreamer/projects/bsd	91	${WRKSRC}/modules/media/src/main/native/gstreamer/projects/bsd
88		92
89	post-patch:	93	post-patch:
90	@${CP} ${FILESDIR}/bsd.gradle ${WRKSRC}/buildSrc	94	@${MKDIR} ${WRKDIR}/bin
		95	@${PRINTF} '#!/bin/sh\nexec ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper
		96	@${PRINTF} '#!/bin/sh\nexec ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper
		97	@${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper
		98	@${SED} -e 's@/linux@/freebsd@g' -e 's@-DLINUX@-DFREEBSD@g' -e 's@LINUX@BSD@g' \
		99	-e 's@linux_@bsd_@g' -e 's@"-static-libgcc", "-static-libstdc++",@@g' \
		100	-e 's@"gcc"@"${WRKDIR}/bin/ccwrapper"@g' -e 's@"g\+\+"@"${WRKDIR}/bin/cxxwrapper"@g' \
		101	${WRKSRC}/buildSrc/linux.gradle > ${WRKSRC}/buildSrc/bsd.gradle
91	# Add a *BSD native audio sink to GStreamer-lite instead of using the	102	# Add a *BSD native audio sink to GStreamer-lite instead of using the
92	# bundled ALSA sink. Currently we add an sndio sink, but this is an extension	103	# bundled ALSA sink. Currently we add an sndio sink, but this is an extension
93	# point for eventually adding an OSS backend (or others) as an option as well.	104	# point for eventually adding an OSS backend (or others) as an option as well.
Lines 94-100 Link Here
94	# If you add a new one make sure it registers itself as "bsdaudiosink" as defined	105	# If you add a new one make sure it registers itself as "bsdaudiosink" as defined
95	# in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp	106	# in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp
96	@${MKDIR} ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio	107	@${MKDIR} ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
97	@${CP} ${FILESDIR}/gstsndio.c ${FILESDIR}/sndiosink.c ${FILESDIR}/sndiosink.h \	108	@${CP} ${FILESDIR}/gstsndio.* ${FILESDIR}/sndiosink.* \
98	${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio	109	${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
99	@cd ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \	110	@cd ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \
100	${LN} -s gstsndio.c gstbsdaudio.c && \	111	${LN} -s gstsndio.c gstbsdaudio.c && \
Lines 105-110 Link Here
105	# Remove bundled libraries. We use the system's versions instead.	116	# Remove bundled libraries. We use the system's versions instead.
106	@cd ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty && \	117	@cd ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty && \
107	${RM} -r icu libxml libxslt sqlite	118	${RM} -r icu libxml libxslt sqlite
		119	@${RM} -r ${WRKSRC}/modules/web/src/main/native/Source/WTF/icu
		120	@cd ${WRKSRC}/modules/media/src/main/native/gstreamer/3rd_party && \
		121	${RM} -r glib libffi
108		122
109	post-patch-SWT-off:	123	post-patch-SWT-off:
110	@${RM} -r ${WRKSRC}/modules/graphics/src/main/java/com/sun/glass/ui/swt	124	@${RM} -r ${WRKSRC}/modules/graphics/src/main/java/com/sun/glass/ui/swt
Lines 118-124 Link Here
118	@${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle	132	@${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle
119		133
120	do-build:	134	do-build:
121	@cd ${WRKSRC} && ${GRADLE_RUN} zips	135	@cd ${WRKSRC} && ${_GRADLE_RUN} zips
122		136
123	do-install:	137	do-install:
124	@${MKDIR} ${STAGEDIR}${JAVA_HOME}	138	@${MKDIR} ${STAGEDIR}${JAVA_HOME}
Lines 127-132 Link Here
127	@${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \;	141	@${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \;
128		142
129	do-test-TEST-on:	143	do-test-TEST-on:
130	@cd ${WRKSRC} && ${GRADLE_RUN} check test	144	@cd ${WRKSRC} && ${_GRADLE_RUN} check test
131		145
132	.include <bsd.port.mk>	146	.include <bsd.port.mk>

Lines 1-257 Link Here

(-)java/openjfx8-devel/files/bsd.gradle (-257 lines)
1	/*
2	* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	*
5	* This code is free software; you can redistribute it and/or modify it
6	* under the terms of the GNU General Public License version 2 only, as
7	* published by the Free Software Foundation. Oracle designates this
8	* particular file as subject to the "Classpath" exception as provided
9	* by Oracle in the LICENSE file that accompanied this code.
10	*
11	* This code is distributed in the hope that it will be useful, but WITHOUT
12	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14	* version 2 for more details (a copy is included in the LICENSE file that
15	* accompanied this code).
16	*
17	* You should have received a copy of the GNU General Public License version
18	* 2 along with this work; if not, write to the Free Software Foundation,
19	* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20	*
21	* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22	* or visit www.oracle.com if you need additional information or have any
23	* questions.
24	*/
25
26	ext.BSD = [:]
27
28	// Declare whether this particular target file applies to the current system
29	BSD.canBuild = IS_BSD;
30	if (!BSD.canBuild) return;
31
32	// All desktop related packages should be built
33	BSD.compileSwing = true;
34	BSD.compileFXPackager = true;
35
36	// Libraries end up in the sdk/rt/lib/$OS_ARCH directory for freebsd
37	BSD.libDest = "lib/$OS_ARCH"
38
39	// Lambda for naming the generated libs
40	BSD.library = { name -> return "lib${name}.so" as String }
41
42	// A set of common parameters to use for both compiling and linking
43	def commonFlags = [
44	"-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
45	"-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
46
47	if (!IS_64) {
48	commonFlags += "-m32"
49	}
50
51	// Specify the compilation parameters and link parameters
52	def ccFlags = [
53	commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/freebsd", "-c",
54	IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
55	//ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
56	def linkFlags = ["-shared", commonFlags].flatten()
57
58	// Create $buildDir/bsd_tools.properties file and load props from it
59	setupTools("bsd_tools",
60	{ propFile ->
61	ByteArrayOutputStream results = new ByteArrayOutputStream();
62	exec {
63	commandLine("pkg-config", "--cflags", "gtk+-2.0", "gthread-2.0", "xtst");
64	setStandardOutput(results);
65	}
66	propFile << "cflags=" << results.toString().trim() << "\n";
67
68	results = new ByteArrayOutputStream();
69	exec {
70	commandLine "pkg-config", "--libs", "gtk+-2.0", "gthread-2.0", "xtst"
71	standardOutput = results
72	}
73	propFile << "libs=" << results.toString().trim();
74	},
75	{ properties ->
76	ccFlags.addAll(properties.getProperty("cflags").split(" "))
77	linkFlags.addAll(properties.getProperty("libs").split(" "))
78	}
79	)
80
81	def pangoCCFlags = ["-D_ENABLE_PANGO"];
82	def pangoLinkFlags = [];
83	setupTools("bsd_pango_tools",
84	{ propFile ->
85	ByteArrayOutputStream results = new ByteArrayOutputStream();
86	exec {
87	commandLine "pkg-config", "--cflags", "pangoft2"
88	standardOutput = results
89	}
90	propFile << "cflags=" << results.toString().trim() << "\n";
91
92	results = new ByteArrayOutputStream();
93	exec {
94	commandLine "pkg-config", "--libs", "pangoft2"
95	standardOutput = results
96	}
97	propFile << "libs=" << results.toString().trim();
98	},
99	{ properties ->
100	pangoCCFlags.addAll(properties.getProperty("cflags").split(" "))
101	pangoLinkFlags.addAll(properties.getProperty("libs").split(" "))
102	}
103	)
104
105	def freetypeCCFlags = [ext.IS_COMPILE_PANGO ? "-D_ENABLE_PANGO" :
106	ext.IS_COMPILE_HARFBUZZ ? "-D_ENABLE_HARFBUZZ" : ""]
107	def freetypeLinkFlags = []
108	setupTools("bsd_freetype_tools",
109	{ propFile ->
110	ByteArrayOutputStream results = new ByteArrayOutputStream();
111	exec {
112	commandLine "pkg-config", "--cflags", "freetype2"
113	standardOutput = results
114	}
115	propFile << "cflags=" << results.toString().trim() << "\n";
116
117	results = new ByteArrayOutputStream();
118	exec {
119	commandLine "pkg-config", "--libs", "freetype2"
120	standardOutput = results
121	}
122	propFile << "libs=" << results.toString().trim();
123	},
124	{ properties ->
125	freetypeCCFlags.addAll(properties.getProperty("cflags").split(" "))
126	freetypeLinkFlags.addAll(properties.getProperty("libs").split(" "))
127	}
128	)
129
130	def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "cc";
131	def linker = IS_COMPILE_PARFAIT ? "parfait-g++" : "c++";
132
133	BSD.glass = [:]
134	BSD.glass.javahInclude = [
135	"com/sun/glass/events/**",
136	"com/sun/glass/ui/*",
137	"com/sun/glass/ui/gtk/*"]
138	BSD.glass.nativeSource = file("modules/graphics/src/main/native-glass/gtk")
139	BSD.glass.compiler = compiler
140	BSD.glass.ccFlags = [ccFlags, "-Werror"].flatten()
141	BSD.glass.linker = linker
142	BSD.glass.linkFlags = [linkFlags].flatten()
143	BSD.glass.lib = "glass"
144
145	BSD.decora = [:]
146	BSD.decora.compiler = compiler
147	BSD.decora.ccFlags = [ccFlags, "-ffast-math"].flatten()
148	BSD.decora.linker = linker
149	BSD.decora.linkFlags = [linkFlags].flatten()
150	BSD.decora.lib = "decora_sse"
151
152	BSD.prism = [:]
153	BSD.prism.javahInclude = ["com/sun/prism/impl/*/", "com/sun/prism/PresentableState*"]
154	BSD.prism.nativeSource = file("modules/graphics/src/main/native-prism")
155	BSD.prism.compiler = compiler
156	BSD.prism.ccFlags = [ccFlags, "-DINLINE=inline"].flatten()
157	BSD.prism.linker = linker
158	BSD.prism.linkFlags = [linkFlags].flatten()
159	BSD.prism.lib = "prism_common"
160
161	BSD.prismSW = [:]
162	BSD.prismSW.javahInclude = ["com/sun/pisces/*/"]
163	BSD.prismSW.nativeSource = file("modules/graphics/src/main/native-prism-sw")
164	BSD.prismSW.compiler = compiler
165	BSD.prismSW.ccFlags = [ccFlags, "-DINLINE=inline"].flatten()
166	BSD.prismSW.linker = linker
167	BSD.prismSW.linkFlags = [linkFlags].flatten()
168	BSD.prismSW.lib = "prism_sw"
169
170	BSD.launcher = [:]
171	BSD.launcher.compiler = compiler
172	BSD.launcher.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/freebsd", "-c"]
173	BSD.launcher.linker = linker
174	BSD.launcher.linkFlags = ["-ldl"]
175	if (!IS_64) {
176	BSD.launcher.ccFlags += "-m32"
177	BSD.launcher.linkFlags += "-m32"
178	}
179
180	BSD.launcherlibrary = [:]
181	BSD.launcherlibrary.compiler = compiler
182	BSD.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/freebsd", "-c", "-fPIC"]
183	BSD.launcherlibrary.linker = linker
184	BSD.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared"]
185	if (!IS_64) {
186	BSD.launcherlibrary.ccFlags += "-m32"
187	BSD.launcherlibrary.linkFlags += "-m32"
188	}
189
190	BSD.iio = [:]
191	BSD.iio.javahInclude = ["com/sun/javafx/iio/*/"]
192	BSD.iio.nativeSource = [file("modules/graphics/src/main/native-iio")]
193	BSD.iio.compiler = compiler
194	BSD.iio.ccFlags = [ccFlags].flatten()
195	BSD.iio.linker = linker
196	BSD.iio.linkFlags = [linkFlags].flatten()
197	BSD.iio.linkFlags += "-ljpeg"
198	BSD.iio.lib = "javafx_iio"
199
200	BSD.prismES2 = [:]
201	BSD.prismES2.javahInclude = ["com/sun/prism/es2/*/"]
202	BSD.prismES2.nativeSource = [
203	file("modules/graphics/src/main/native-prism-es2"),
204	file("modules/graphics/src/main/native-prism-es2/GL"),
205	file("modules/graphics/src/main/native-prism-es2/x11")
206	]
207	BSD.prismES2.compiler = compiler
208	BSD.prismES2.ccFlags = ["-DFREEBSD", ccFlags].flatten()
209	BSD.prismES2.linker = linker
210	BSD.prismES2.linkFlags = [linkFlags, "-lX11", "-lXxf86vm", "-lGL"].flatten()
211	BSD.prismES2.lib = "prism_es2"
212
213	def closedDir = file("$projectDir/../rt-closed")
214	BSD.font = [:]
215	BSD.font.javahInclude = [
216	"com/sun/javafx/font/*/",
217	"com/sun/javafx/text/*/"]
218	BSD.font.compiler = compiler
219	BSD.font.nativeSource = [file("modules/graphics/src/main/native-font")]
220	BSD.font.ccFlags = ["-DJFXFONT_PLUS", ccFlags].flatten()
221	BSD.font.linker = linker
222	BSD.font.linkFlags = [linkFlags].flatten()
223	BSD.font.lib = "javafx_font"
224
225	BSD.fontT2K = [:]
226	BSD.fontT2K.javahInclude = ["com/sun/javafx/font/t2k/*/"]
227	BSD.fontT2K.nativeSource = [
228	file("$closedDir/javafx-font-t2k-native/src"),
229	file("$closedDir/javafx-font-t2k-native/src/layout")]
230	BSD.fontT2K.compiler = compiler
231	BSD.fontT2K.ccFlags = ["-DJFXFONT_PLUS", "-DLE_STANDALONE", ccFlags].flatten()
232	BSD.fontT2K.linker = linker
233	BSD.fontT2K.linkFlags = [linkFlags].flatten()
234	BSD.fontT2K.lib = "javafx_font_t2k"
235
236	BSD.fontFreetype = [:]
237	BSD.fontFreetype.javahInclude = ["com/sun/javafx/font/freetype/OSFreetype.class"]
238	BSD.fontFreetype.nativeSource = ["src/main/native-font/freetype.c"]
239	BSD.fontFreetype.compiler = compiler
240	BSD.fontFreetype.ccFlags = ["-DJFXFONT_PLUS", ccFlags, freetypeCCFlags].flatten()
241	BSD.fontFreetype.linker = linker
242	BSD.fontFreetype.linkFlags = [linkFlags, freetypeLinkFlags].flatten()
243	BSD.fontFreetype.lib = "javafx_font_freetype"
244
245	BSD.fontPango = [:]
246	BSD.fontPango.javahInclude = ["com/sun/javafx/font/freetype/OSPango.class"]
247	BSD.fontPango.nativeSource = ["src/main/native-font/pango.c"]
248	BSD.fontPango.compiler = compiler
249	BSD.fontPango.ccFlags = ["-DJFXFONT_PLUS", ccFlags, pangoCCFlags].flatten()
250	BSD.fontPango.linker = linker
251	BSD.fontPango.linkFlags = [linkFlags, pangoLinkFlags].flatten()
252	BSD.fontPango.lib = "javafx_font_pango"
253
254	BSD.media = [:]
255	BSD.media.compiler = compiler
256	BSD.media.linker = linker
257	BSD.media.lib = "ar"

Line 0 Link Here

(-)java/openjfx8-devel/files/gstsndio.h (+78 lines)
		1	/*
		2	* Copyright (C) 2012 Alexandre Ratchov <alex@caoua.org>
		3	*
		4	* Permission to use, copy, modify, and distribute this software for any
		5	* purpose with or without fee is hereby granted, provided that the above
		6	* copyright notice and this permission notice appear in all copies.
		7	*
		8	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		9	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		10	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
		11	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		12	* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
		13	* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
		14	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		15	*/
		16	#ifndef __GST_SNDIO_H__
		17	#define __GST_SNDIO_H__
		18
		19	#include <sndio.h>
		20	#include <gst/gst.h>
		21	#include <gst/audio/gstaudiosink.h>
		22	#include <gst/audio/gstaudiosrc.h>
		23	#include <gst/audio/streamvolume.h>
		24
		25	enum
		26	{
		27	PROP_0,
		28	PROP_DEVICE,
		29	PROP_VOLUME,
		30	PROP_MUTE
		31	};
		32
		33	#define GST_SNDIO_CAPS_STRING \
		34	"audio/x-raw, " \
		35	"format = (string) { " \
		36	"S8, U8, " \
		37	"S16LE, S16BE, U16LE, U16BE, " \
		38	"S32LE, S32BE, U32LE, U32BE, " \
		39	"S24_32LE, S24_32BE, U24_32LE, " \
		40	"U24_32BE, S24LE, S24BE, U24LE, U24BE " \
		41	"}, " \
		42	"layout = (string) interleaved, " \
		43	"rate = (int) [ 8000, 192000 ], " \
		44	"channels = (int) [1, 16]"
		45
		46	/*
		47	* data common to src and sink
		48	*/
		49	struct gstsndio {
		50	struct sio_hdl *hdl;
		51	gchar *device;
		52	gint mode;
		53	gint bpf; /* bytes per frame */
		54	gint delay; /* bytes stored in the audio fifo */
		55	guint volume; /* volume level */
		56	GstCaps cur_caps; / saved capabilities of opened device */
		57	GObject obj; / for logging */
		58	};
		59
		60	#define GST_SNDIO_DELAY(s) ((s)->delay / (s)->bpf)
		61
		62	void gst_sndio_init (struct gstsndio sio, GObject obj);
		63	void gst_sndio_finalize (struct gstsndio *sio);
		64	GstCaps gst_sndio_getcaps (struct gstsndio sio, GstCaps * filter);
65	gboolean gst_sndio_open (struct gstsndio *sio, gint mode);
66	gboolean gst_sndio_close (struct gstsndio *sio);
67	gboolean gst_sndio_prepare (struct gstsndio sio, GstAudioRingBufferSpec spec);
68	gboolean gst_sndio_unprepare (struct gstsndio *sio);
69	void gst_sndio_set_property (struct gstsndio *sio, guint prop_id,
70	const GValue * value, GParamSpec * pspec);
71	void gst_sndio_get_property (struct gstsndio *sio, guint prop_id,
72	GValue * value, GParamSpec * pspec);
73
74	int gst_sndio_setpar(gpointer sio, GstAudioRingBufferSpec * spec,
75	int mode, struct sio_hdl *hdl);
76	GstCaps gst_sndio_caps (gpointer sio, int mode, struct sio_hdl hdl);
77
78	#endif

Lines 1-14 Link Here

(-)java/openjfx8-devel/files/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp (-3 / +3 lines)
1	http://pkgs.fedoraproject.org/cgit/rpms/openjfx.git/tree/0001-Fix-wait-call-in-PosixPlatform.patch	1	http://pkgs.fedoraproject.org/cgit/rpms/openjfx.git/tree/0001-Fix-wait-call-in-PosixPlatform.patch
2		2
3	--- modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp.orig 2017-09-08 16:56:55 UTC	3	--- modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp.orig 2018-12-10 16:30:22 UTC
4	+++ modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp	4	+++ modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
5	@@ -230,13 +230,7 @@ bool PosixProcess::Wait() {	5	@@ -231,13 +231,7 @@ bool PosixProcess::Wait() {
6	int status = 0;	6	int status = 0;
7	pid_t wpid = 0;	7	pid_t wpid = 0;
8		8
9	- //TODO Use waitpid instead of wait	9	- //TODO Use waitpid instead of wait
10	-#ifdef LINUX	10	-#ifdef LINUX
11	- wait();	11	- wait(&status);
12	-#endif	12	-#endif
13	-#ifdef MAC	13	-#ifdef MAC
14	wpid = wait(&status);	14	wpid = wait(&status);

Lines 1-29 Link Here

(-)java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_OptionsJava.cmake (-23 / +15 lines)
1	--- modules/web/src/main/native/Source/cmake/OptionsJava.cmake.orig 2018-03-23 23:53:57 UTC	1	--- modules/web/src/main/native/Source/cmake/OptionsJava.cmake.orig 2018-12-10 16:30:22 UTC
2	+++ modules/web/src/main/native/Source/cmake/OptionsJava.cmake	2	+++ modules/web/src/main/native/Source/cmake/OptionsJava.cmake
3	@@ -49,9 +49,9 @@ elseif (APPLE)	3	@@ -26,14 +26,10 @@ endif ()
4	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)	4	set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
5	elseif (UNIX)	5	set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
6	#### ICU ####
7	- set(ICU_JAVA_COMMON_LIB icuuc)
8	- set(ICU_I18N_LIBRARIES icui18n)
9	- set(ICU_JAVA_DATA_LIB ${CMAKE_BINARY_DIR}/lib/libicudata.a)
10	+ set(ICU_JAVA_COMMON_LIB ${CMAKE_INSTALL_PREFIX}/lib/libicuuc.so)
11	+ set(ICU_I18N_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/libicui18n.so)
12	+ set(ICU_JAVA_DATA_LIB ${CMAKE_INSTALL_PREFIX}/lib/libicudata.so)
13	#### ICU-END ####
14		6
15	set(CMAKE_SKIP_RPATH TRUE)	7	-set(SQLITE_LIBRARIES SqliteJava)
16	@@ -60,11 +60,12 @@ else ()	8	-set(LIBXML2_LIBRARIES XMLJava)
17	endif ()	9	-set(LIBXSLT_LIBRARIES XSLTJava)
18
19	set(ICU_INCLUDE_DIRS
20	+ "${CMAKE_INSTALL_PREFIX}/include"
21	"${THIRDPARTY_DIR}/icu/source/common"
22	"${THIRDPARTY_DIR}/icu/source/i18n"
23	)
24	set(ICU_LIBRARIES ${ICU_JAVA_COMMON_LIB} ${ICU_JAVA_DATA_LIB})
25	-	10	-
26	+set(ICU_LIBRARIES ${ICU_JAVA_COMMON_LIB} ${ICU_JAVA_DATA_LIB})	11	-set(ICU_LIBRARIES icuuc icudata)
		12	-set(ICU_I18N_LIBRARIES icui18n icuuc icudata)
		13	-set(ICU_DATA_LIBRARIES icudata)
		14	-
		15	+find_package(LibXml2 2.8.0 REQUIRED)
		16	+find_package(LibXslt REQUIRED)
		17	+find_package(Sqlite REQUIRED)
		18	+find_package(ICU REQUIRED)
27	find_package(JNI REQUIRED)	19	find_package(JNI REQUIRED)
28	find_package(Threads REQUIRED)	20	find_package(Threads REQUIRED)
29		21

Lines 1-5 Link Here

(-)java/openjfx8-devel/files/sndiosink.c (-398 / +100 lines)
1	/*	1	/*
2	* Copyright (C) <2008> Jacob Meuser <jakemsr@sdf.lonestar.org>	2	* Copyright (C) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
		3	* Copyright (C) 2012 Alexandre Ratchov <alex@caoua.org>
3	*	4	*
4	* Permission to use, copy, modify, and distribute this software for any	5	* Permission to use, copy, modify, and distribute this software for any
5	* purpose with or without fee is hereby granted, provided that the above	6	* purpose with or without fee is hereby granted, provided that the above
Lines 34-510 Link Here
34	#ifdef HAVE_CONFIG_H	35	#ifdef HAVE_CONFIG_H
35	#include "config.h"	36	#include "config.h"
36	#endif	37	#endif
37
38	#include "sndiosink.h"	38	#include "sndiosink.h"
39	#include <unistd.h>
40	#include <errno.h>
41		39
42	#define _(x) x
43
44	GST_DEBUG_CATEGORY_EXTERN (gst_sndio_debug);	40	GST_DEBUG_CATEGORY_EXTERN (gst_sndio_debug);
45	#define GST_CAT_DEFAULT gst_sndio_debug	41	#define GST_CAT_DEFAULT gst_sndio_debug
46		42
47	enum	43	#define gst_sndiosink_parent_class parent_class
48	{
49	PROP_0,
50	PROP_HOST
51	};
52		44
53	static GstStaticPadTemplate sndio_sink_factory =	45	static GstStaticPadTemplate sndiosink_factory =
54	GST_STATIC_PAD_TEMPLATE ("sink",	46	GST_STATIC_PAD_TEMPLATE ("sink",
55	GST_PAD_SINK,	47	GST_PAD_SINK,
56	GST_PAD_ALWAYS,	48	GST_PAD_ALWAYS,
57	GST_STATIC_CAPS ("audio/x-raw-int, "	49	GST_STATIC_CAPS (GST_SNDIO_CAPS_STRING)
58	"endianness = (int) { 1234, 4321 }, "
59	"signed = (boolean) { TRUE, FALSE }, "
60	"width = (int) { 8, 16, 24, 32 }, "
61	"depth = (int) { 8, 16, 24, 32 }, "
62	"rate = (int) [ 8000, 192000 ], "
63	"channels = (int) [ 1, 16 ] ")
64	);	50	);
65		51
		52	G_DEFINE_TYPE_WITH_CODE (GstSndioSink, gst_sndiosink, GST_TYPE_AUDIO_SINK,
		53	G_IMPLEMENT_INTERFACE (GST_TYPE_STREAM_VOLUME, NULL));
		54
66	static void gst_sndiosink_finalize (GObject * object);	55	static void gst_sndiosink_finalize (GObject * object);
67		56	static GstCaps gst_sndiosink_getcaps (GstBaseSink bsink,
68	static GstCaps gst_sndiosink_getcaps (GstBaseSink bsink);	57	GstCaps * filter);
69
70	static gboolean gst_sndiosink_open (GstAudioSink * asink);	58	static gboolean gst_sndiosink_open (GstAudioSink * asink);
71	static gboolean gst_sndiosink_close (GstAudioSink * asink);	59	static gboolean gst_sndiosink_close (GstAudioSink * asink);
72	static gboolean gst_sndiosink_prepare (GstAudioSink * asink,	60	static gboolean gst_sndiosink_prepare (GstAudioSink * asink,
73	GstRingBufferSpec * spec);	61	GstAudioRingBufferSpec * spec);
74	static gboolean gst_sndiosink_unprepare (GstAudioSink * asink);	62	static gboolean gst_sndiosink_unprepare (GstAudioSink * asink);
75	static guint gst_sndiosink_write (GstAudioSink * asink, gpointer data,	63	static gint gst_sndiosink_write (GstAudioSink * asink, gpointer data,
76	guint length);	64	guint length);
77	static guint gst_sndiosink_delay (GstAudioSink * asink);	65	static guint gst_sndiosink_delay (GstAudioSink * asink);
78	static void gst_sndiosink_reset (GstAudioSink * asink);	66	static void gst_sndiosink_reset (GstAudioSink * asink);
79
80	static void gst_sndiosink_set_property (GObject * object, guint prop_id,	67	static void gst_sndiosink_set_property (GObject * object, guint prop_id,
81	const GValue * value, GParamSpec * pspec);	68	const GValue * value, GParamSpec * pspec);
82	static void gst_sndiosink_get_property (GObject * object, guint prop_id,	69	static void gst_sndiosink_get_property (GObject * object, guint prop_id,
83	GValue * value, GParamSpec * pspec);	70	GValue * value, GParamSpec * pspec);
84	static void gst_sndiosink_cb(void * addr, int delta);
85		71
86	GST_BOILERPLATE (GstSndioSink, gst_sndiosink, GstAudioSink, GST_TYPE_AUDIO_SINK);
87
88	static void	72	static void
89	gst_sndiosink_base_init (gpointer g_class)	73	gst_sndiosink_init (GstSndioSink * sink)
90	{	74	{
91	GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);	75	gst_sndio_init (&sink->sndio, G_OBJECT(sink));
92
93	gst_element_class_set_details_simple (element_class,
94	"Sndio audio sink", "Sink/Audio", "Plays audio through sndio",
95	"Jacob Meuser <jakemsr@sdf.lonestar.org>");
96
97	gst_element_class_add_pad_template (element_class,
98	gst_static_pad_template_get (&sndio_sink_factory));
99	}	76	}
100		77
101	static void	78	static void
102	gst_sndiosink_class_init (GstSndioSinkClass * klass)
103	{
104	GObjectClass *gobject_class;
105	GstBaseSinkClass *gstbasesink_class;
106	GstBaseAudioSinkClass *gstbaseaudiosink_class;
107	GstAudioSinkClass *gstaudiosink_class;
108
109	gobject_class = (GObjectClass *) klass;
110	gstbasesink_class = (GstBaseSinkClass *) klass;
111	gstbaseaudiosink_class = (GstBaseAudioSinkClass *) klass;
112	gstaudiosink_class = (GstAudioSinkClass *) klass;
113
114	parent_class = g_type_class_peek_parent (klass);
115
116	gobject_class->finalize = gst_sndiosink_finalize;
117
118	gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_sndiosink_getcaps);
119
120	gstaudiosink_class->open = GST_DEBUG_FUNCPTR (gst_sndiosink_open);
121	gstaudiosink_class->close = GST_DEBUG_FUNCPTR (gst_sndiosink_close);
122	gstaudiosink_class->prepare = GST_DEBUG_FUNCPTR (gst_sndiosink_prepare);
123	gstaudiosink_class->unprepare = GST_DEBUG_FUNCPTR (gst_sndiosink_unprepare);
124	gstaudiosink_class->write = GST_DEBUG_FUNCPTR (gst_sndiosink_write);
125	gstaudiosink_class->delay = GST_DEBUG_FUNCPTR (gst_sndiosink_delay);
126	gstaudiosink_class->reset = GST_DEBUG_FUNCPTR (gst_sndiosink_reset);
127
128	gobject_class->set_property = gst_sndiosink_set_property;
129	gobject_class->get_property = gst_sndiosink_get_property;
130
131	/* default value is filled in the _init method */
132	g_object_class_install_property (gobject_class, PROP_HOST,
133	g_param_spec_string ("host", "Host",
134	"Device or socket sndio will access", NULL, G_PARAM_READWRITE));
135	}
136
137	static void
138	gst_sndiosink_init (GstSndioSink * sndiosink, GstSndioSinkClass * klass)
139	{
140	sndiosink->hdl = NULL;
141	sndiosink->host = g_strdup (g_getenv ("AUDIODEVICE"));
142	}
143
144	static void
145	gst_sndiosink_finalize (GObject * object)	79	gst_sndiosink_finalize (GObject * object)
146	{	80	{
147	GstSndioSink *sndiosink = GST_SNDIOSINK (object);	81	GstSndioSink *sink = GST_SNDIOSINK (object);
148		82
149	gst_caps_replace (&sndiosink->cur_caps, NULL);	83	gst_sndio_finalize (&sink->sndio);
150	g_free (sndiosink->host);
151
152	G_OBJECT_CLASS (parent_class)->finalize (object);	84	G_OBJECT_CLASS (parent_class)->finalize (object);
153	}	85	}
154		86
155	static GstCaps *	87	static GstCaps *
156	gst_sndiosink_getcaps (GstBaseSink * bsink)	88	gst_sndiosink_getcaps (GstBaseSink * bsink, GstCaps * filter)
157	{	89	{
158	GstSndioSink *sndiosink;	90	GstSndioSink *sink = GST_SNDIOSINK (bsink);
159		91
160	sndiosink = GST_SNDIOSINK (bsink);	92	return gst_sndio_getcaps (&sink->sndio, filter);
161
162	/* no hdl, we're done with the template caps */
163	if (sndiosink->cur_caps == NULL) {
164	GST_LOG_OBJECT (sndiosink, "getcaps called, returning template caps");
165	return NULL;
166	}
167
168	GST_LOG_OBJECT (sndiosink, "returning %" GST_PTR_FORMAT, sndiosink->cur_caps);
169
170	return gst_caps_ref (sndiosink->cur_caps);
171	}	93	}
172		94
173	static gboolean	95	static gboolean
174	gst_sndiosink_open (GstAudioSink * asink)	96	gst_sndiosink_open (GstAudioSink * asink)
175	{	97	{
176	GstPadTemplate *pad_template;	98	GstSndioSink *sink = GST_SNDIOSINK (asink);
177	GstSndioSink *sndiosink;
178	struct sio_par par;
179	struct sio_cap cap;
180	GArray rates, chans;
181	GValue rates_v = { 0 };
182	GValue chans_v = { 0 };
183	GValue value = { 0 };
184	struct sio_enc enc;
185	struct sio_conf conf;
186	int confs[SIO_NCONF];
187	int rate, chan;
188	int i, j, k;
189	int nconfs;
190		99
191	sndiosink = GST_SNDIOSINK (asink);	100	return gst_sndio_open (&sink->sndio, SIO_PLAY);
192
193	GST_DEBUG_OBJECT (sndiosink, "open");
194
195	/* conect */
196	sndiosink->hdl = sio_open (sndiosink->host, SIO_PLAY, 0);
197
198	if (sndiosink->hdl == NULL)
199	goto couldnt_connect;
200
201	/* Use sndio defaults as the only encodings, but get the supported
202	* sample rates and number of channels.
203	*/
204
205	if (!sio_getpar(sndiosink->hdl, &par))
206	goto no_server_info;
207
208	if (!sio_getcap(sndiosink->hdl, &cap))
209	goto no_server_info;
210
211	rates = g_array_new(FALSE, FALSE, sizeof(int));
212	chans = g_array_new(FALSE, FALSE, sizeof(int));
213
214	/* find confs that have the default encoding */
215	nconfs = 0;
216	for (i = 0; i < cap.nconf; i++) {
217	for (j = 0; j < SIO_NENC; j++) {
218	if (cap.confs[i].enc & (1 << j)) {
219	enc = cap.enc[j];
220	if (enc.bits == par.bits && enc.sig == par.sig && enc.le == par.le) {
221	confs[nconfs] = i;
222	nconfs++;
223	break;
224	}
225	}
226	}
227	}
228
229	/* find the rates and channels of the confs that have the default encoding */
230	for (i = 0; i < nconfs; i++) {
231	conf = cap.confs[confs[i]];
232	/* rates */
233	for (j = 0; j < SIO_NRATE; j++) {
234	if (conf.rate & (1 << j)) {
235	rate = cap.rate[j];
236	for (k = 0; k < rates->len && rate; k++) {
237	if (rate == g_array_index(rates, int, k))
238	rate = 0;
239	}
240	/* add in ascending order */
241	if (rate) {
242	for (k = 0; k < rates->len; k++) {
243	if (rate < g_array_index(rates, int, k)) {
244	g_array_insert_val(rates, k, rate);
245	break;
246	}
247	}
248	if (k == rates->len)
249	g_array_append_val(rates, rate);
250	}
251	}
252	}
253	/* channels */
254	for (j = 0; j < SIO_NCHAN; j++) {
255	if (conf.pchan & (1 << j)) {
256	chan = cap.pchan[j];
257	for (k = 0; k < chans->len && chan; k++) {
258	if (chan == g_array_index(chans, int, k))
259	chan = 0;
260	}
261	/* add in ascending order */
262	if (chan) {
263	for (k = 0; k < chans->len; k++) {
264	if (chan < g_array_index(chans, int, k)) {
265	g_array_insert_val(chans, k, chan);
266	break;
267	}
268	}
269	if (k == chans->len)
270	g_array_append_val(chans, chan);
271	}
272	}
273	}
274	}
275	/* not sure how this can happen, but it might */
276	if (cap.nconf == 0) {
277	g_array_append_val(rates, par.rate);
278	g_array_append_val(chans, par.pchan);
279	}
280
281	g_value_init(&rates_v, GST_TYPE_LIST);
282	g_value_init(&chans_v, GST_TYPE_LIST);
283	g_value_init(&value, G_TYPE_INT);
284
285	for (i = 0; i < rates->len; i++) {
286	g_value_set_int(&value, g_array_index(rates, int, i));
287	gst_value_list_append_value(&rates_v, &value);
288	}
289	for (i = 0; i < chans->len; i++) {
290	g_value_set_int(&value, g_array_index(chans, int, i));
291	gst_value_list_append_value(&chans_v, &value);
292	}
293
294	g_array_free(rates, TRUE);
295	g_array_free(chans, TRUE);
296
297	pad_template = gst_static_pad_template_get (&sndio_sink_factory);
298	sndiosink->cur_caps = gst_caps_copy (gst_pad_template_get_caps (pad_template));
299	gst_object_unref (pad_template);
300
301	for (i = 0; i < sndiosink->cur_caps->structs->len; i++) {
302	GstStructure *s;
303
304	s = gst_caps_get_structure (sndiosink->cur_caps, i);
305	gst_structure_set (s, "endianness", G_TYPE_INT, par.le ? 1234 : 4321, NULL);
306	gst_structure_set (s, "signed", G_TYPE_BOOLEAN, par.sig ? TRUE : FALSE, NULL);
307	gst_structure_set (s, "width", G_TYPE_INT, par.bits, NULL);
308	// gst_structure_set (s, "depth", G_TYPE_INT, par.bps * 8, NULL); /* XXX */
309	gst_structure_set_value (s, "rate", &rates_v);
310	gst_structure_set_value (s, "channels", &chans_v);
311	}
312
313	return TRUE;
314
315	/* ERRORS */
316	couldnt_connect:
317	{
318	GST_ELEMENT_ERROR (sndiosink, RESOURCE, OPEN_WRITE,
319	(_("Could not establish connection to sndio")),
320	("can't open connection to sndio"));
321	return FALSE;
322	}
323	no_server_info:
324	{
325	GST_ELEMENT_ERROR (sndiosink, RESOURCE, OPEN_WRITE,
326	(_("Failed to query sndio capabilities")),
327	("couldn't get sndio info!"));
328	return FALSE;
329	}
330	}	101	}
331		102
332	static gboolean	103	static gboolean
333	gst_sndiosink_close (GstAudioSink * asink)	104	gst_sndiosink_close (GstAudioSink * asink)
334	{	105	{
335	GstSndioSink *sndiosink = GST_SNDIOSINK (asink);	106	GstSndioSink *sink = GST_SNDIOSINK (asink);
336		107
337	GST_DEBUG_OBJECT (sndiosink, "close");	108	return gst_sndio_close (&sink->sndio);
338
339	gst_caps_replace (&sndiosink->cur_caps, NULL);
340	sio_close (sndiosink->hdl);
341	sndiosink->hdl = NULL;
342
343	return TRUE;
344	}	109	}
345		110
346	static void
347	gst_sndiosink_cb(void *addr, int delta)
348	{
349	GstSndioSink sndiosink = GST_SNDIOSINK ((GstAudioSink )addr);
350
351	sndiosink->realpos += delta;
352
353	if (sndiosink->realpos >= sndiosink->playpos)
354	sndiosink->latency = 0;
355	else
356	sndiosink->latency = sndiosink->playpos - sndiosink->realpos;
357	}
358
359	static gboolean	111	static gboolean
360	gst_sndiosink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)	112	gst_sndiosink_prepare (GstAudioSink * asink, GstAudioRingBufferSpec * spec)
361	{	113	{
362	GstSndioSink *sndiosink = GST_SNDIOSINK (asink);	114	GstSndioSink *sink = GST_SNDIOSINK (asink);
363	struct sio_par par;
364	int spec_bpf;
365		115
366	GST_DEBUG_OBJECT (sndiosink, "prepare");	116	return gst_sndio_prepare (&sink->sndio, spec);
367
368	sndiosink->playpos = sndiosink->realpos = sndiosink->latency = 0;
369
370	sio_initpar(&par);
371	par.sig = spec->sign;
372	par.le = !spec->bigend;
373	par.bits = spec->width;
374	// par.bps = spec->depth / 8; /* XXX */
375	par.rate = spec->rate;
376	par.pchan = spec->channels;
377
378	spec_bpf = ((spec->width / 8) * spec->channels);
379
380	par.appbufsz = (spec->segsize * spec->segtotal) / spec_bpf;
381
382	if (!sio_setpar(sndiosink->hdl, &par))
383	goto cannot_configure;
384
385	sio_getpar(sndiosink->hdl, &par);
386
387	spec->sign = par.sig;
388	spec->bigend = !par.le;
389	spec->width = par.bits;
390	// spec->depth = par.bps * 8; /* XXX */
391	spec->rate = par.rate;
392	spec->channels = par.pchan;
393
394	sndiosink->bpf = par.bps * par.pchan;
395
396	spec->segsize = par.round * par.pchan * par.bps;
397	spec->segtotal = par.bufsz / par.round;
398
399	/* FIXME: this is wrong for signed ints (and the
400	* audioringbuffers should do it for us anyway) */
401	spec->silence_sample[0] = 0;
402	spec->silence_sample[1] = 0;
403	spec->silence_sample[2] = 0;
404	spec->silence_sample[3] = 0;
405
406	sio_onmove(sndiosink->hdl, gst_sndiosink_cb, sndiosink);
407
408	if (!sio_start(sndiosink->hdl))
409	goto cannot_start;
410
411	GST_INFO_OBJECT (sndiosink, "successfully opened connection to sndio");
412
413	return TRUE;
414
415	/* ERRORS */
416	cannot_configure:
417	{
418	GST_ELEMENT_ERROR (sndiosink, RESOURCE, OPEN_WRITE,
419	(_("Could not configure sndio")),
420	("can't configure sndio"));
421	return FALSE;
422	}
423	cannot_start:
424	{
425	GST_ELEMENT_ERROR (sndiosink, RESOURCE, OPEN_WRITE,
426	(_("Could not start sndio")),
427	("can't start sndio"));
428	return FALSE;
429	}
430	}	117	}
431		118
432	static gboolean	119	static gboolean
433	gst_sndiosink_unprepare (GstAudioSink * asink)	120	gst_sndiosink_unprepare (GstAudioSink * asink)
434	{	121	{
435	GstSndioSink *sndiosink = GST_SNDIOSINK (asink);	122	GstSndioSink *sink = GST_SNDIOSINK (asink);
436		123
437	if (sndiosink->hdl == NULL)	124	return gst_sndio_unprepare (&sink->sndio);
438	return TRUE;
439
440	sio_stop(sndiosink->hdl);
441
442	return TRUE;
443	}	125	}
444		126
445	static guint	127	static gint
446	gst_sndiosink_write (GstAudioSink * asink, gpointer data, guint length)	128	gst_sndiosink_write (GstAudioSink * asink, gpointer data, guint length)
447	{	129	{
448	GstSndioSink *sndiosink = GST_SNDIOSINK (asink);	130	GstSndioSink *sink = GST_SNDIOSINK (asink);
449	guint done;	131	guint done;
450		132
451	done = sio_write (sndiosink->hdl, data, length);	133	if (length == 0)
452
453	if (done == 0)
454	goto write_error;
455
456	sndiosink->playpos += (done / sndiosink->bpf);
457
458	data = (char *) data + done;
459
460	return done;
461
462	/* ERRORS */
463	write_error:
464	{
465	GST_ELEMENT_ERROR (sndiosink, RESOURCE, WRITE,
466	("Failed to write data to sndio"), GST_ERROR_SYSTEM);
467	return 0;	134	return 0;
		135	done = sio_write (sink->sndio.hdl, data, length);
		136	if (done == 0) {
		137	GST_ELEMENT_ERROR (sink, RESOURCE, WRITE,
		138	("Failed to write data to sndio"), (NULL));
		139	return 0;
468	}	140	}
		141	sink->sndio.delay += done;
		142	return done;
469	}	143	}
470		144
471	static guint	145	static guint
472	gst_sndiosink_delay (GstAudioSink * asink)	146	gst_sndiosink_delay (GstAudioSink * asink)
473	{	147	{
474	GstSndioSink *sndiosink = GST_SNDIOSINK (asink);	148	GstSndioSink *sink = GST_SNDIOSINK (asink);
475		149
476	if (sndiosink->latency == (guint) - 1) {	150	return GST_SNDIO_DELAY(&sink->sndio);
477	GST_WARNING_OBJECT (asink, "couldn't get latency");
478	return 0;
479	}
480
481	GST_DEBUG_OBJECT (asink, "got latency: %u", sndiosink->latency);
482
483	return sndiosink->latency;
484	}	151	}
485		152
486	static void	153	static void
487	gst_sndiosink_reset (GstAudioSink * asink)	154	gst_sndiosink_reset (GstAudioSink * asink)
488	{	155	{
489	/* no way to flush the buffers with sndio ? */
490
491	GST_DEBUG_OBJECT (asink, "reset called");
492	}	156	}
493		157
494	static void	158	static void
495	gst_sndiosink_set_property (GObject * object, guint prop_id, const GValue * value,	159	gst_sndiosink_set_property (GObject * object, guint prop_id,
496	GParamSpec * pspec)	160	const GValue * value, GParamSpec * pspec)
497	{	161	{
498	GstSndioSink *sndiosink = GST_SNDIOSINK (object);	162	GstSndioSink *sink = GST_SNDIOSINK (object);
499		163
500	switch (prop_id) {	164	gst_sndio_set_property (&sink->sndio, prop_id, value, pspec);
501	case PROP_HOST:
502	g_free (sndiosink->host);
503	sndiosink->host = g_value_dup_string (value);
504	break;
505	default:
506	break;
507	}
508	}	165	}
509		166
510	static void	167	static void
Lines 511-524 Link Here
511	gst_sndiosink_get_property (GObject * object, guint prop_id, GValue * value,	168	gst_sndiosink_get_property (GObject * object, guint prop_id, GValue * value,
512	GParamSpec * pspec)	169	GParamSpec * pspec)
513	{	170	{
514	GstSndioSink *sndiosink = GST_SNDIOSINK (object);	171	GstSndioSink *sink = GST_SNDIOSINK (object);
515		172
516	switch (prop_id) {	173	gst_sndio_get_property (&sink->sndio, prop_id, value, pspec);
517	case PROP_HOST:
518	g_value_set_string (value, sndiosink->host);
519	break;
520	default:
521	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
522	break;
523	}
524	}	174	}
		175
		176	static void
		177	gst_sndiosink_class_init (GstSndioSinkClass * klass)
		178	{
		179	GObjectClass *gobject_class;
		180	GstElementClass *gstelement_class;
		181	GstBaseSinkClass *gstbasesink_class;
		182	GstAudioBaseSinkClass *gstbaseaudiosink_class;
		183	GstAudioSinkClass *gstaudiosink_class;
		184
		185	gobject_class = (GObjectClass *) klass;
		186	gstelement_class = (GstElementClass *) klass;
		187	gstbasesink_class = (GstBaseSinkClass *) klass;
		188	gstbaseaudiosink_class = (GstAudioBaseSinkClass *) klass;
		189	gstaudiosink_class = (GstAudioSinkClass *) klass;
		190
		191	parent_class = g_type_class_peek_parent (klass);
		192
		193	gobject_class->finalize = gst_sndiosink_finalize;
		194	gobject_class->get_property = gst_sndiosink_get_property;
		195	gobject_class->set_property = gst_sndiosink_set_property;
		196
		197	gst_element_class_set_static_metadata (gstelement_class,
		198	"Audio sink (sndio)", "Sink/Audio",
		199	"Output to a sound card via sndio",
		200	"Jacob Meuser <jakemsr@sdf.lonestar.org>");
		201
		202	gst_element_class_add_pad_template (gstelement_class,
		203	gst_static_pad_template_get (&sndiosink_factory));
		204
		205	gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_sndiosink_getcaps);
		206	gstaudiosink_class->open = GST_DEBUG_FUNCPTR (gst_sndiosink_open);
		207	gstaudiosink_class->prepare = GST_DEBUG_FUNCPTR (gst_sndiosink_prepare);
		208	gstaudiosink_class->unprepare = GST_DEBUG_FUNCPTR (gst_sndiosink_unprepare);
		209	gstaudiosink_class->close = GST_DEBUG_FUNCPTR (gst_sndiosink_close);
		210	gstaudiosink_class->write = GST_DEBUG_FUNCPTR (gst_sndiosink_write);
		211	gstaudiosink_class->delay = GST_DEBUG_FUNCPTR (gst_sndiosink_delay);
		212	gstaudiosink_class->reset = GST_DEBUG_FUNCPTR (gst_sndiosink_reset);
		213
		214	g_object_class_install_property (gobject_class, PROP_DEVICE,
		215	g_param_spec_string ("device", "Device",
		216	"sndio device as defined in sndio(7)",
		217	SIO_DEVANY, G_PARAM_READWRITE \| G_PARAM_STATIC_STRINGS));
		218	g_object_class_install_property (gobject_class, PROP_VOLUME,
		219	g_param_spec_double ("volume", "Volume",
		220	"Linear volume of this stream, 1.0=100%", 0.0, 1.0,
		221	1.0, G_PARAM_READWRITE \| G_PARAM_STATIC_STRINGS));
		222	g_object_class_install_property (gobject_class, PROP_MUTE,
		223	g_param_spec_boolean ("mute", "Mute",
		224	"Mute state of this stream", FALSE,
		225	G_PARAM_READWRITE \| G_PARAM_STATIC_STRINGS));
		226	}

Lines 1-5 Link Here

(-)java/openjfx8-devel/files/sndiosink.h (-15 / +5 lines)
1	/*	1	/*
2	* Copyright (C) <2008> Jacob Meuser <jakemsr@sdf.lonestar.org>	2	* Copyright (C) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
		3	* Copyright (C) 2012 Alexandre Ratchov <alex@caoua.org>
3	*	4	*
4	* Permission to use, copy, modify, and distribute this software for any	5	* Permission to use, copy, modify, and distribute this software for any
5	* purpose with or without fee is hereby granted, provided that the above	6	* purpose with or without fee is hereby granted, provided that the above
Lines 22-27 Link Here
22		23
23	#include <gst/gst.h>	24	#include <gst/gst.h>
24	#include <gst/audio/gstaudiosink.h>	25	#include <gst/audio/gstaudiosink.h>
		26	#include "gstsndio.h"
25		27
26	G_BEGIN_DECLS	28	G_BEGIN_DECLS
27		29
Lines 40-59 Link Here
40	typedef struct _GstSndioSinkClass GstSndioSinkClass;	42	typedef struct _GstSndioSinkClass GstSndioSinkClass;
41		43
42	struct _GstSndioSink {	44	struct _GstSndioSink {
43	GstAudioSink sink;	45	GstAudioSink sink;
44		46	struct gstsndio sndio;
45	struct sio_hdl *hdl;
46	gchar *host;
47
48	/* bytes per frame */
49	int bpf;
50
51	/* frames counts */
52	volatile long long realpos;
53	volatile long long playpos;
54	volatile guint latency;
55
56	GstCaps *cur_caps;
57	};	47	};
58		48
59	struct _GstSndioSinkClass {	49	struct _GstSndioSinkClass {

Lines 1-41 Link Here

(-)devel/gradle4/pkg-plist (-89 / +94 lines)
1	bin/gradle%%PKGNAMESUFFIX%%	1	bin/gradle%%PKGNAMESUFFIX%%
2	%%DATADIR%%/lib/annotations-13.0.jar	2	%%DATADIR%%/lib/annotations-13.0.jar
3	%%DATADIR%%/lib/ant-1.9.9.jar	3	%%DATADIR%%/lib/ant-1.9.11.jar
4	%%DATADIR%%/lib/ant-launcher-1.9.9.jar	4	%%DATADIR%%/lib/ant-launcher-1.9.11.jar
5	%%DATADIR%%/lib/asm-6.0.jar	5	%%DATADIR%%/lib/asm-6.2.jar
6	%%DATADIR%%/lib/asm-commons-6.0.jar	6	%%DATADIR%%/lib/asm-analysis-6.2.jar
7	%%DATADIR%%/lib/asm-tree-6.0.jar	7	%%DATADIR%%/lib/asm-commons-6.2.jar
		8	%%DATADIR%%/lib/asm-tree-6.2.jar
8	%%DATADIR%%/lib/commons-collections-3.2.2.jar	9	%%DATADIR%%/lib/commons-collections-3.2.2.jar
9	%%DATADIR%%/lib/commons-compress-1.14.jar	10	%%DATADIR%%/lib/commons-compress-1.14.jar
10	%%DATADIR%%/lib/commons-io-2.4.jar	11	%%DATADIR%%/lib/commons-io-2.4.jar
11	%%DATADIR%%/lib/commons-lang-2.6.jar	12	%%DATADIR%%/lib/commons-lang-2.6.jar
12	%%DATADIR%%/lib/fastutil-7.2.1-min.jar	13	%%DATADIR%%/lib/fastutil-7.2.1-min.jar
13	%%DATADIR%%/lib/gradle-base-services-4.6.jar	14	%%DATADIR%%/lib/gradle-api-metadata-4.10.3.jar
14	%%DATADIR%%/lib/gradle-base-services-groovy-4.6.jar	15	%%DATADIR%%/lib/gradle-base-services-4.10.3.jar
15	%%DATADIR%%/lib/gradle-build-cache-4.6.jar	16	%%DATADIR%%/lib/gradle-base-services-groovy-4.10.3.jar
16	%%DATADIR%%/lib/gradle-build-option-4.6.jar	17	%%DATADIR%%/lib/gradle-build-cache-4.10.3.jar
17	%%DATADIR%%/lib/gradle-cli-4.6.jar	18	%%DATADIR%%/lib/gradle-build-option-4.10.3.jar
18	%%DATADIR%%/lib/gradle-core-4.6.jar	19	%%DATADIR%%/lib/gradle-cli-4.10.3.jar
19	%%DATADIR%%/lib/gradle-core-api-4.6.jar	20	%%DATADIR%%/lib/gradle-core-4.10.3.jar
20	%%DATADIR%%/lib/gradle-docs-4.6.jar	21	%%DATADIR%%/lib/gradle-core-api-4.10.3.jar
21	%%DATADIR%%/lib/gradle-installation-beacon-4.6.jar	22	%%DATADIR%%/lib/gradle-docs-4.10.3.jar
22	%%DATADIR%%/lib/gradle-jvm-services-4.6.jar	23	%%DATADIR%%/lib/gradle-installation-beacon-4.10.3.jar
23	%%DATADIR%%/lib/gradle-kotlin-dsl-0.15.6.jar	24	%%DATADIR%%/lib/gradle-jvm-services-4.10.3.jar
24	%%DATADIR%%/lib/gradle-kotlin-dsl-tooling-builders-0.15.6.jar	25	%%DATADIR%%/lib/gradle-kotlin-dsl-1.0-rc-6.jar
25	%%DATADIR%%/lib/gradle-kotlin-dsl-tooling-models-0.15.6.jar	26	%%DATADIR%%/lib/gradle-kotlin-dsl-provider-plugins-1.0-rc-6.jar
26	%%DATADIR%%/lib/gradle-launcher-4.6.jar	27	%%DATADIR%%/lib/gradle-kotlin-dsl-tooling-builders-1.0-rc-6.jar
27	%%DATADIR%%/lib/gradle-logging-4.6.jar	28	%%DATADIR%%/lib/gradle-kotlin-dsl-tooling-models-1.0-rc-6.jar
28	%%DATADIR%%/lib/gradle-messaging-4.6.jar	29	%%DATADIR%%/lib/gradle-launcher-4.10.3.jar
29	%%DATADIR%%/lib/gradle-model-core-4.6.jar	30	%%DATADIR%%/lib/gradle-logging-4.10.3.jar
30	%%DATADIR%%/lib/gradle-model-groovy-4.6.jar	31	%%DATADIR%%/lib/gradle-messaging-4.10.3.jar
31	%%DATADIR%%/lib/gradle-native-4.6.jar	32	%%DATADIR%%/lib/gradle-model-core-4.10.3.jar
32	%%DATADIR%%/lib/gradle-persistent-cache-4.6.jar	33	%%DATADIR%%/lib/gradle-model-groovy-4.10.3.jar
33	%%DATADIR%%/lib/gradle-process-services-4.6.jar	34	%%DATADIR%%/lib/gradle-native-4.10.3.jar
34	%%DATADIR%%/lib/gradle-resources-4.6.jar	35	%%DATADIR%%/lib/gradle-persistent-cache-4.10.3.jar
35	%%DATADIR%%/lib/gradle-runtime-api-info-4.6.jar	36	%%DATADIR%%/lib/gradle-process-services-4.10.3.jar
36	%%DATADIR%%/lib/gradle-tooling-api-4.6.jar	37	%%DATADIR%%/lib/gradle-resources-4.10.3.jar
37	%%DATADIR%%/lib/gradle-wrapper-4.6.jar	38	%%DATADIR%%/lib/gradle-runtime-api-info-4.10.3.jar
38	%%DATADIR%%/lib/groovy-all-2.4.12.jar	39	%%DATADIR%%/lib/gradle-tooling-api-4.10.3.jar
		40	%%DATADIR%%/lib/gradle-wrapper-4.10.3.jar
		41	%%DATADIR%%/lib/groovy-all-2.4.15.jar
39	%%DATADIR%%/lib/guava-jdk5-17.0.jar	42	%%DATADIR%%/lib/guava-jdk5-17.0.jar
40	%%DATADIR%%/lib/jansi-1.14.jar	43	%%DATADIR%%/lib/jansi-1.14.jar
41	%%DATADIR%%/lib/javax.inject-1.jar	44	%%DATADIR%%/lib/javax.inject-1.jar
Lines 43-55 Link Here
43	%%DATADIR%%/lib/jcl-over-slf4j-1.7.16.jar	46	%%DATADIR%%/lib/jcl-over-slf4j-1.7.16.jar
44	%%DATADIR%%/lib/jsr305-2.0.1.jar	47	%%DATADIR%%/lib/jsr305-2.0.1.jar
45	%%DATADIR%%/lib/jul-to-slf4j-1.7.16.jar	48	%%DATADIR%%/lib/jul-to-slf4j-1.7.16.jar
46	%%DATADIR%%/lib/kotlin-compiler-embeddable-1.2.21.jar	49	%%DATADIR%%/lib/kotlin-compiler-embeddable-1.2.61.jar
47	%%DATADIR%%/lib/kotlin-reflect-1.2.21.jar	50	%%DATADIR%%/lib/kotlin-reflect-1.2.61.jar
48	%%DATADIR%%/lib/kotlin-sam-with-receiver-compiler-plugin-1.2.21.jar	51	%%DATADIR%%/lib/kotlin-sam-with-receiver-compiler-plugin-1.2.61.jar
49	%%DATADIR%%/lib/kotlin-script-runtime-1.2.21.jar	52	%%DATADIR%%/lib/kotlin-script-runtime-1.2.61.jar
50	%%DATADIR%%/lib/kotlin-stdlib-1.2.21.jar	53	%%DATADIR%%/lib/kotlin-stdlib-1.2.61.jar
51	%%DATADIR%%/lib/kotlin-stdlib-jdk7-1.2.21.jar	54	%%DATADIR%%/lib/kotlin-stdlib-common-1.2.61.jar
52	%%DATADIR%%/lib/kotlin-stdlib-jdk8-1.2.21.jar	55	%%DATADIR%%/lib/kotlin-stdlib-jdk7-1.2.61.jar
		56	%%DATADIR%%/lib/kotlin-stdlib-jdk8-1.2.61.jar
53	%%DATADIR%%/lib/kryo-2.20.jar	57	%%DATADIR%%/lib/kryo-2.20.jar
54	%%DATADIR%%/lib/log4j-over-slf4j-1.7.16.jar	58	%%DATADIR%%/lib/log4j-over-slf4j-1.7.16.jar
55	%%DATADIR%%/lib/minlog-1.2.jar	59	%%DATADIR%%/lib/minlog-1.2.jar
Lines 75-81 Link Here
75	%%DATADIR%%/lib/plugins/aether-spi-1.13.1.jar	79	%%DATADIR%%/lib/plugins/aether-spi-1.13.1.jar
76	%%DATADIR%%/lib/plugins/aether-util-1.13.1.jar	80	%%DATADIR%%/lib/plugins/aether-util-1.13.1.jar
77	%%DATADIR%%/lib/plugins/apiguardian-api-1.0.0.jar	81	%%DATADIR%%/lib/plugins/apiguardian-api-1.0.0.jar
78	%%DATADIR%%/lib/plugins/asm-util-6.0.jar	82	%%DATADIR%%/lib/plugins/asm-util-6.2.jar
79	%%DATADIR%%/lib/plugins/aws-java-sdk-core-1.11.267.jar	83	%%DATADIR%%/lib/plugins/aws-java-sdk-core-1.11.267.jar
80	%%DATADIR%%/lib/plugins/aws-java-sdk-kms-1.11.267.jar	84	%%DATADIR%%/lib/plugins/aws-java-sdk-kms-1.11.267.jar
81	%%DATADIR%%/lib/plugins/aws-java-sdk-s3-1.11.267.jar	85	%%DATADIR%%/lib/plugins/aws-java-sdk-s3-1.11.267.jar
Lines 91-142 Link Here
91	%%DATADIR%%/lib/plugins/google-http-client-1.23.0.jar	95	%%DATADIR%%/lib/plugins/google-http-client-1.23.0.jar
92	%%DATADIR%%/lib/plugins/google-http-client-jackson2-1.23.0.jar	96	%%DATADIR%%/lib/plugins/google-http-client-jackson2-1.23.0.jar
93	%%DATADIR%%/lib/plugins/google-oauth-client-1.23.0.jar	97	%%DATADIR%%/lib/plugins/google-oauth-client-1.23.0.jar
94	%%DATADIR%%/lib/plugins/gradle-announce-4.6.jar	98	%%DATADIR%%/lib/plugins/gradle-announce-4.10.3.jar
95	%%DATADIR%%/lib/plugins/gradle-antlr-4.6.jar	99	%%DATADIR%%/lib/plugins/gradle-antlr-4.10.3.jar
96	%%DATADIR%%/lib/plugins/gradle-build-cache-http-4.6.jar	100	%%DATADIR%%/lib/plugins/gradle-build-cache-http-4.10.3.jar
97	%%DATADIR%%/lib/plugins/gradle-build-comparison-4.6.jar	101	%%DATADIR%%/lib/plugins/gradle-build-comparison-4.10.3.jar
98	%%DATADIR%%/lib/plugins/gradle-build-init-4.6.jar	102	%%DATADIR%%/lib/plugins/gradle-build-init-4.10.3.jar
99	%%DATADIR%%/lib/plugins/gradle-code-quality-4.6.jar	103	%%DATADIR%%/lib/plugins/gradle-code-quality-4.10.3.jar
100	%%DATADIR%%/lib/plugins/gradle-composite-builds-4.6.jar	104	%%DATADIR%%/lib/plugins/gradle-composite-builds-4.10.3.jar
101	%%DATADIR%%/lib/plugins/gradle-dependency-management-4.6.jar	105	%%DATADIR%%/lib/plugins/gradle-dependency-management-4.10.3.jar
102	%%DATADIR%%/lib/plugins/gradle-diagnostics-4.6.jar	106	%%DATADIR%%/lib/plugins/gradle-diagnostics-4.10.3.jar
103	%%DATADIR%%/lib/plugins/gradle-ear-4.6.jar	107	%%DATADIR%%/lib/plugins/gradle-ear-4.10.3.jar
104	%%DATADIR%%/lib/plugins/gradle-ide-4.6.jar	108	%%DATADIR%%/lib/plugins/gradle-ide-4.10.3.jar
105	%%DATADIR%%/lib/plugins/gradle-ide-native-4.6.jar	109	%%DATADIR%%/lib/plugins/gradle-ide-native-4.10.3.jar
106	%%DATADIR%%/lib/plugins/gradle-ide-play-4.6.jar	110	%%DATADIR%%/lib/plugins/gradle-ide-play-4.10.3.jar
107	%%DATADIR%%/lib/plugins/gradle-ivy-4.6.jar	111	%%DATADIR%%/lib/plugins/gradle-ivy-4.10.3.jar
108	%%DATADIR%%/lib/plugins/gradle-jacoco-4.6.jar	112	%%DATADIR%%/lib/plugins/gradle-jacoco-4.10.3.jar
109	%%DATADIR%%/lib/plugins/gradle-javascript-4.6.jar	113	%%DATADIR%%/lib/plugins/gradle-javascript-4.10.3.jar
110	%%DATADIR%%/lib/plugins/gradle-language-groovy-4.6.jar	114	%%DATADIR%%/lib/plugins/gradle-language-groovy-4.10.3.jar
111	%%DATADIR%%/lib/plugins/gradle-language-java-4.6.jar	115	%%DATADIR%%/lib/plugins/gradle-language-java-4.10.3.jar
112	%%DATADIR%%/lib/plugins/gradle-language-jvm-4.6.jar	116	%%DATADIR%%/lib/plugins/gradle-language-jvm-4.10.3.jar
113	%%DATADIR%%/lib/plugins/gradle-language-native-4.6.jar	117	%%DATADIR%%/lib/plugins/gradle-language-native-4.10.3.jar
114	%%DATADIR%%/lib/plugins/gradle-language-scala-4.6.jar	118	%%DATADIR%%/lib/plugins/gradle-language-scala-4.10.3.jar
115	%%DATADIR%%/lib/plugins/gradle-maven-4.6.jar	119	%%DATADIR%%/lib/plugins/gradle-maven-4.10.3.jar
116	%%DATADIR%%/lib/plugins/gradle-osgi-4.6.jar	120	%%DATADIR%%/lib/plugins/gradle-osgi-4.10.3.jar
117	%%DATADIR%%/lib/plugins/gradle-platform-base-4.6.jar	121	%%DATADIR%%/lib/plugins/gradle-platform-base-4.10.3.jar
118	%%DATADIR%%/lib/plugins/gradle-platform-jvm-4.6.jar	122	%%DATADIR%%/lib/plugins/gradle-platform-jvm-4.10.3.jar
119	%%DATADIR%%/lib/plugins/gradle-platform-native-4.6.jar	123	%%DATADIR%%/lib/plugins/gradle-platform-native-4.10.3.jar
120	%%DATADIR%%/lib/plugins/gradle-platform-play-4.6.jar	124	%%DATADIR%%/lib/plugins/gradle-platform-play-4.10.3.jar
121	%%DATADIR%%/lib/plugins/gradle-plugin-development-4.6.jar	125	%%DATADIR%%/lib/plugins/gradle-plugin-development-4.10.3.jar
122	%%DATADIR%%/lib/plugins/gradle-plugin-use-4.6.jar	126	%%DATADIR%%/lib/plugins/gradle-plugin-use-4.10.3.jar
123	%%DATADIR%%/lib/plugins/gradle-plugins-4.6.jar	127	%%DATADIR%%/lib/plugins/gradle-plugins-4.10.3.jar
124	%%DATADIR%%/lib/plugins/gradle-publish-4.6.jar	128	%%DATADIR%%/lib/plugins/gradle-publish-4.10.3.jar
125	%%DATADIR%%/lib/plugins/gradle-reporting-4.6.jar	129	%%DATADIR%%/lib/plugins/gradle-reporting-4.10.3.jar
126	%%DATADIR%%/lib/plugins/gradle-resources-gcs-4.6.jar	130	%%DATADIR%%/lib/plugins/gradle-resources-gcs-4.10.3.jar
127	%%DATADIR%%/lib/plugins/gradle-resources-http-4.6.jar	131	%%DATADIR%%/lib/plugins/gradle-resources-http-4.10.3.jar
128	%%DATADIR%%/lib/plugins/gradle-resources-s3-4.6.jar	132	%%DATADIR%%/lib/plugins/gradle-resources-s3-4.10.3.jar
129	%%DATADIR%%/lib/plugins/gradle-resources-sftp-4.6.jar	133	%%DATADIR%%/lib/plugins/gradle-resources-sftp-4.10.3.jar
130	%%DATADIR%%/lib/plugins/gradle-scala-4.6.jar	134	%%DATADIR%%/lib/plugins/gradle-scala-4.10.3.jar
131	%%DATADIR%%/lib/plugins/gradle-signing-4.6.jar	135	%%DATADIR%%/lib/plugins/gradle-signing-4.10.3.jar
132	%%DATADIR%%/lib/plugins/gradle-test-kit-4.6.jar	136	%%DATADIR%%/lib/plugins/gradle-test-kit-4.10.3.jar
133	%%DATADIR%%/lib/plugins/gradle-testing-base-4.6.jar	137	%%DATADIR%%/lib/plugins/gradle-testing-base-4.10.3.jar
134	%%DATADIR%%/lib/plugins/gradle-testing-junit-platform-4.6.jar	138	%%DATADIR%%/lib/plugins/gradle-testing-junit-platform-4.10.3.jar
135	%%DATADIR%%/lib/plugins/gradle-testing-jvm-4.6.jar	139	%%DATADIR%%/lib/plugins/gradle-testing-jvm-4.10.3.jar
136	%%DATADIR%%/lib/plugins/gradle-testing-native-4.6.jar	140	%%DATADIR%%/lib/plugins/gradle-testing-native-4.10.3.jar
137	%%DATADIR%%/lib/plugins/gradle-tooling-api-builders-4.6.jar	141	%%DATADIR%%/lib/plugins/gradle-tooling-api-builders-4.10.3.jar
138	%%DATADIR%%/lib/plugins/gradle-version-control-4.6.jar	142	%%DATADIR%%/lib/plugins/gradle-tooling-native-4.10.3.jar
139	%%DATADIR%%/lib/plugins/gradle-workers-4.6.jar	143	%%DATADIR%%/lib/plugins/gradle-version-control-4.10.3.jar
		144	%%DATADIR%%/lib/plugins/gradle-workers-4.10.3.jar
140	%%DATADIR%%/lib/plugins/gson-2.7.jar	145	%%DATADIR%%/lib/plugins/gson-2.7.jar
141	%%DATADIR%%/lib/plugins/hamcrest-core-1.3.jar	146	%%DATADIR%%/lib/plugins/hamcrest-core-1.3.jar
142	%%DATADIR%%/lib/plugins/httpclient-4.5.5.jar	147	%%DATADIR%%/lib/plugins/httpclient-4.5.5.jar
Lines 143-151 Link Here
143	%%DATADIR%%/lib/plugins/httpcore-4.4.9.jar	148	%%DATADIR%%/lib/plugins/httpcore-4.4.9.jar
144	%%DATADIR%%/lib/plugins/ion-java-1.0.2.jar	149	%%DATADIR%%/lib/plugins/ion-java-1.0.2.jar
145	%%DATADIR%%/lib/plugins/ivy-2.2.0.jar	150	%%DATADIR%%/lib/plugins/ivy-2.2.0.jar
146	%%DATADIR%%/lib/plugins/jackson-annotations-2.8.11.jar	151	%%DATADIR%%/lib/plugins/jackson-annotations-2.9.4.jar
147	%%DATADIR%%/lib/plugins/jackson-core-2.8.11.jar	152	%%DATADIR%%/lib/plugins/jackson-core-2.9.4.jar
148	%%DATADIR%%/lib/plugins/jackson-databind-2.8.11.jar	153	%%DATADIR%%/lib/plugins/jackson-databind-2.9.4.jar
149	%%DATADIR%%/lib/plugins/jatl-0.2.2.jar	154	%%DATADIR%%/lib/plugins/jatl-0.2.2.jar
150	%%DATADIR%%/lib/plugins/jcifs-1.3.17.jar	155	%%DATADIR%%/lib/plugins/jcifs-1.3.17.jar
151	%%DATADIR%%/lib/plugins/jcommander-1.47.jar	156	%%DATADIR%%/lib/plugins/jcommander-1.47.jar
Lines 187-193 Link Here
187	%%DATADIR%%/lib/plugins/wagon-http-shared4-2.4.jar	192	%%DATADIR%%/lib/plugins/wagon-http-shared4-2.4.jar
188	%%DATADIR%%/lib/plugins/wagon-provider-api-2.4.jar	193	%%DATADIR%%/lib/plugins/wagon-provider-api-2.4.jar
189	%%DATADIR%%/lib/plugins/xbean-reflect-3.4.jar	194	%%DATADIR%%/lib/plugins/xbean-reflect-3.4.jar
190	%%DATADIR%%/lib/plugins/xercesImpl-2.11.0.jar	195	%%DATADIR%%/lib/plugins/xercesImpl-2.12.0.jar
191	%%DATADIR%%/lib/reflectasm-1.07-shaded.jar	196	%%DATADIR%%/lib/reflectasm-1.07-shaded.jar
192	%%DATADIR%%/lib/slf4j-api-1.7.16.jar	197	%%DATADIR%%/lib/slf4j-api-1.7.16.jar
193	%%DATADIR%%/lib/xml-apis-1.4.01.jar	198	%%DATADIR%%/lib/xml-apis-1.4.01.jar