build.properties

@@ -41,7 +41,7 @@ jfx.release.suffix=-ea
 # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
 jfx.release.major.version=11
 jfx.release.minor.version=0
-jfx.release.security.version=1
+jfx.release.security.version=2
 jfx.release.patch.version=0
 
 # Note: The release version is now calculated in build.gradle as the

buildSrc/android.gradle

@@ -530,7 +530,7 @@ ANDROID.iio = [:]
 ANDROID.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
 ANDROID.iio.nativeSource = [
     file("${project("graphics").projectDir}/src/main/native-iio"),
-    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg7")]
+    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg")]
 ANDROID.iio.compiler = compiler
 ANDROID.iio.ccFlags = [ccFlags, ccWarnFlags, ccArchFlags, ccOptFlags,
     ccDebugFlags, ccDefaultIncludeFlags].flatten()

buildSrc/armv6hf.gradle

@@ -311,7 +311,7 @@ ARMV6HF.iio = [:]
 ARMV6HF.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
 ARMV6HF.iio.nativeSource = [
     file("${project("graphics").projectDir}/src/main/native-iio"),
-    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg7")]
+    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg")]
 ARMV6HF.iio.compiler = compiler
 ARMV6HF.iio.ccFlags = iioCFlags
 ARMV6HF.iio.linker = linker

buildSrc/dalvik.gradle

@@ -689,7 +689,7 @@ DALVIK.iio = [:]
 DALVIK.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
 DALVIK.iio.nativeSource = [
     file("${project("graphics").projectDir}/src/main/native-iio"),
-    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg7")]
+    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg")]
 DALVIK.iio.compiler = compiler
 DALVIK.iio.ccFlags = [ccFlags, ccWarnFlags, ccArchFlags, ccOptFlags,
     ccDebugFlags, ccDefaultIncludeFlags].flatten()

buildSrc/ios.gradle

@@ -307,7 +307,7 @@ IOS.iio.arm = [:]
 IOS.iio.arm.nativeSource = [
     file("${project("graphics").projectDir}/src/main/native-iio"),
     file("${project("graphics").projectDir}/src/main/native-iio/ios"),
-    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg7")]
+    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg")]
 IOS.iio.arm.compiler = compiler
 IOS.iio.arm.ccFlags = ["-x", "objective-c", ccFlags, "-arch", archArm, "-isysroot", sdkPath(iPhoneOS), "-ffast-math"].flatten()
 IOS.iio.arm.linker = linker

buildSrc/linux.gradle

@@ -43,6 +43,7 @@ LINUX.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
+        "-fstack-protector",
         "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
 
 if (!IS_64) {
@@ -57,6 +58,7 @@ def ccFlags = [
 def ccFlagsGTK3 = ccFlags
 //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
 def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
+                 "-z", "relro",
                  "-Wl,--gc-sections"].flatten()
 
 if (IS_DEBUG_NATIVE) {
@@ -281,7 +283,7 @@ if (!IS_64) {
 LINUX.iio = [:]
 LINUX.iio.nativeSource = [
     file("${project("graphics").projectDir}/src/main/native-iio"),
-    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg7")]
+    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg")]
 LINUX.iio.compiler = compiler
 LINUX.iio.ccFlags = [ccFlags].flatten()
 LINUX.iio.linker = linker

buildSrc/mac.gradle

@@ -194,7 +194,7 @@ MAC.iio = [:]
 MAC.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
 MAC.iio.nativeSource = [
     file("${project("graphics").projectDir}/src/main/native-iio"),
-    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg7")]
+    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg")]
 MAC.iio.compiler = compiler
 MAC.iio.ccFlags = [ccFlags].flatten()
 MAC.iio.linker = linker

buildSrc/win.gradle

@@ -408,7 +408,7 @@ WIN.iio = [:]
 WIN.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
 WIN.iio.nativeSource = [
     file("${project("graphics").projectDir}/src/main/native-iio"),
-    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg7")]
+    file("${project("graphics").projectDir}/src/main/native-iio/libjpeg")]
 WIN.iio.compiler = compiler
 WIN.iio.ccFlags = [ccFlags].flatten()
 WIN.iio.linker = linker

debian/changelog

+openjfx (11.0.2+1-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+  * Standards-Version updated to 4.3.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 20 Jan 2019 16:25:28 +0100
+
 openjfx (11.0.1+1-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -43,7 +43,7 @@ Build-Depends: antlr3,
                x11proto-core-dev,
                x11proto-xf86vidmode-dev,
                zip
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/openjfx.git
 Vcs-Browser: https://salsa.debian.org/java-team/openjfx
 Homepage: https://openjfx.io

debian/patches/03-buildflags.patch

@@ -3,10 +3,10 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/buildSrc/linux.gradle
 +++ b/buildSrc/linux.gradle
-@@ -43,8 +43,12 @@
- // A set of common parameters to use for both compiling and linking
+@@ -44,8 +44,12 @@
  def commonFlags = [
          "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
+         "-fstack-protector",
 +        "-Wno-error=cast-function-type",
          "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
  
@@ -16,19 +16,20 @@ Forwarded: no
  if (!IS_64) {
      commonFlags += "-m32"
  }
-@@ -56,8 +60,11 @@
+@@ -57,9 +61,12 @@
          IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
  def ccFlagsGTK3 = ccFlags
  //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
 +ccFlags.addAll("dpkg-buildflags --get CPPFLAGS  ".execute().text.trim().split(" "))
 +ccFlags.addAll("dpkg-buildflags --get CXXFLAGS".execute().text.trim().split(" "))
  def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
+                  "-z", "relro",
                   "-Wl,--gc-sections"].flatten()
 +linkFlags.addAll("dpkg-buildflags --get LDFLAGS".execute().text.trim().split(" "))
  
  if (IS_DEBUG_NATIVE) {
      linkFlags += "-g"
-@@ -285,7 +292,7 @@
+@@ -287,7 +294,7 @@
  LINUX.iio.compiler = compiler
  LINUX.iio.ccFlags = [ccFlags].flatten()
  LINUX.iio.linker = linker
@@ -39,7 +40,7 @@ Forwarded: no
  LINUX.prismES2 = [:]
 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
 +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-@@ -30,11 +30,9 @@
+@@ -31,11 +31,9 @@
           -DGSTREAMER_LITE \
           -ffunction-sections -fdata-sections
  
@@ -56,7 +57,7 @@ Forwarded: no
  PACKAGES_LIBS     := $(shell pkg-config --libs glib-2.0 gobject-2.0)
 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
 +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-@@ -31,12 +31,9 @@
+@@ -32,12 +32,9 @@
           -DGSTREAMER_LITE \
           -ffunction-sections -fdata-sections
  
@@ -74,7 +75,7 @@ Forwarded: no
  	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
 +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
-@@ -52,11 +52,9 @@
+@@ -53,11 +53,9 @@
          -DGST_DISABLE_LOADSAVE  \
          -ffunction-sections -fdata-sections
  
@@ -91,7 +92,7 @@ Forwarded: no
  	   -I$(SRCBASE_DIR)/projects/build/linux/common   \
 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
 +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
-@@ -63,11 +63,9 @@
+@@ -65,11 +65,9 @@
  	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
  endif
  

debian/patches/08-disable-sse2.patch

@@ -3,15 +3,15 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
 +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-@@ -22,7 +22,6 @@
-          -Wextra                 \
+@@ -23,7 +23,6 @@
           -Wformat-security       \
+          -fstack-protector       \
           -Werror=implicit-function-declaration \
 -         -msse2                  \
           -fbuiltin               \
           -DHAVE_STDINT_H         \
           -DLINUX                 \
-@@ -34,6 +33,11 @@
+@@ -35,6 +34,11 @@
  CFLAGS  += $(shell dpkg-buildflags --get CFLAGS) -Wall
  LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
  
@@ -25,15 +25,15 @@ Forwarded: no
  
 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
 +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-@@ -19,7 +19,6 @@
-          -Wextra                 \
+@@ -20,7 +20,6 @@
           -Wformat-security       \
+          -fstack-protector       \
           -Werror=implicit-function-declaration \
 -         -msse2                  \
           -fbuiltin               \
           -DHAVE_STDINT_H         \
           -DLINUX                 \
-@@ -35,6 +34,11 @@
+@@ -36,6 +35,11 @@
  CFLAGS  += $(shell dpkg-buildflags --get CFLAGS) -Wall
  LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
  
@@ -47,9 +47,9 @@ Forwarded: no
             -I../../../gstreamer-lite/gstreamer       \
 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
 +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
-@@ -41,9 +41,13 @@
-                   -Wextra \
+@@ -42,9 +42,13 @@
                    -Wformat-security \
+                   -fstack-protector \
                    -Werror=implicit-function-declaration \
 -		  -msse2 \
  	          -DGSTREAMER_LITE

debian/patches/23-webcore-linker-flags.patch

@@ -4,7 +4,7 @@ Forwarded: no
 Bug-Debian: https://bugs.debian.org/857464
 --- a/modules/javafx.web/src/main/native/Source/WebCore/PlatformJava.cmake
 +++ b/modules/javafx.web/src/main/native/Source/WebCore/PlatformJava.cmake
-@@ -214,7 +214,7 @@
+@@ -216,7 +216,7 @@
      set_target_properties(JFXWebKit PROPERTIES LINK_FLAGS "-exported_symbols_list ${WEBCORE_DIR}/mapfile-macosx")
      set(JFXWebKit_EXTERNAL_DEP "${WEBCORE_DIR}/mapfile-macosx")
  elseif (UNIX)

debian/patches/create-icudt51-missing-dat-files.patch

-Description: Workaround the missing icudt51{e,b}.zip files
- We miss icudt51b.zip and icudt51e.zip on big endian platforms :
-
-From modules/javafx.web/src/main/native/Source/WTF/icu/unicode/utypes.h
- * \def U_ICUDATA_TYPE_LETTER
- *
- * This is a platform-dependent string containing one letter:
- * - b for big-endian, ASCII-family platforms
- * - l for little-endian, ASCII-family platforms
- * - e for big-endian, EBCDIC-family platforms
- * This letter is part of the common data file name.
-
-For little endian, we've got icudt51l.zip in the source tree :
-./modules/javafx.web/src/main/native/Source/ThirdParty/icu/source/data/in/icudt51l.zip
-So let's try to re-use that same .dat file within icudt51l.zip (no guarantee at
-all).
-See https://bugs.debian.org/880359
-
-Author: Frédéric Bonnard <frediz@debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/modules/javafx.web/src/main/native/Source/ThirdParty/icu/java/data/icudata_wrapper.sh
-+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/icu/java/data/icudata_wrapper.sh
-@@ -52,6 +52,10 @@
-     echo "Building icudata for $PLATFORM"
-     mkdir -p $JAVA_LIBDIR/icu/data
-     unzip -o ../../source/data/in/icudt51l.zip -d $JAVA_LIBDIR/icu/data/
-+    cp $JAVA_LIBDIR/icu/data/icudt51l.dat $JAVA_LIBDIR/icu/data/icudt51e.dat
-+    sed -i 's/icudt51l/icudt51e/g' $JAVA_LIBDIR/icu/data/icudt51e.dat
-+    cp $JAVA_LIBDIR/icu/data/icudt51l.dat $JAVA_LIBDIR/icu/data/icudt51b.dat
-+    sed -i 's/icudt51l/icudt51b/g' $JAVA_LIBDIR/icu/data/icudt51b.dat
-     # create icu autoconf build folder
-     cd $JAVA_LIBDIR
-     mkdir -p icu/lib && cd icu

debian/patches/fix-arm32-build.patch

 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
 +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-@@ -60,11 +60,6 @@
+@@ -62,11 +62,6 @@
  LDFLAGS  += $(shell pkg-config --libs libavcodec libavformat)
  endif
  
@@ -14,8 +14,8 @@
            av/decoder.c          \
 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
 +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-@@ -50,11 +50,6 @@
- LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+@@ -52,11 +52,6 @@
+           -z relro \
            -static-libgcc -static-libstdc++ -Wl,--gc-sections
  
 -ifeq ($(ARCH), x32)
@@ -28,8 +28,8 @@
            progressbuffer/hlsprogressbuffer.c \
 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
 +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
-@@ -75,11 +75,6 @@
- LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
+@@ -77,11 +77,6 @@
+           -z relro \
            -static-libgcc -static-libstdc++ -Wl,--gc-sections
  
 -ifeq ($(ARCH), x32)
@@ -42,7 +42,7 @@
              gstreamer/gst/gstallocator.c \
 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
 +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
-@@ -71,11 +71,6 @@
+@@ -73,11 +73,6 @@
  CFLAGS  += $(shell dpkg-buildflags --get CFLAGS) -Wall
  LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
  
@@ -56,7 +56,7 @@
          jni/JavaBandsHolder.cpp 				\
 --- a/buildSrc/linux.gradle
 +++ b/buildSrc/linux.gradle
-@@ -49,10 +49,6 @@
+@@ -50,10 +50,6 @@
  commonFlags.addAll("dpkg-buildflags --get CPPFLAGS  ".execute().text.trim().split(" "))
  commonFlags.addAll("dpkg-buildflags --get CXXFLAGS".execute().text.trim().split(" "))
  
@@ -67,7 +67,7 @@
  // Specify the compilation parameters and link parameters
  def ccFlags = [
          commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
-@@ -270,20 +266,12 @@
+@@ -272,20 +268,12 @@
  LINUX.launcher.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
  LINUX.launcher.linker = linker
  LINUX.launcher.linkFlags = ["-ldl"]

debian/patches/series

@@ -15,4 +15,3 @@ fix-arm32-build.patch
 26-disable-webkit-jit-for-armv4.patch
 29-glibc-compatibility.patch
 disable-jit-for-non-x86.patch
-create-icudt51-missing-dat-files.patch

doc-files/release-notes-11.0.1.md

+# Release Notes for JavaFX 11.0.1
+
+## Introduction
+
+These notes document the JavaFX 11.0.1 update release. As such, they complement
+the [JavaFX 11 Release Notes](https://github.com/javafxports/openjdk-jfx/blob/jfx-11/doc-files/release-notes-11.md).
+
+## List of Fixed Bugs
+
+Issue key|Summary
+---------|-------
+[JDK-8194321] (not public)|Update FX installer
+[JDK-8195879] (not public)|Improve media support
+[JDK-8204365] (not public)|Improve WebView processing
+[JDK-8204880] (not public)|Enhance object method calls
+[JDK-8207387] (not public)|WebView is not rendering html checkbox and radio buttons
+[JDK-8210386](https://bugs.openjdk.java.net/browse/JDK-8210386)|Clipping problems with complex affine transforms: negative scaling factors or small scaling factors
+

modules/javafx.graphics/src/main/java/com/sun/prism/Graphics.java

@@ -31,6 +31,7 @@ import com.sun.javafx.geom.RectBounds;
 import com.sun.javafx.geom.Rectangle;
 import com.sun.javafx.geom.Shape;
 import com.sun.javafx.geom.transform.BaseTransform;
+import com.sun.javafx.geom.transform.GeneralTransform3D;
 import com.sun.javafx.scene.text.GlyphList;
 import com.sun.javafx.sg.prism.NGCamera;
 import com.sun.javafx.sg.prism.NGLightBase;
@@ -57,6 +58,7 @@ public interface Graphics {
     public void scale(float sx, float sy);
     public void scale(float sx, float sy, float sz);
 
+    public void setPerspectiveTransform(GeneralTransform3D perspectiveTransform);
     public void setCamera(NGCamera camera);
     public NGCamera getCameraNoClone();
     public void setDepthTest(boolean depthTest);

modules/javafx.graphics/src/main/java/com/sun/prism/d3d/D3DContext.java

@@ -283,15 +283,27 @@ class D3DContext extends BaseShaderContext {
 
     @Override
     protected void updateShaderTransform(Shader shader, BaseTransform xform) {
+        if (xform == null) {
+            xform = BaseTransform.IDENTITY_TRANSFORM;
+        }
+
+        final GeneralTransform3D perspectiveTransform = getPerspectiveTransformNoClone();
         int res;
-        if (xform == null || xform.isIdentity()) {
+        if (xform.isIdentity() && perspectiveTransform.isIdentity()) {
             res = nResetTransform(pContext);
-        } else {
+        } else if (perspectiveTransform.isIdentity()) {
             res = nSetTransform(pContext,
                 xform.getMxx(), xform.getMxy(), xform.getMxz(), xform.getMxt(),
                 xform.getMyx(), xform.getMyy(), xform.getMyz(), xform.getMyt(),
                 xform.getMzx(), xform.getMzy(), xform.getMzz(), xform.getMzt(),
                 0.0, 0.0, 0.0, 1.0);
+        } else {
+            scratchTx.setIdentity().mul(xform).mul(perspectiveTransform);
+            res = nSetTransform(pContext,
+                scratchTx.get(0), scratchTx.get(1), scratchTx.get(2), scratchTx.get(3),
+                scratchTx.get(4), scratchTx.get(5), scratchTx.get(6), scratchTx.get(7),
+                scratchTx.get(8), scratchTx.get(9), scratchTx.get(10), scratchTx.get(11),
+                scratchTx.get(12), scratchTx.get(13), scratchTx.get(14), scratchTx.get(15));
         }
         validate(res);
     }

modules/javafx.graphics/src/main/java/com/sun/prism/es2/ES2Context.java

@@ -271,7 +271,12 @@ class ES2Context extends BaseShaderContext {
         }
 
         scratchTx.set(projViewTx);
+        final GeneralTransform3D perspectiveTransform = getPerspectiveTransformNoClone();
+        if (perspectiveTransform.isIdentity()) {
             updateRawMatrix(scratchTx.mul(xform));
+        } else {
+            updateRawMatrix(scratchTx.mul(xform).mul(perspectiveTransform));
+        }
 
         ES2Shader es2shader = (ES2Shader) shader;
         es2shader.setMatrix("mvpMatrix", rawMatrix);