[arch-commits] Commit in java11-openjfx/trunk (java11-openjfx-flags.patch)
Frederik Schwan
freswa at gemini.archlinux.org
Fri Jul 22 10:46:45 UTC 2022
Date: Friday, July 22, 2022 @ 10:46:45
Author: freswa
Revision: 451535
update flags patch for next release
Modified:
java11-openjfx/trunk/java11-openjfx-flags.patch
----------------------------+
java11-openjfx-flags.patch | 61 ++++++++++++++++++++++---------------------
1 file changed, 32 insertions(+), 29 deletions(-)
Modified: java11-openjfx-flags.patch
===================================================================
--- java11-openjfx-flags.patch 2022-07-22 05:17:09 UTC (rev 451534)
+++ java11-openjfx-flags.patch 2022-07-22 10:46:45 UTC (rev 451535)
@@ -1,6 +1,6 @@
diff -aur orig/buildSrc/linux.gradle patched/buildSrc/linux.gradle
---- orig/buildSrc/linux.gradle 2022-03-19 17:01:14.000000000 +0100
-+++ patched/buildSrc/linux.gradle 2022-07-20 16:05:23.038202309 +0200
+--- orig/buildSrc/linux.gradle 2022-05-25 14:11:20.000000000 +0200
++++ patched/buildSrc/linux.gradle 2022-07-22 12:45:39.164493724 +0200
@@ -44,8 +44,11 @@
def commonFlags = [
"-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
@@ -38,10 +38,9 @@
-LINUX.webkit.ccFlags = commonFlags.flatten()
+LINUX.webkit.ccFlags = [commonFlags, "-fno-lto"].flatten()
LINUX.webkit.linkFlags = linkFlags.flatten()
-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-03-19 17:01:14.000000000 +0100
-+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile 2022-07-20 16:05:23.038202309 +0200
+--- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile 2022-05-25 14:11:20.000000000 +0200
++++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile 2022-07-22 12:45:39.167827045 +0200
@@ -17,7 +17,7 @@
OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
endif
@@ -51,10 +50,10 @@
-Wformat \
-Wextra \
-Wformat-security \
-@@ -30,13 +30,8 @@
- -DLINUX \
- -DGST_DISABLE_LOADSAVE \
+@@ -32,13 +32,8 @@
-DGSTREAMER_LITE \
+ -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \
+ -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \
- -ffunction-sections -fdata-sections
-
-ifeq ($(BUILD_TYPE), Release)
@@ -67,7 +66,7 @@
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
-@@ -47,11 +42,12 @@
+@@ -49,11 +44,12 @@
-I../../../gstreamer-lite/gstreamer/libs \
$(PACKAGES_INCLUDES)
@@ -82,9 +81,10 @@
ifneq ($(strip $(LIBAV_DIR)),)
INCLUDES += -I$(LIBAV_DIR)/include
+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-03-19 17:01:14.000000000 +0100
-+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile 2022-07-20 16:05:23.041535721 +0200
+--- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile 2022-05-25 14:11:20.000000000 +0200
++++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile 2022-07-22 12:45:39.167827045 +0200
@@ -14,7 +14,7 @@
TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
@@ -94,10 +94,10 @@
-Wformat \
-Wextra \
-Wformat-security \
-@@ -31,14 +31,8 @@
- -DGST_DISABLE_LOADSAVE \
- -DGST_DISABLE_GST_DEBUG \
+@@ -34,14 +34,8 @@
-DGSTREAMER_LITE \
+ -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \
+ -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \
- -ffunction-sections -fdata-sections
-
-ifeq ($(BUILD_TYPE), Release)
@@ -111,7 +111,7 @@
INCLUDES = -I$(SRCBASE_DIR) \
$(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
-@@ -48,9 +42,10 @@
+@@ -51,9 +45,10 @@
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
@@ -124,9 +124,10 @@
ifeq ($(ARCH), x32)
CFLAGS += -m32
+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-03-19 17:01:14.000000000 +0100
-+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2022-07-20 16:05:23.041535721 +0200
+--- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2022-05-25 14:11:20.000000000 +0200
++++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2022-07-22 12:45:39.167827045 +0200
@@ -37,7 +37,7 @@
TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
@@ -136,10 +137,10 @@
-Wformat \
-Wextra \
-Wformat-security \
-@@ -52,13 +52,8 @@
- -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)
@@ -152,7 +153,7 @@
INCLUDES = -I$(BASE_DIR)/plugins \
-I$(SRCBASE_DIR)/projects/build/linux/common \
-@@ -76,9 +71,10 @@
+@@ -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)
@@ -165,10 +166,11 @@
ifeq ($(ARCH), x32)
CFLAGS += -m32
+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-03-19 17:01:14.000000000 +0100
-+++ patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile 2022-07-20 16:05:23.041535721 +0200
-@@ -17,7 +17,7 @@
+--- orig/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile 2022-05-25 14:11:20.000000000 +0200
++++ patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile 2022-07-22 12:45:39.167827045 +0200
+@@ -42,7 +42,7 @@
TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
@@ -177,10 +179,10 @@
-D_GNU_SOURCE \
-DGST_REMOVE_DEPRECATED \
-DGST_DISABLE_GST_DEBUG \
-@@ -26,7 +26,8 @@
- -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}
@@ -187,7 +189,7 @@
CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
-@@ -56,21 +57,16 @@
+@@ -84,21 +85,16 @@
-I$(GSTREAMER_LITE_DIR)/gstreamer/libs \
$(PACKAGES_INCLUDES)
@@ -212,3 +214,4 @@
ifeq ($(ARCH), x32)
CFLAGS += -m32
LDFLAGS += -m32
+Only in patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux: Makefile.orig
More information about the arch-commits
mailing list