Date: Wednesday, July 20, 2022 @ 14:23:36 Author: freswa Revision: 451501
update flags patch for next release Modified: java17-openjfx/trunk/java-openjfx-flags.patch --------------------------+ java-openjfx-flags.patch | 117 +++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 67 deletions(-) Modified: java-openjfx-flags.patch =================================================================== --- java-openjfx-flags.patch 2022-07-20 13:32:09 UTC (rev 451500) +++ java-openjfx-flags.patch 2022-07-20 14:23:36 UTC (rev 451501) @@ -1,21 +1,7 @@ -From a28f9aaab759d82384279c16d86bb98ab47412a3 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <[email protected]> -Date: Sat, 1 Jun 2019 00:12:55 -0700 -Subject: [PATCH] respect user cflags - ---- - buildSrc/linux.gradle | 7 ++++++- - .../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++----------- - .../projects/linux/gstreamer-lite/Makefile | 16 ++++++---------- - .../native/jfxmedia/projects/linux/Makefile | 16 ++++++---------- - 5 files changed, 30 insertions(+), 42 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 7a7cbc72..6705a0f3 100644 ---- a/buildSrc/linux.gradle -+++ b/buildSrc/linux.gradle -@@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String } +diff -aur orig/buildSrc/linux.gradle patched/buildSrc/linux.gradle +--- orig/buildSrc/linux.gradle 2022-07-12 13:56:53.000000000 +0200 ++++ patched/buildSrc/linux.gradle 2022-07-20 15:58:16.621288214 +0200 +@@ -43,8 +43,11 @@ def commonFlags = [ "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags "-fstack-protector", @@ -27,15 +13,15 @@ if (!IS_64) { commonFlags += "-m32" } -@@ -70,6 +70,7 @@ +@@ -70,6 +73,7 @@ def staticLinkFlags = [].flatten() - + def linkFlags = IS_STATIC_BUILD ? staticLinkFlags : dynamicLinkFlags; +linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" ")) - + if (IS_DEBUG_NATIVE) { linkFlags += "-g" -@@ -294,7 +299,7 @@ LINUX.iio.nativeSource = [ +@@ -284,7 +288,7 @@ LINUX.iio.compiler = compiler LINUX.iio.ccFlags = [cFlags, "-fvisibility=hidden"].flatten() LINUX.iio.linker = IS_STATIC_BUILD ? "ld" : linker @@ -44,7 +30,7 @@ LINUX.iio.lib = "javafx_iio" LINUX.prismES2 = [:] -@@ -349,5 +354,5 @@ LINUX.media.ar = "${toolchainDir}ar" +@@ -332,5 +336,5 @@ LINUX.webkit = [:] LINUX.webkit.compiler = compiler LINUX.webkit.linker = linker @@ -51,11 +37,11 @@ -LINUX.webkit.ccFlags = commonFlags.flatten() +LINUX.webkit.ccFlags = [commonFlags, "-fno-lto"].flatten() LINUX.webkit.linkFlags = linkFlags.flatten() -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index 450b55d3..f27b9479 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -@@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so +Only in patched/buildSrc: linux.gradle.orig +diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +--- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile 2022-07-12 13:56:53.000000000 +0200 ++++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile 2022-07-20 15:58:16.621288214 +0200 +@@ -17,7 +17,7 @@ OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin endif @@ -64,18 +50,18 @@ -Wformat \ -Wextra \ -Wformat-security \ -@@ -29,17 +29,13 @@ CFLAGS = -fPIC \ - -DLINUX \ - -DGST_DISABLE_LOADSAVE \ +@@ -31,17 +31,13 @@ -DGSTREAMER_LITE \ + -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \ + -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \ - -ffunction-sections -fdata-sections + -ffunction-sections -fdata-sections \ + ${CFLAGS} - + ifneq ($(ARCH), aarch64) CFLAGS += -msse2 endif - + -ifeq ($(BUILD_TYPE), Release) - CFLAGS += -Os -else @@ -84,7 +70,7 @@ PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0) -@@ -46,11 +41,12 @@ INCLUDES= -I../../../plugins \ +@@ -52,11 +48,12 @@ -I../../../gstreamer-lite/gstreamer/libs \ $(PACKAGES_INCLUDES) @@ -99,11 +85,11 @@ ifneq ($(strip $(LIBAV_DIR)),) INCLUDES += -I$(LIBAV_DIR)/include -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 1e58d4d3..627865f9 100644 ---- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -@@ -14,7 +14,7 @@ DIRLIST = progressbuffer \ +Only in patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin: Makefile.orig +diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +--- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile 2022-07-12 13:56:53.000000000 +0200 ++++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile 2022-07-20 15:58:16.621288214 +0200 +@@ -14,7 +14,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -112,10 +98,10 @@ -Wformat \ -Wextra \ -Wformat-security \ -@@ -30,18 +30,13 @@ CFLAGS = -fPIC \ - -DGST_DISABLE_LOADSAVE \ - -DGST_DISABLE_GST_DEBUG \ +@@ -33,18 +33,13 @@ -DGSTREAMER_LITE \ + -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \ + -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \ - -ffunction-sections -fdata-sections + -ffunction-sections -fdata-sections \ + ${CFLAGS} @@ -123,7 +109,7 @@ ifneq ($(ARCH), aarch64) CFLAGS += -msse2 endif - + -ifeq ($(BUILD_TYPE), Release) - CFLAGS += -Os -else @@ -133,7 +119,7 @@ INCLUDES = -I$(SRCBASE_DIR) \ $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \ -@@ -47,9 +41,10 @@ INCLUDES = -I$(SRCBASE_DIR) \ +@@ -54,9 +49,10 @@ PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0) @@ -146,11 +132,11 @@ ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git 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 -index 5baa30a1..ddf0e521 100644 ---- 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 -@@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \ +Only in patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins: Makefile.orig +diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +--- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2022-07-12 13:56:53.000000000 +0200 ++++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2022-07-20 15:58:16.624621629 +0200 +@@ -37,7 +37,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -159,10 +145,10 @@ -Wformat \ -Wextra \ -Wformat-security \ -@@ -51,13 +51,8 @@ CFLAGS =-fPIC \ - -DLINUX \ - -DGST_DISABLE_GST_DEBUG \ +@@ -55,13 +55,8 @@ -DGST_DISABLE_LOADSAVE \ + -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \ + -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \ - -ffunction-sections -fdata-sections - -ifeq ($(BUILD_TYPE), Release) @@ -175,7 +161,7 @@ INCLUDES = -I$(BASE_DIR)/plugins \ -I$(SRCBASE_DIR)/projects/build/linux/common \ -@@ -75,9 +70,10 @@ INCLUDES = -I$(BASE_DIR)/plugins \ +@@ -79,9 +74,10 @@ PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa glib-2.0) PACKAGES_LIBS := $(shell pkg-config --libs alsa glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0) @@ -188,11 +174,11 @@ ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index ecbd859f..5881cf53 100644 ---- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -+++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -@@ -17,7 +17,7 @@ DIRLIST = jni \ +Only in patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite: Makefile.orig +diff -aur orig/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +--- orig/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile 2022-07-12 13:56:53.000000000 +0200 ++++ patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile 2022-07-20 15:59:21.892883201 +0200 +@@ -42,7 +42,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -201,17 +187,17 @@ -D_GNU_SOURCE \ -DGST_REMOVE_DEPRECATED \ -DGST_DISABLE_GST_DEBUG \ -@@ -26,7 +26,8 @@ CFLAGS = -DTARGET_OS_LINUX=1 \ - -DHAVE_CONFIG_H \ - -DJFXMEDIA_JNI_EXPORTS \ - -DLINUX \ +@@ -54,7 +54,8 @@ + -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \ + -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \ + -Werror=deprecated-declarations \ - -ffunction-sections -fdata-sections + -ffunction-sections -fdata-sections \ -+ ${CFLAGS} ++ ${CFLAGS} CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections -@@ -56,21 +57,16 @@ ifdef HOST_COMPILE +@@ -87,21 +88,16 @@ -I$(GSTREAMER_LITE_DIR)/gstreamer/libs \ $(PACKAGES_INCLUDES) @@ -236,6 +222,3 @@ ifeq ($(ARCH), x32) CFLAGS += -m32 LDFLAGS += -m32 --- -2.21.0 -
