This is an automated email from the git hooks/post-receive script. doko pushed a commit to branch master in repository openjfx.
commit ac1f5cef88f81193dc0823ea4908c70487dae56c Author: Matthias Klose <[email protected]> Date: Thu Oct 8 09:51:03 2015 +0200 * Fix build on arm64, patch taken from the webkitgtk package. * Kill most of the direct -m32 / -m64 settings. --- debian/changelog | 7 +++ debian/patches/03-buildflags.patch | 95 +++++++++++++++++++++++------------- debian/patches/08-disable-sse2.patch | 27 ++++++---- debian/patches/series | 2 + 4 files changed, 87 insertions(+), 44 deletions(-) diff --git a/debian/changelog b/debian/changelog index 959dce9..71dbefb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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. + + -- Matthias Klose <[email protected]> Thu, 08 Oct 2015 09:47:38 +0200 + openjfx (8u60-b27-1) unstable; urgency=medium [ Emmanuel Bourg ] diff --git a/debian/patches/03-buildflags.patch b/debian/patches/03-buildflags.patch index 727a5e8..e5ecff4 100644 --- a/debian/patches/03-buildflags.patch +++ b/debian/patches/03-buildflags.patch @@ -1,9 +1,11 @@ Description: Adjusts the compiler flags to enable the hardening and link to the system libraries Author: Emmanuel Bourg <[email protected]> Forwarded: no +Index: b/buildSrc/linux.gradle +=================================================================== --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle -@@ -45,6 +45,9 @@ +@@ -45,6 +45,9 @@ def commonFlags = [ "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags @@ -13,7 +15,7 @@ Forwarded: no if (!IS_64) { commonFlags += "-m32" } -@@ -54,7 +57,10 @@ +@@ -54,7 +57,10 @@ def ccFlags = [ commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten() //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"]) @@ -24,7 +26,7 @@ Forwarded: no // Create $buildDir/linux_tools.properties file and load props from it setupTools("linux_tools", -@@ -196,7 +202,7 @@ +@@ -196,7 +202,7 @@ LINUX.iio.nativeSource = [ LINUX.iio.compiler = compiler LINUX.iio.ccFlags = [ccFlags].flatten() LINUX.iio.linker = linker @@ -33,55 +35,80 @@ Forwarded: no LINUX.iio.lib = "javafx_iio" LINUX.prismES2 = [:] +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 -@@ -58,6 +58,10 @@ - LDFLAGS += -m32 - endif +@@ -26,11 +26,9 @@ CFLAGS = -fPIC \ + -DGST_DISABLE_LOADSAVE \ + -DGSTREAMER_LITE +-ifeq ($(BUILD_TYPE), Release) +- CFLAGS += -Os +-else +- CFLAGS += -g -Wall +-endif +CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS) -+CFLAGS += $(shell dpkg-buildflags --get CFLAGS) ++CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -Wall +LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS) -+ - SOURCES = av/fxavcodecplugin.c \ - av/avelement.c \ - av/decoder.c \ + + 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 -@@ -49,6 +49,10 @@ - LDFLAGS += -m32 - endif +@@ -27,12 +27,9 @@ CFLAGS = -fPIC \ + -DGST_DISABLE_GST_DEBUG \ + -DGSTREAMER_LITE +-ifeq ($(BUILD_TYPE), Release) +- CFLAGS += -Os +-else +- CFLAGS += -g -Wall +-endif +- +CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS) -+CFLAGS += $(shell dpkg-buildflags --get CFLAGS) ++CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -Wall +LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS) -+ - SOURCES = fxplugins.c \ - progressbuffer/progressbuffer.c \ - progressbuffer/hlsprogressbuffer.c \ + + INCLUDES = -I$(SRCBASE_DIR) \ + $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \ +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 -@@ -77,6 +77,10 @@ - LDFLAGS += -m32 - endif +@@ -48,11 +48,9 @@ CFLAGS =-fPIC \ + -DGST_DISABLE_GST_DEBUG \ + -DGST_DISABLE_LOADSAVE +-ifeq ($(BUILD_TYPE), Release) +- CFLAGS += -Os +-else +- CFLAGS += -g -Wall +-endif +CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS) -+CFLAGS += $(shell dpkg-buildflags --get CFLAGS) ++CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -Wall +LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS) -+ - SOURCES = \ - gstreamer/gst/gst.c \ - gstreamer/gst/gstbin.c \ + + INCLUDES = -I$(BASE_DIR)/plugins \ + -I$(SRCBASE_DIR)/projects/build/linux/common \ +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 -@@ -70,6 +70,10 @@ - LDFLAGS += -m32 +@@ -59,11 +59,9 @@ else + LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS) endif +-ifeq ($(BUILD_TYPE), Release) +- CFLAGS += -Os +-else +- CFLAGS += -g -Wall -D_DEBUG +-endif +CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS) -+CFLAGS += $(shell dpkg-buildflags --get CFLAGS) ++CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -Wall +LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS) -+ - CPP_SOURCES = \ - jni/com_sun_media_jfxmedia_logging_Logger.cpp \ - jni/JavaBandsHolder.cpp \ + + ifeq ($(ARCH), x32) + CFLAGS += -m32 diff --git a/debian/patches/08-disable-sse2.patch b/debian/patches/08-disable-sse2.patch index ef6a208..331d4d3 100644 --- a/debian/patches/08-disable-sse2.patch +++ b/debian/patches/08-disable-sse2.patch @@ -1,9 +1,11 @@ Description: Enable SSE2 on i386 and amd64 CPUs only Author: Emmanuel Bourg <[email protected]> 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 @@ +@@ -19,7 +19,6 @@ endif CFLAGS = -fPIC \ -Werror=implicit-function-declaration \ @@ -11,9 +13,9 @@ Forwarded: no -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -@@ -32,6 +31,11 @@ - CFLAGS += -g -Wall - endif +@@ -30,6 +29,11 @@ CFLAGS += $(shell dpkg-buildflags --get + CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -Wall + LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +ifneq (,$(filter $(DEB_HOST_ARCH_CPU), i386 amd64)) @@ -23,9 +25,11 @@ Forwarded: no 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 @@ +@@ -16,7 +16,6 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so CFLAGS = -fPIC \ -Werror=implicit-function-declaration \ @@ -33,20 +37,23 @@ Forwarded: no -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -@@ -33,6 +32,10 @@ - CFLAGS += -g -Wall - endif +@@ -31,6 +30,11 @@ CFLAGS += $(shell dpkg-buildflags --get + CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -Wall + LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +ifneq (,$(filter $(DEB_HOST_ARCH_CPU), i386 amd64)) + CFLAGS += -msse2 +endif - ++ 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 @@ +@@ -38,9 +38,13 @@ ifdef HOST_COMPILE CFLAGS += -fPIC \ -Werror=implicit-function-declaration \ diff --git a/debian/patches/series b/debian/patches/series index 8108fac..87601b1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,5 @@ 10-javadoc-locale.patch 11-icu-dynamic-linking.patch 12-generic-qmake-spec.patch +fix-arm64-build.patch +fix-arm32-build.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
