svn commit: r507200 - in head: devel/gradle4 java/openjfx8-devel java/openjfx8-devel/files
Tobias Kortkamp
tobik at FreeBSD.org
Tue Jul 23 05:34:23 UTC 2019
Author: tobik
Date: Tue Jul 23 05:34:21 2019
New Revision: 507200
URL: https://svnweb.freebsd.org/changeset/ports/507200
Log:
java/openjfx8-devel: Update to 8u202-b07
- Also update devel/gradle to the latest version on the 4.x branch.
Gradle >=4.8<5 is required to build OpenJFX now.
- GStreamer-lite is now based on GStreamer 1.0, so update the sndio
backend accordingly.
- Add a bunch of missing platform checks which will make it
actually use system fonts as configured.
OpenJFX 8 is unmaintained upstream and has been for a while [1].
Deprecate the port as noone seems to have stepped up to take over
maintainership. No expiration date since this port has multiple
consumers and there is no alternative.
[1] https://mail.openjdk.java.net/pipermail/openjfx-dev/2018-December/023007.html
PR: 237443
Added:
head/java/openjfx8-devel/files/gstsndio.h (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_controls_src_main_java_com_sun_javafx_scene_control_behavior_TextInputControlBehavior.java (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_controls_src_main_java_com_sun_javafx_scene_control_behavior_TextInputControlBindings.java (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_font_LogicalFont.java (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_quantum_GlassSystemMenu.java (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_quantum_WindowStage.java (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_GlassApplication.cpp (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_launcher.c (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_wrapped.c (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_media_src_main_java_com_sun_media_jfxmediaimpl_HostUtils.java (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_media_src_main_java_com_sun_media_jfxmediaimpl_NativeMediaManager.java (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_gstreamer_gst_gstregistry.c (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_projects_build_linux_common_config.h (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_avplugin_Makefile (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_fxplugins_Makefile (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_swing_src_main_java_javafx_embed_swing_JFXPanel.java (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_swing_src_main_java_javafx_embed_swing_SwingNode.java (contents, props changed)
head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_WebKitCompilerFlags.cmake (contents, props changed)
Deleted:
head/java/openjfx8-devel/files/bsd.gradle
head/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_glass__general.cpp
head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_JavaScriptCore_PlatformJava.cmake
head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_CMakeLists.txt
head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_PlatformJava.cmake
Modified:
head/devel/gradle4/Makefile
head/devel/gradle4/distinfo
head/devel/gradle4/pkg-plist
head/java/openjfx8-devel/Makefile
head/java/openjfx8-devel/distinfo
head/java/openjfx8-devel/files/gstsndio.c
head/java/openjfx8-devel/files/patch-build.gradle
head/java/openjfx8-devel/files/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp
head/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_font_PrismFontFactory.java
head/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_prism_impl_PrismSettings.java
head/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h
head/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_gstreamer-lite_Makefile
head/java/openjfx8-devel/files/patch-modules_media_src_main_native_jfxmedia_projects_bsd_Makefile
head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_CMakeLists.txt
head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h
head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_OptionsJava.cmake
head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_TestRunner.cpp
head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_java_CMakeLists.txt
head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_Scripts_webkitdirs.pm
head/java/openjfx8-devel/files/sndiosink.c
head/java/openjfx8-devel/files/sndiosink.h
head/java/openjfx8-devel/pkg-plist
Modified: head/devel/gradle4/Makefile
==============================================================================
--- head/devel/gradle4/Makefile Tue Jul 23 05:32:49 2019 (r507199)
+++ head/devel/gradle4/Makefile Tue Jul 23 05:34:21 2019 (r507200)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gradle
-PORTVERSION= 4.6
+PORTVERSION= 4.10.3
CATEGORIES= devel java
MASTER_SITES= https://downloads.gradle.org/distributions/
PKGNAMESUFFIX= 4
Modified: head/devel/gradle4/distinfo
==============================================================================
--- head/devel/gradle4/distinfo Tue Jul 23 05:32:49 2019 (r507199)
+++ head/devel/gradle4/distinfo Tue Jul 23 05:34:21 2019 (r507200)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499872390
-SHA256 (gradle-4.6-bin.zip) = 98bd5fd2b30e070517e03c51cbb32beee3e2ee1a84003a5a5d748996d4b1b915
-SIZE (gradle-4.6-bin.zip) = 74176889
+TIMESTAMP = 1563780722
+SHA256 (gradle-4.10.3-bin.zip) = 8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e
+SIZE (gradle-4.10.3-bin.zip) = 78422006
Modified: head/devel/gradle4/pkg-plist
==============================================================================
--- head/devel/gradle4/pkg-plist Tue Jul 23 05:32:49 2019 (r507199)
+++ head/devel/gradle4/pkg-plist Tue Jul 23 05:34:21 2019 (r507200)
@@ -1,41 +1,44 @@
bin/gradle%%PKGNAMESUFFIX%%
%%DATADIR%%/lib/annotations-13.0.jar
-%%DATADIR%%/lib/ant-1.9.9.jar
-%%DATADIR%%/lib/ant-launcher-1.9.9.jar
-%%DATADIR%%/lib/asm-6.0.jar
-%%DATADIR%%/lib/asm-commons-6.0.jar
-%%DATADIR%%/lib/asm-tree-6.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-base-services-4.6.jar
-%%DATADIR%%/lib/gradle-base-services-groovy-4.6.jar
-%%DATADIR%%/lib/gradle-build-cache-4.6.jar
-%%DATADIR%%/lib/gradle-build-option-4.6.jar
-%%DATADIR%%/lib/gradle-cli-4.6.jar
-%%DATADIR%%/lib/gradle-core-4.6.jar
-%%DATADIR%%/lib/gradle-core-api-4.6.jar
-%%DATADIR%%/lib/gradle-docs-4.6.jar
-%%DATADIR%%/lib/gradle-installation-beacon-4.6.jar
-%%DATADIR%%/lib/gradle-jvm-services-4.6.jar
-%%DATADIR%%/lib/gradle-kotlin-dsl-0.15.6.jar
-%%DATADIR%%/lib/gradle-kotlin-dsl-tooling-builders-0.15.6.jar
-%%DATADIR%%/lib/gradle-kotlin-dsl-tooling-models-0.15.6.jar
-%%DATADIR%%/lib/gradle-launcher-4.6.jar
-%%DATADIR%%/lib/gradle-logging-4.6.jar
-%%DATADIR%%/lib/gradle-messaging-4.6.jar
-%%DATADIR%%/lib/gradle-model-core-4.6.jar
-%%DATADIR%%/lib/gradle-model-groovy-4.6.jar
-%%DATADIR%%/lib/gradle-native-4.6.jar
-%%DATADIR%%/lib/gradle-persistent-cache-4.6.jar
-%%DATADIR%%/lib/gradle-process-services-4.6.jar
-%%DATADIR%%/lib/gradle-resources-4.6.jar
-%%DATADIR%%/lib/gradle-runtime-api-info-4.6.jar
-%%DATADIR%%/lib/gradle-tooling-api-4.6.jar
-%%DATADIR%%/lib/gradle-wrapper-4.6.jar
-%%DATADIR%%/lib/groovy-all-2.4.12.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
@@ -43,13 +46,14 @@ bin/gradle%%PKGNAMESUFFIX%%
%%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.21.jar
-%%DATADIR%%/lib/kotlin-reflect-1.2.21.jar
-%%DATADIR%%/lib/kotlin-sam-with-receiver-compiler-plugin-1.2.21.jar
-%%DATADIR%%/lib/kotlin-script-runtime-1.2.21.jar
-%%DATADIR%%/lib/kotlin-stdlib-1.2.21.jar
-%%DATADIR%%/lib/kotlin-stdlib-jdk7-1.2.21.jar
-%%DATADIR%%/lib/kotlin-stdlib-jdk8-1.2.21.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
@@ -75,7 +79,7 @@ bin/gradle%%PKGNAMESUFFIX%%
%%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.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
@@ -91,61 +95,62 @@ bin/gradle%%PKGNAMESUFFIX%%
%%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.6.jar
-%%DATADIR%%/lib/plugins/gradle-antlr-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-build-cache-http-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-build-comparison-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-build-init-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-code-quality-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-composite-builds-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-dependency-management-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-diagnostics-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-ear-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-ide-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-ide-native-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-ide-play-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-ivy-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-jacoco-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-javascript-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-language-groovy-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-language-java-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-language-jvm-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-language-native-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-language-scala-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-maven-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-osgi-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-platform-base-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-platform-jvm-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-platform-native-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-platform-play-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-plugin-development-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-plugin-use-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-plugins-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-publish-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-reporting-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-resources-gcs-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-resources-http-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-resources-s3-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-resources-sftp-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-scala-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-signing-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-test-kit-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-testing-base-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-testing-junit-platform-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-testing-jvm-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-testing-native-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-tooling-api-builders-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-version-control-4.6.jar
-%%DATADIR%%/lib/plugins/gradle-workers-4.6.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.8.11.jar
-%%DATADIR%%/lib/plugins/jackson-core-2.8.11.jar
-%%DATADIR%%/lib/plugins/jackson-databind-2.8.11.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
@@ -187,7 +192,7 @@ bin/gradle%%PKGNAMESUFFIX%%
%%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.11.0.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
Modified: head/java/openjfx8-devel/Makefile
==============================================================================
--- head/java/openjfx8-devel/Makefile Tue Jul 23 05:32:49 2019 (r507199)
+++ head/java/openjfx8-devel/Makefile Tue Jul 23 05:34:21 2019 (r507200)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= openjfx8
-DISTVERSION= 8u172-b11
-PORTREVISION= 7
+DISTVERSION= 8u202-b07
PORTEPOCH= 1
CATEGORIES= java x11-toolkits devel
MASTER_SITES= https://github.com/t6/openjfx/releases/download/release/ \
@@ -16,23 +15,31 @@ COMMENT= JavaFX SDK overlay for OpenJDK 8
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.0:devel/gradle4 \
+ 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 pkgconfig sqlite
+USES= gettext-runtime gl gnome jpeg localbase:ldflags pkgconfig sqlite
USE_GL= gl
-USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango
+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
@@ -53,8 +60,8 @@ TEST_USES= display:test
TEST_VARS= AWT_TEST=true FULL_TEST=true
# Gradle calls CMake during the build
-WEBKIT_BUILD_DEPENDS= cmake:devel/cmake
WEBKIT_IMPLIES= MEDIA
+WEBKIT_BUILD_DEPENDS= cmake:devel/cmake
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 \
@@ -64,14 +71,11 @@ 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= GRADLE_USER_HOME=${WRKDIR}/gradle-home \
- CC=${CC} CXX=${CXX}
-GRADLE_RUN= ${SETENV} ${GRADLE_ENV} gradle4 --no-daemon
+_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
@@ -87,14 +91,21 @@ pre-patch:
${WRKSRC}/modules/media/src/main/native/gstreamer/projects/bsd
post-patch:
- @${CP} ${FILESDIR}/bsd.gradle ${WRKSRC}/buildSrc
+ @${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 at g' -e 's at -DLINUX@-DFREEBSD at g' -e 's at LINUX@BSD at g' \
+ -e 's at linux_@bsd_ at 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.c ${FILESDIR}/sndiosink.c ${FILESDIR}/sndiosink.h \
+ @${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 && \
@@ -105,6 +116,9 @@ post-patch:
# 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
@@ -118,7 +132,7 @@ do-configure:
@${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle
do-build:
- @cd ${WRKSRC} && ${GRADLE_RUN} zips
+ @cd ${WRKSRC} && ${_GRADLE_RUN} zips
do-install:
@${MKDIR} ${STAGEDIR}${JAVA_HOME}
@@ -127,6 +141,6 @@ do-install:
@${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \;
do-test-TEST-on:
- @cd ${WRKSRC} && ${GRADLE_RUN} check test
+ @cd ${WRKSRC} && ${_GRADLE_RUN} check test
.include <bsd.port.mk>
Modified: head/java/openjfx8-devel/distinfo
==============================================================================
--- head/java/openjfx8-devel/distinfo Tue Jul 23 05:32:49 2019 (r507199)
+++ head/java/openjfx8-devel/distinfo Tue Jul 23 05:34:21 2019 (r507200)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524062144
-SHA256 (openjfx8-8u172-b11.tar.gz) = 2e88966dadaa93d172a67b6bd6e9f32002ac41e5c4eabf625c143c53f4ed6391
-SIZE (openjfx8-8u172-b11.tar.gz) = 107629343
+TIMESTAMP = 1563779003
+SHA256 (openjfx8-8u202-b07.tar.gz) = ca98b6d0721a0e4b91d62672e81594c80a47cfb5ded241de50f10ade9884c400
+SIZE (openjfx8-8u202-b07.tar.gz) = 70669594
Modified: head/java/openjfx8-devel/files/gstsndio.c
==============================================================================
--- head/java/openjfx8-devel/files/gstsndio.c Tue Jul 23 05:32:49 2019 (r507199)
+++ head/java/openjfx8-devel/files/gstsndio.c Tue Jul 23 05:34:21 2019 (r507200)
@@ -1,5 +1,6 @@
/*
- * Copyright (C) <2008> Jacob Meuser <jakemsr at sdf.lonestar.org>
+ * Copyright (C) 2008 Jacob Meuser <jakemsr at sdf.lonestar.org>
+ * Copyright (C) 2012 Alexandre Ratchov <alex at 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
@@ -17,26 +18,379 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "sndiosink.h"
+#include <stdio.h>
+#include "gstsndio.h"
+
GST_DEBUG_CATEGORY (gst_sndio_debug);
+#define GST_CAT_DEFAULT gst_sndio_debug
+GType gst_sndiosink_get_type (void);
+
gboolean
plugin_init_alsa (GstPlugin * plugin)
{
- if (!gst_element_register (plugin, "bsdaudiosink", GST_RANK_PRIMARY,
- GST_TYPE_SNDIOSINK)) {
+ GST_DEBUG_CATEGORY_INIT (gst_sndio_debug, "sndio", 0, "sndio plugins");
+
+ /* prefer sndiosink over pulsesink (GST_RANK_PRIMARY + 10) */
+ if (!gst_element_register (plugin, "bsdaudiosink", GST_RANK_PRIMARY + 20,
+ gst_sndiosink_get_type()))
return FALSE;
+ return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+ GST_VERSION_MINOR,
+ sndio,
+ "sndio plugin library",
+ plugin_init_alsa, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
+
+/*
+ * common code to src and sink
+ */
+
+void
+gst_sndio_init (struct gstsndio *sio, GObject *obj)
+{
+ sio->obj = obj;
+ sio->hdl = NULL;
+ sio->device = g_strdup (SIO_DEVANY);
+}
+
+void
+gst_sndio_finalize (struct gstsndio *sio)
+{
+ gst_caps_replace (&sio->cur_caps, NULL);
+ g_free (sio->device);
+}
+
+GstCaps *
+gst_sndio_getcaps (struct gstsndio *sio, GstCaps * filter)
+{
+ if (sio->cur_caps == NULL) {
+ /* XXX */
+ GST_LOG_OBJECT (sio->obj, "getcaps called, returning template caps");
+ return NULL;
}
- GST_DEBUG_CATEGORY_INIT (gst_sndio_debug, "sndio", 0, "sndio elements");
+ GST_LOG_OBJECT (sio->obj, "returning %" GST_PTR_FORMAT, sio->cur_caps);
-#ifdef ENABLE_NLS
- GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
- LOCALEDIR);
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#endif /* ENABLE_NLS */
+ if (filter) {
+ return gst_caps_intersect_full (filter,
+ sio->cur_caps, GST_CAPS_INTERSECT_FIRST);
+ } else {
+ return gst_caps_ref (sio->cur_caps);
+ }
+}
+static void
+gst_sndio_onvol (void *arg, unsigned int vol)
+{
+ struct gstsndio *sio = arg;
+ sio->volume = vol;
+ g_object_notify (G_OBJECT (sio->obj), "mute");
+ g_object_notify (G_OBJECT (sio->obj), "volume");
+}
+
+gboolean
+gst_sndio_open (struct gstsndio *sio, gint mode)
+{
+ GValue list = G_VALUE_INIT, item = G_VALUE_INIT;
+ GstStructure *s;
+ GstCaps *caps;
+ struct sio_enc *enc;
+ struct sio_cap cap;
+ char fmt[16];
+ int i, chan;
+
+ GST_DEBUG_OBJECT (sio->obj, "open");
+
+ sio->hdl = sio_open (sio->device, mode, 0);
+ if (sio->hdl == NULL) {
+ GST_ELEMENT_ERROR (sio->obj, RESOURCE, OPEN_READ_WRITE,
+ ("Couldn't open sndio device"), (NULL));
+ return FALSE;
+ }
+ sio->mode = mode;
+
+ if (!sio_getcap(sio->hdl, &cap)) {
+ GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
+ ("Couldn't get device capabilities"), (NULL));
+ sio_close(sio->hdl);
+ sio->hdl = NULL;
+ return FALSE;
+ }
+ if (cap.nconf == 0) {
+ GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
+ ("Device has empty capabilities"), (NULL));
+ sio_close(sio->hdl);
+ sio->hdl = NULL;
+ return FALSE;
+ }
+ sio_onvol (sio->hdl, gst_sndio_onvol, sio);
+
+ caps = gst_caps_new_empty ();
+ s = gst_structure_new ("audio/x-raw", (char *)NULL, (void *)NULL);
+
+ /*
+ * scan supported rates
+ */
+ g_value_init (&list, GST_TYPE_LIST);
+ g_value_init (&item, G_TYPE_INT);
+ for (i = 0; i < SIO_NRATE; i++) {
+ if ((cap.confs[0].rate & (1 << i)) == 0)
+ continue;
+ g_value_set_int(&item, cap.rate[i]);
+ gst_value_list_append_value (&list, &item);
+ }
+ gst_structure_set_value (s, "rate", &list);
+ g_value_unset (&item);
+ g_value_unset (&list);
+
+ /*
+ * scan supported channels
+ */
+ g_value_init (&list, GST_TYPE_LIST);
+ g_value_init (&item, G_TYPE_INT);
+ chan = (mode == SIO_PLAY) ? cap.confs[0].pchan : cap.confs[0].rchan;
+ for (i = 0; i < SIO_NCHAN; i++) {
+ if ((chan & (1 << i)) == 0)
+ continue;
+ g_value_set_int(&item, (mode == SIO_PLAY) ? cap.pchan[i] : cap.rchan[i]);
+ gst_value_list_append_value (&list, &item);
+ }
+ gst_structure_set_value (s, "channels", &list);
+ g_value_unset (&item);
+ g_value_unset (&list);
+
+ /*
+ * scan supported encodings
+ */
+ g_value_init (&list, GST_TYPE_LIST);
+ g_value_init (&item, G_TYPE_STRING);
+ for (i = 0; i < SIO_NENC; i++) {
+ if ((cap.confs[0].enc & (1 << i)) == 0)
+ continue;
+ enc = cap.enc + i;
+ if (enc->bits % 8 != 0)
+ continue;
+ if (enc->bits < enc->bps * 8 && enc->msb)
+ continue;
+ if (enc->bits == enc->bps * 8) {
+ snprintf(fmt, sizeof(fmt), "%s%u%s",
+ enc->sig ? "S" : "U",
+ enc->bits,
+ enc->bps > 1 ? (enc->le ? "LE" : "BE") : "");
+ } else {
+ snprintf(fmt, sizeof(fmt), "%s%u_%u%s",
+ enc->sig ? "S" : "U",
+ enc->bits,
+ enc->bps * 8,
+ enc->bps > 1 ? (enc->le ? "LE" : "BE") : "");
+ }
+ g_value_set_string(&item, fmt);
+ gst_value_list_append_value (&list, &item);
+ }
+ gst_structure_set_value (s, "format", &list);
+ g_value_unset (&item);
+ g_value_unset (&list);
+
+ /*
+ * add the only supported layout: interleaved
+ */
+ g_value_init (&item, G_TYPE_STRING);
+ g_value_set_string(&item, "interleaved");
+ gst_structure_set_value (s, "layout", &item);
+ g_value_unset (&item);
+
+ gst_caps_append_structure (caps, s);
+ sio->cur_caps = caps;
+ GST_DEBUG ("caps are %s", gst_caps_to_string(caps));
return TRUE;
+}
+
+gboolean
+gst_sndio_close (struct gstsndio *sio)
+{
+ GST_DEBUG_OBJECT (sio->obj, "close");
+
+ gst_caps_replace (&sio->cur_caps, NULL);
+ sio_close (sio->hdl);
+ sio->hdl = NULL;
+ return TRUE;
+}
+
+static void
+gst_sndio_cb (void *addr, int delta)
+{
+ struct gstsndio *sio = addr;
+
+ delta *= sio->bpf;
+ if (sio->mode == SIO_PLAY)
+ sio->delay -= delta;
+ else
+ sio->delay += delta;
+}
+
+gboolean
+gst_sndio_prepare (struct gstsndio *sio, GstAudioRingBufferSpec *spec)
+{
+ struct sio_par par, retpar;
+ unsigned nchannels;
+
+ GST_DEBUG_OBJECT (sio, "prepare");
+
+ if (spec->type != GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW) {
+ GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
+ ("Only raw buffer format supported by sndio"), (NULL));
+ return FALSE;
+ }
+ if (!GST_AUDIO_INFO_IS_INTEGER(&spec->info)) {
+ GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
+ ("Only integer format supported"), (NULL));
+ return FALSE;
+ }
+ if (GST_AUDIO_INFO_DEPTH(&spec->info) % 8) {
+ GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
+ ("Only depths multiple of 8 are supported"), (NULL));
+ return FALSE;
+ }
+
+ sio_initpar (&par);
+ switch (GST_AUDIO_INFO_FORMAT (&spec->info)) {
+ case GST_AUDIO_FORMAT_S8:
+ case GST_AUDIO_FORMAT_U8:
+ case GST_AUDIO_FORMAT_S16LE:
+ case GST_AUDIO_FORMAT_S16BE:
+ case GST_AUDIO_FORMAT_U16LE:
+ case GST_AUDIO_FORMAT_U16BE:
+ case GST_AUDIO_FORMAT_S32LE:
+ case GST_AUDIO_FORMAT_S32BE:
+ case GST_AUDIO_FORMAT_U32LE:
+ case GST_AUDIO_FORMAT_U32BE:
+ case GST_AUDIO_FORMAT_S24_32LE:
+ case GST_AUDIO_FORMAT_S24_32BE:
+ case GST_AUDIO_FORMAT_U24_32LE:
+ case GST_AUDIO_FORMAT_U24_32BE:
+ case GST_AUDIO_FORMAT_S24LE:
+ case GST_AUDIO_FORMAT_S24BE:
+ case GST_AUDIO_FORMAT_U24LE:
+ case GST_AUDIO_FORMAT_U24BE:
+ break;
+ default:
+ GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
+ ("Unsupported audio format"),
+ ("format = %d", GST_AUDIO_INFO_FORMAT (&spec->info)));
+ return FALSE;
+ }
+ par.sig = GST_AUDIO_INFO_IS_SIGNED(&spec->info);
+ par.bits = GST_AUDIO_INFO_WIDTH(&spec->info);
+ par.bps = GST_AUDIO_INFO_DEPTH(&spec->info) / 8;
+ if (par.bps > 1)
+ par.le = GST_AUDIO_INFO_IS_LITTLE_ENDIAN(&spec->info);
+ if (par.bits < par.bps * 8)
+ par.msb = 0;
+ par.rate = GST_AUDIO_INFO_RATE(&spec->info);
+ if (sio->mode == SIO_PLAY)
+ par.pchan = GST_AUDIO_INFO_CHANNELS(&spec->info);
+ else
+ par.rchan = GST_AUDIO_INFO_CHANNELS(&spec->info);
+ par.round = par.rate / 1000000. * spec->latency_time;
+ par.appbufsz = par.rate / 1000000. * spec->buffer_time;
+
+ if (!sio_setpar (sio->hdl, &par)) {
+ GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
+ ("Unsupported audio encoding"), (NULL));
+ return FALSE;
+ }
+ if (!sio_getpar (sio->hdl, &retpar)) {
+ GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
+ ("Couldn't get audio device parameters"), (NULL));
+ return FALSE;
+ }
+#if 0
+ GST_DEBUG ("format = %s, "
+ "requested: sig = %d, bits = %d, bps = %d, le = %d, msb = %d, "
+ "rate = %d, pchan = %d, round = %d, appbufsz = %d; "
+ "returned: sig = %d, bits = %d, bps = %d, le = %d, msb = %d, "
+ "rate = %d, pchan = %d, round = %d, appbufsz = %d, bufsz = %d",
+ GST_AUDIO_INFO_NAME(&spec->info),
+ par.sig, par.bits, par.bps, par.le, par.msb,
+ par.rate, par.pchan, par.round, par.appbufsz,
+ retpar.sig, retpar.bits, retpar.bps, retpar.le, retpar.msb,
+ retpar.rate, retpar.pchan, retpar.round, retpar.appbufsz, retpar.bufsz);
+#endif
+ if (par.bits != retpar.bits ||
+ par.bps != retpar.bps ||
+ par.rate != retpar.rate ||
+ (sio->mode == SIO_PLAY && par.pchan != retpar.pchan) ||
+ (sio->mode == SIO_REC && par.rchan != retpar.rchan) ||
+ (par.bps > 1 && par.le != retpar.le) ||
+ (par.bits < par.bps * 8 && par.msb != retpar.msb)) {
+ GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
+ ("Audio device refused requested parameters"), (NULL));
+ return FALSE;
+ }
+
+ nchannels = (sio->mode == SIO_PLAY) ? retpar.pchan : retpar.rchan;
+ spec->segsize = retpar.round * retpar.bps * nchannels;
+ spec->segtotal = retpar.bufsz / retpar.round;
+ sio->bpf = retpar.bps * nchannels;
+ sio->delay = 0;
+ sio_onmove (sio->hdl, gst_sndio_cb, sio);
+
+ if (!sio_start (sio->hdl)) {
+ GST_ELEMENT_ERROR (sio->obj, RESOURCE, OPEN_READ_WRITE,
+ ("Could not start sndio"), (NULL));
+ return FALSE;
+ }
+ return TRUE;
+}
+
+gboolean
+gst_sndio_unprepare (struct gstsndio *sio)
+{
+ if (sio->hdl)
+ sio_stop (sio->hdl);
+ return TRUE;
+}
+
+void
+gst_sndio_set_property (struct gstsndio *sio, guint prop_id,
+ const GValue * value, GParamSpec * pspec)
+{
+ switch (prop_id) {
+ case PROP_DEVICE:
+ g_free (sio->device);
+ sio->device = g_value_dup_string (value);
+ break;
+ case PROP_VOLUME:
+ sio_setvol (sio->hdl, g_value_get_double (value) * SIO_MAXVOL);
+ break;
+ case PROP_MUTE:
+ if (g_value_get_boolean (value))
+ sio_setvol (sio->hdl, 0);
+ break;
+ default:
+ break;
+ }
+}
+
+void
+gst_sndio_get_property (struct gstsndio *sio, guint prop_id,
+ GValue * value, GParamSpec * pspec)
+{
+ switch (prop_id) {
+ case PROP_DEVICE:
+ g_value_set_string (value, sio->device);
+ break;
+ case PROP_VOLUME:
+ g_value_set_double (value, (gdouble)sio->volume / SIO_MAXVOL);
+ break;
+ case PROP_MUTE:
+ g_value_set_boolean (value, (sio->volume == 0));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (sio->obj, prop_id, pspec);
+ }
}
Added: head/java/openjfx8-devel/files/gstsndio.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/openjfx8-devel/files/gstsndio.h Tue Jul 23 05:34:21 2019 (r507200)
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2012 Alexandre Ratchov <alex at 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
Modified: head/java/openjfx8-devel/files/patch-build.gradle
==============================================================================
--- head/java/openjfx8-devel/files/patch-build.gradle Tue Jul 23 05:32:49 2019 (r507199)
+++ head/java/openjfx8-devel/files/patch-build.gradle Tue Jul 23 05:34:21 2019 (r507200)
@@ -1,6 +1,6 @@
---- build.gradle.orig 2018-01-16 01:40:56 UTC
+--- build.gradle.orig 2018-12-10 16:30:22 UTC
+++ build.gradle
-@@ -251,6 +251,7 @@ ext.IS_64 = OS_ARCH.toLowerCase().contains("64")
+@@ -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")
@@ -8,7 +8,7 @@
// 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
-@@ -311,7 +312,7 @@ defineProperty("COMPILE_MEDIA", "false")
+@@ -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.
@@ -17,17 +17,17 @@
ext.IS_COMPILE_PANGO = Boolean.parseBoolean(COMPILE_PANGO)
// COMPILE_HARFBUZZ specifies whether to use Harfbuzz.
-@@ -342,7 +343,8 @@ ext.SWT_FILE_NAME = IS_MAC ? "org.eclipse.swt.cocoa.ma
- IS_WINDOWS && IS_64 ? "org.eclipse.swt.win32.win32.x86_64_3.7.2.v3740f" :
- IS_WINDOWS && !IS_64 ? "org.eclipse.swt.win32.win32.x86_3.7.2.v3740f" :
- IS_LINUX && IS_64 ? "org.eclipse.swt.gtk.linux.x86_64_3.7.2.v3740f" :
-- IS_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.7.2.v3740f" : ""
-+ IS_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.7.2.v3740f" :
+@@ -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")
-@@ -402,6 +404,12 @@ if (IS_MAC) {
+@@ -404,6 +406,12 @@ if (IS_MAC) {
defineProperty("NUM_COMPILE_THREADS", "${Runtime.runtime.availableProcessors()}")
}
@@ -40,7 +40,7 @@
//
// The next three sections of properties are used to generate the
// VersionInfo class, and the Windows DLL manifest.
-@@ -442,7 +450,7 @@ defineProperty("RELEASE_MILESTONE", jfxReleaseMileston
+@@ -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
@@ -49,7 +49,7 @@
defineProperty("COMPILE_TARGETS", "$defaultHostTarget")
// Flag indicating whether to import cross compile tools
-@@ -549,7 +557,7 @@ void fetchExternalTools(String configName, List packag
+@@ -551,7 +559,7 @@ void fetchExternalTools(String configName, List packag
def File pkgdir = file("$destdir/$basename")
if (pkgname.endsWith(".tgz")) {
@@ -58,7 +58,7 @@
// use native tar to support symlinks
pkgdir.mkdirs()
exec {
-@@ -674,7 +682,7 @@ compileTargets { t ->
+@@ -676,7 +684,7 @@ compileTargets { t ->
if (!targetProperties.containsKey('includeMonocle')) targetProperties.includeMonocle = false
if (!targetProperties.containsKey('includeEGL')) targetProperties.includeEGL = false
@@ -67,7 +67,7 @@
// This value is used to under ./build/${sdkDirName} to allow for
// a common name for the hosted build (for use when building apps)
-@@ -706,7 +714,7 @@ compileTargets { t ->
+@@ -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.
@@ -76,7 +76,7 @@
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") {
-@@ -1169,7 +1177,8 @@ allprojects {
+@@ -1165,7 +1173,8 @@ allprojects {
// By default all of our projects require junit for testing so we can just
// setup this dependency here.
dependencies {
@@ -86,7 +86,7 @@
if (BUILD_CLOSED && DO_JCOV) {
testCompile name: "jcov"
}
-@@ -1307,12 +1316,15 @@ project(":graphics") {
+@@ -1303,12 +1312,15 @@ project(":graphics") {
dependencies {
compile project(":base"), BUILD_SRC
@@ -107,47 +107,17 @@
}
// Create a single "native" task which will depend on all the individual native tasks for graphics
-@@ -1461,7 +1473,7 @@ project(":graphics") {
- workingDir = "modules/graphics"
- main = settings.generator
- classpath = configurations.compile + configurations.antlr3
-- classpath += files("$buildDir/classes/main")
-+ classpath += files("$buildDir/classes/java/main")
- classpath += files("$buildDir/classes/jsl-compilers/decora")
- args = ["-i", sourceDir, "-o", destinationDir, "-t", "-pkg", "com/sun/scenario/effect", "$settings.outputs", "$settings.fileName"]
- jvmArgs "-Djava.ext.dirs="
-@@ -1472,9 +1484,9 @@ project(":graphics") {
- task generateDecoraNativeHeaders(type: JavaHeaderTask, dependsOn: compileDecoraJavaShaders) {
- 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
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list