[openjfx] 02/07: Refreshed the patches

Wed Apr 19 16:02:08 UTC 2017

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjfx.

commit 122832d53310f7799cc94ca416b206f5f4d27a9d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 19 08:50:06 2017 +0200

    Refreshed the patches
---
 debian/changelog                          |  8 ++++++++
 debian/patches/08-disable-sse2.patch      | 20 +++++++-------------
 debian/patches/18-fix-ambiguous-pow.patch | 13 -------------
 debian/patches/fix-arm64-build.patch      | 22 ++++------------------
 debian/patches/series                     |  1 -
 5 files changed, 19 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6b5dc9..353cf4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openjfx (8u131-b11-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 18 Apr 2017 23:51:43 +0200
+
 openjfx (8u121-b13-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/08-disable-sse2.patch b/debian/patches/08-disable-sse2.patch
index fee4f79..ece17e7 100644
--- a/debian/patches/08-disable-sse2.patch
+++ b/debian/patches/08-disable-sse2.patch
@@ -1,11 +1,9 @@
 Description: Enable SSE2 on i386 and amd64 CPUs only
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
-Index: b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-===================================================================
 --- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
 +++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-@@ -19,7 +19,6 @@ endif
+@@ -19,7 +19,6 @@
  
  CFLAGS = -fPIC                   \
           -Werror=implicit-function-declaration \
@@ -13,7 +11,7 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefil
           -fbuiltin               \
           -DHAVE_STDINT_H         \
           -DLINUX                 \
-@@ -30,6 +29,11 @@ CFLAGS  += $(shell dpkg-buildflags --get
+@@ -30,6 +29,11 @@
  CFLAGS  += $(shell dpkg-buildflags --get CFLAGS) -Wall
  LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
  
@@ -25,11 +23,9 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefil
  PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
  PACKAGES_LIBS     := $(shell pkg-config --libs glib-2.0 gobject-2.0)
  
-Index: b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-===================================================================
 --- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
 +++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-@@ -16,7 +16,6 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+@@ -16,7 +16,6 @@
  
  CFLAGS = -fPIC                   \
           -Werror=implicit-function-declaration \
@@ -37,7 +33,7 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefi
           -fbuiltin               \
           -DHAVE_STDINT_H         \
           -DLINUX                 \
-@@ -31,6 +30,11 @@ CFLAGS  += $(shell dpkg-buildflags --get
+@@ -31,6 +30,11 @@
  CFLAGS  += $(shell dpkg-buildflags --get CFLAGS) -Wall
  LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
  
@@ -49,11 +45,9 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefi
  INCLUDES = -I$(SRCBASE_DIR) \
  	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
             -I../../../gstreamer-lite/gstreamer       \
-Index: b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-===================================================================
 --- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
 +++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-@@ -38,9 +38,13 @@ ifdef HOST_COMPILE
+@@ -38,9 +38,13 @@
  
  	CFLAGS += -fPIC \
                    -Werror=implicit-function-declaration \
@@ -70,10 +64,10 @@ Index: b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
  
 --- a/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm
 +++ b/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm
-@@ -1906,7 +1906,7 @@
+@@ -2037,7 +2037,7 @@
+     # Compiler options to keep floating point values consistent
      # between 32-bit and 64-bit architectures.
      determineArchitecture();
-     # AR: Enable SSE2 on windows msvc.
 -    if ($architecture ne "x86_64" && !isARM() && !isCrossCompilation() && !isAnyWindows()) {
 +    if ($architecture eq "i686" && !isARM() && !isCrossCompilation() && !isAnyWindows()) {
          $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
diff --git a/debian/patches/18-fix-ambiguous-pow.patch b/debian/patches/18-fix-ambiguous-pow.patch
deleted file mode 100644
index 9d297b9..0000000
--- a/debian/patches/18-fix-ambiguous-pow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Fixes an ambiguous call to the pow() function
-Origin: backport, https://github.com/WebKit/webkit/commit/2931450725
---- a/modules/web/src/main/native/Source/WebCore/rendering/shapes/BoxShape.cpp
-+++ b/modules/web/src/main/native/Source/WebCore/rendering/shapes/BoxShape.cpp
-@@ -43,7 +43,7 @@
- 
-     LayoutUnit ratio = radius / margin;
-     if (ratio < 1)
--        return radius + (margin * (1 + pow(ratio - 1, 3)));
-+        return radius + (margin * (1 + pow(ratio - 1, 3.0)));
- 
-     return radius + margin;
- }
diff --git a/debian/patches/fix-arm64-build.patch b/debian/patches/fix-arm64-build.patch
index ab57413..bc17b35 100644
--- a/debian/patches/fix-arm64-build.patch
+++ b/debian/patches/fix-arm64-build.patch
@@ -7,30 +7,16 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752735
 Forwarded: no
 --- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
 +++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-@@ -181,6 +181,14 @@
+@@ -179,6 +179,9 @@
+ /* CPU(ARM64) - Apple */
+ #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
  #define WTF_CPU_ARM64 1
- #endif
- 
-+/* CPU(ARM64) - AArch64 */
-+#if defined(__aarch64__)
-+#define WTF_CPU_ARM64 1
 +#if defined(__AARCH64BE__)
 +#define WTF_CPU_BIG_ENDIAN 1
 +#endif
-+#endif
-+
- /* CPU(ARM) - ARM, any version*/
- #define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && WTF_ARM_ARCH_VERSION >= N)
- 
-@@ -1032,7 +1040,7 @@
- #define USE_IMLANG_FONT_LINK2 1
- #endif
- 
--#if !defined(ENABLE_COMPARE_AND_SWAP) && (OS(WINDOWS) || (COMPILER(GCC) && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM64))))
-+#if !defined(ENABLE_COMPARE_AND_SWAP) && (OS(WINDOWS) || (COMPILER(GCC) && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2))))
- #define ENABLE_COMPARE_AND_SWAP 1
  #endif
  
+ /* CPU(ARM) - ARM, any version*/
 --- a/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
 +++ b/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
 @@ -1035,7 +1035,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index e173c25..9108461 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,3 @@ fix-arm32-build.patch
 15-fix-javadoc-refererences.diff
 16-reproducible-build-timestamp.patch
 17-gcc-compatibility.patch
-18-fix-ambiguous-pow.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git

