Index: head/java/openjfx8-devel/Makefile =================================================================== --- head/java/openjfx8-devel/Makefile (revision 467901) +++ head/java/openjfx8-devel/Makefile (revision 467902) @@ -1,133 +1,131 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= openjfx8 -DISTVERSION= 8u172-b03 -PORTREVISION= 1 +DISTVERSION= 8u172-b11 PORTEPOCH= 1 CATEGORIES= java x11-toolkits devel MASTER_SITES= https://github.com/t6/openjfx/releases/download/release/ \ http://hg.openjdk.java.net/openjfx/8u/rt/archive/${DISTVERSION}${EXTRACT_SUFX}?dummy=/ PKGNAMESUFFIX= -devel MAINTAINER= tobik@FreeBSD.org COMMENT= JavaFX SDK overlay for OpenJDK 8 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= apache-ant>0:devel/apache-ant \ antlr3>0:devel/antlr3 \ gradle>=4.0:devel/gradle \ ${JAVALIBDIR}/junit.jar:java/junit LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 USES= gettext-runtime jpeg pkgconfig sqlite USE_GL= gl USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango USE_JAVA= yes JAVA_VERSION= 1.8 USE_LDCONFIG= yes USE_XORG= x11 xtst xxf86vm OPTIONS_DEFINE= MEDIA SWT TEST WEBKIT OPTIONS_DEFAULT= MEDIA WEBKIT OPTIONS_SUB= yes MEDIA_DESC= Media module SWT_DESC= SWT support MEDIA_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libsndio.so:audio/sndio MEDIA_USES= gmake MEDIA_VARS= COMPILE_MEDIA=true SWT_BUILD_DEPENDS= swt-devel>0:x11-toolkits/swt-devel SWT_RUN_DEPENDS= swt-devel>0:x11-toolkits/swt-devel SWT_VARS= COMPILE_SWT=true 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_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 \ PERL5=build \ RUBY=yes \ XORG=xcomposite,xdamage,xfixes,xrender,xt 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} gradle --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 # port in a non-pristine environment. # The BSD Makefiles for GStreamer-lite and Jfxmedia are based on the # Linux versions. Prepare the tree, so that we only see the changes # from Linux's Makefile in our own patches. pre-patch: @${CP} -r ${WRKSRC}/modules/media/src/main/native/jfxmedia/projects/linux \ ${WRKSRC}/modules/media/src/main/native/jfxmedia/projects/bsd @${CP} -r ${WRKSRC}/modules/media/src/main/native/gstreamer/projects/linux \ ${WRKSRC}/modules/media/src/main/native/gstreamer/projects/bsd post-patch: @${CP} ${FILESDIR}/bsd.gradle ${WRKSRC}/buildSrc # 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 \ ${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 && \ ${LN} -s sndiosink.c bsdaudiosink.c # Pull Java dependencies from LOCALBASE @${REINPLACE_CMD} 's@/usr/local@${LOCALBASE}@g' \ ${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle -# Remove the bundled libicu and libsqlite3. We use the system's -# versions instead. - @${RM} -r ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty/icu \ - ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty/sqlite +# 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 post-patch-SWT-off: @${RM} -r ${WRKSRC}/modules/graphics/src/main/java/com/sun/glass/ui/swt do-configure: @${MKDIR} ${WRKDIR}/gradle-home @${ECHO_CMD} "NUM_COMPILE_THREADS = ${MAKE_JOBS_NUMBER}" > ${WRKSRC}/gradle.properties .for prop in COMPILE_MEDIA COMPILE_WEBKIT AWT_TEST FULL_TEST @${ECHO_CMD} "${prop} = ${${prop}:Ufalse}" >> ${WRKSRC}/gradle.properties .endfor @${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle do-build: @cd ${WRKSRC} && ${GRADLE_RUN} zips do-install: @${MKDIR} ${STAGEDIR}${JAVA_HOME} @${TAR} -C ${STAGEDIR}${JAVA_HOME} \ -xf ${WRKSRC}/build/bundles/javafx-sdk-overlay.zip @${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \; do-test-TEST-on: @cd ${WRKSRC} && ${GRADLE_RUN} check test .include Index: head/java/openjfx8-devel/distinfo =================================================================== --- head/java/openjfx8-devel/distinfo (revision 467901) +++ head/java/openjfx8-devel/distinfo (revision 467902) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517218697 -SHA256 (openjfx8-8u172-b03.tar.gz) = 1648bcce3a9f3ee9ac4353f0b3fb896818a3a89440497d0bb8853d22dddf132d -SIZE (openjfx8-8u172-b03.tar.gz) = 107849167 +TIMESTAMP = 1524062144 +SHA256 (openjfx8-8u172-b11.tar.gz) = 2e88966dadaa93d172a67b6bd6e9f32002ac41e5c4eabf625c143c53f4ed6391 +SIZE (openjfx8-8u172-b11.tar.gz) = 107629343 Index: head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_PlatformJava.cmake =================================================================== --- head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_PlatformJava.cmake (revision 467901) +++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_PlatformJava.cmake (revision 467902) @@ -1,10 +1,8 @@ ---- modules/web/src/main/native/Source/PlatformJava.cmake.orig 2017-09-08 16:56:55 UTC +--- modules/web/src/main/native/Source/PlatformJava.cmake.orig 2018-03-23 23:53:57 UTC +++ modules/web/src/main/native/Source/PlatformJava.cmake -@@ -1,5 +1,5 @@ +@@ -1,4 +1 @@ -add_subdirectory(ThirdParty/sqlite) -add_subdirectory(ThirdParty/icu) -+# add_subdirectory(ThirdParty/sqlite) -+# add_subdirectory(ThirdParty/icu) - - # libxml2 should be compiled only on windows - if (WIN32) +-add_subdirectory(ThirdParty/libxml) +-add_subdirectory(ThirdParty/libxslt) ++ Index: 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_CMakeLists.txt (nonexistent) +++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_CMakeLists.txt (revision 467902) @@ -0,0 +1,10 @@ +--- modules/web/src/main/native/Source/WebCore/CMakeLists.txt.orig 2018-03-23 23:53:57 UTC ++++ modules/web/src/main/native/Source/WebCore/CMakeLists.txt +@@ -131,6 +131,7 @@ set(WebCore_INCLUDE_DIRECTORIES + + set(WebCore_SYSTEM_INCLUDE_DIRECTORIES + ${ICU_INCLUDE_DIRS} ++ ${CMAKE_INSTALL_PREFIX}/include/libxml2 + ) + + set(WebCore_IDL_INCLUDES Property changes on: head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_PlatformJava.cmake =================================================================== --- head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_PlatformJava.cmake (revision 467901) +++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_PlatformJava.cmake (revision 467902) @@ -1,11 +1,22 @@ ---- modules/web/src/main/native/Source/WebCore/PlatformJava.cmake.orig 2018-01-16 01:40:56 UTC +--- 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 -@@ -242,7 +242,7 @@ set(WebCore_FORWARDING_HEADERS_FILES +@@ -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} ) Index: 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_Source_cmake_OptionsJava.cmake (revision 467901) +++ head/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_OptionsJava.cmake (revision 467902) @@ -1,26 +1,29 @@ ---- modules/web/src/main/native/Source/cmake/OptionsJava.cmake.orig 2018-01-16 01:40:56 UTC +--- modules/web/src/main/native/Source/cmake/OptionsJava.cmake.orig 2018-03-23 23:53:57 UTC +++ modules/web/src/main/native/Source/cmake/OptionsJava.cmake -@@ -52,9 +52,9 @@ elseif (APPLE) +@@ -49,9 +49,9 @@ elseif (APPLE) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) elseif (UNIX) #### 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 #### - find_package(LibXml2 2.7.0 REQUIRED) -@@ -191,8 +191,9 @@ if (CMAKE_MAJOR_VERSION LESS 3) + set(CMAKE_SKIP_RPATH TRUE) +@@ -60,11 +60,12 @@ else () endif () 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 ${ICU_JAVA_COMMON_LIB} ${ICU_JAVA_DATA_LIB}) + find_package(JNI REQUIRED) + find_package(Threads REQUIRED) +