[openjfx] 01/01: * Kill most of the direct -m32 / -m64 settings. Closes: #779833.
Matthias Klose
doko at moszumanska.debian.org
Thu Oct 8 08:02:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
doko pushed a commit to branch master
in repository openjfx.
commit 28210a916c36e0255922288c6b0f26e684ba3f6b
Author: Matthias Klose <doko at ubuntu.com>
Date: Thu Oct 8 10:01:40 2015 +0200
* Kill most of the direct -m32 / -m64 settings. Closes: #779833.
---
debian/changelog | 2 +-
debian/patches/fix-arm32-build.patch | 64 ++++++++++++++++++++++++++++++++++++
debian/patches/fix-arm64-build.patch | 48 +++++++++++++++++++++++++++
3 files changed, 113 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 71dbefb..61dc43a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
openjfx (8u60-b27-2) UNRELEASED; urgency=medium
* Fix build on arm64, patch taken from the webkitgtk package.
- * Kill most of the direct -m32 / -m64 settings.
+ * Kill most of the direct -m32 / -m64 settings. Closes: #779833.
-- Matthias Klose <doko at ubuntu.com> Thu, 08 Oct 2015 09:47:38 +0200
diff --git a/debian/patches/fix-arm32-build.patch b/debian/patches/fix-arm32-build.patch
new file mode 100644
index 0000000..8b8a936
--- /dev/null
+++ b/debian/patches/fix-arm32-build.patch
@@ -0,0 +1,64 @@
+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
+@@ -55,11 +55,6 @@ INCLUDES += $(shell pkg-config --cflags
+ LDFLAGS += $(shell pkg-config --libs libavcodec libavformat)
+ endif
+
+-ifeq ($(ARCH), x32)
+- CFLAGS += -m32
+- LDFLAGS += -m32
+-endif
+-
+ SOURCES = av/fxavcodecplugin.c \
+ av/avelement.c \
+ av/decoder.c \
+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
+@@ -45,11 +45,6 @@ PACKAGES_LIBS := $(shell pkg-config --li
+
+ LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS)
+
+-ifeq ($(ARCH), x32)
+- CFLAGS += -m32
+- LDFLAGS += -m32
+-endif
+-
+ SOURCES = fxplugins.c \
+ progressbuffer/progressbuffer.c \
+ progressbuffer/hlsprogressbuffer.c \
+Index: b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+===================================================================
+--- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
++++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+@@ -70,11 +70,6 @@ PACKAGES_LIBS := $(shell pkg-config --li
+
+ LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS)
+
+-ifeq ($(ARCH), x32)
+- CFLAGS += -m32
+- LDFLAGS += -m32
+-endif
+-
+ SOURCES = \
+ gstreamer/gst/gst.c \
+ gstreamer/gst/gstbin.c \
+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
+@@ -67,11 +67,6 @@ CFLAGS += $(shell dpkg-buildflags --get
+ CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -Wall
+ LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
+
+-ifeq ($(ARCH), x32)
+- CFLAGS += -m32
+- LDFLAGS += -m32
+-endif
+-
+ CPP_SOURCES = \
+ jni/com_sun_media_jfxmedia_logging_Logger.cpp \
+ jni/JavaBandsHolder.cpp \
diff --git a/debian/patches/fix-arm64-build.patch b/debian/patches/fix-arm64-build.patch
new file mode 100644
index 0000000..17e32e0
--- /dev/null
+++ b/debian/patches/fix-arm64-build.patch
@@ -0,0 +1,48 @@
+From: Iain Lane <iain.lane at canonical.com>
+Description: Fix arm64 build
+ Add AArch64 support in Platform.h
+ Don't use COMPARE_AND_SWAP on arm64; it produces invalid asm.
+ Fix some other areas where disabling JIT doesn't work.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752735
+Forwarded: no
+Index: b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
+===================================================================
+--- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
++++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
+@@ -164,6 +164,14 @@
+ #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)
+
+@@ -973,7 +981,7 @@
+ #define WTF_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
+
+Index: b/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
+===================================================================
+--- 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 @@ TransformationMatrix TransformationMatri
+ // this = mat * this.
+ TransformationMatrix& TransformationMatrix::multiply(const TransformationMatrix& mat)
+ {
+-#if CPU(ARM64)
++#if CPU(ARM64) && PLATFORM(IOS)
+ double* leftMatrix = &(m_matrix[0][0]);
+ const double* rightMatrix = &(mat.m_matrix[0][0]);
+ asm volatile (
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git
More information about the pkg-java-commits
mailing list