Date: Thursday, April 20, 2023 @ 19:52:17
Author: freswa
Revision: 474805
upgpkg: java17-openjfx 17.0.7.u2-1
Modified:
java17-openjfx/trunk/PKGBUILD
java17-openjfx/trunk/java-openjfx-flags.patch
--------------------------+
PKGBUILD | 6 ++--
java-openjfx-flags.patch | 60 ++++++++++++++++++++++-----------------------
2 files changed, 33 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-20 19:31:17 UTC (rev 474804)
+++ PKGBUILD 2023-04-20 19:52:17 UTC (rev 474805)
@@ -15,7 +15,7 @@
java17-openjfx-doc
java17-openjfx-src
)
-pkgver=17.0.6.u3
+pkgver=17.0.7.u2
pkgrel=1
pkgdesc="Java OpenJFX 17 client application platform (open-source
implementation of JavaFX)"
arch=(x86_64)
@@ -54,9 +54,9 @@
java-openjfx-no-xlocale.patch
java-openjfx-gstreamer-lite-gcc10-compat.patch
)
-b2sums=('66c2f1f7f6e1c34828912461d9ee0f98a690bd01eba42712287f60333e01ed1358fb58645a273193a554ba3de2bc65166c211e93f3029410fdd0d39085f0c2a3'
+b2sums=('72dedc864eb5dba89228271b09b0713844c4457135978fd4988e09f17f1b571e4900948459b3d02839815e364147b110f88201a0edf1a104357892b62e4de15c'
'a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498'
-
'7e70178525dc6824abd4e0c02b8ba30c7d76d0738a39dcc8ebb991962abbc8a72882b2c7abe7464c8e5c1c846ce07e807eab206c909afe89644753c714a5e16b'
+
'a56a5cfebb44cdbe3ada9c6da88fda6427a5bd1bf9fcc491df289c4f5c0e96ac3614c619aaf9428340f11e9dabf0a85fc7db4f49754c2700587cc66fc15372fd'
'13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e'
'119fa1cc5da2cdefa22bbe9b6f76581faa74e05fa7b6e5576470fc0251c6e257f122fbba03754cc01f7c7251145cfa1cab4ffc2f9d59ff0c175a121e943a0f64')
Modified: java-openjfx-flags.patch
===================================================================
--- java-openjfx-flags.patch 2023-04-20 19:31:17 UTC (rev 474804)
+++ java-openjfx-flags.patch 2023-04-20 19:52:17 UTC (rev 474805)
@@ -7,7 +7,7 @@
"-fstack-protector",
+ "-Wno-error=cast-function-type",
"-Wextra", "-Wall", "-Wformat-security", "-Wno-unused",
"-Wno-parentheses", "-Werror=trampolines"] // warning flags
-
+
+commonFlags.addAll(System.getenv("CFLAGS").trim().replaceAll(" +", "
").split(" "))
+
if (!IS_64) {
@@ -15,10 +15,10 @@
}
@@ -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"
@@ -284,7 +288,7 @@
@@ -28,7 +28,7 @@
-LINUX.iio.linkFlags = [linkFlags].flatten()
+LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
LINUX.iio.lib = "javafx_iio"
-
+
LINUX.prismES2 = [:]
@@ -332,5 +336,5 @@
LINUX.webkit = [:]
@@ -44,7 +44,7 @@
@@ -17,7 +17,7 @@
OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
endif
-
+
-CFLAGS = -fPIC \
+CFLAGS := -fPIC \
-Wformat \
@@ -57,23 +57,23 @@
- -ffunction-sections -fdata-sections
+ -ffunction-sections -fdata-sections \
+ ${CFLAGS}
-
- ifneq ($(ARCH), aarch64)
+
+ ifneq (,$(findstring $(ARCH), x64 x32))
CFLAGS += -msse2
endif
-
+
-ifeq ($(BUILD_TYPE), Release)
- CFLAGS += -Os
-else
- CFLAGS += -g -Wall
-endif
-
+
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
@@ -52,11 +48,12 @@
-I../../../gstreamer-lite/gstreamer/libs \
$(PACKAGES_INCLUDES)
-
+
-LDFLAGS = -L$(BUILD_DIR) \
+LDFLAGS := -L$(BUILD_DIR) \
-lgstreamer-lite \
@@ -82,7 +82,7 @@
- -static-libgcc -static-libstdc++ -Wl,--gc-sections
+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+ ${LDFLAGS}
-
+
ifneq ($(strip $(LIBAV_DIR)),)
INCLUDES += -I$(LIBAV_DIR)/include
Only in
patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin:
Makefile.orig
@@ -90,9 +90,9 @@
---
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
-
+
-CFLAGS = -fPIC \
+CFLAGS := -fPIC \
-Wformat \
@@ -105,11 +105,11 @@
- -ffunction-sections -fdata-sections
+ -ffunction-sections -fdata-sections \
+ ${CFLAGS}
-
- ifneq ($(ARCH), aarch64)
+
+ ifneq (,$(findstring $(ARCH), x64 x32))
CFLAGS += -msse2
endif
-
+
-ifeq ($(BUILD_TYPE), Release)
- CFLAGS += -Os
-else
@@ -116,13 +116,13 @@
- CFLAGS += -g -Wall
-endif
-
-
+
INCLUDES = -I$(SRCBASE_DIR) \
$(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
@@ -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)
-
+
-LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
-z relro \
@@ -129,7 +129,7 @@
- -static-libgcc -static-libstdc++ -Wl,--gc-sections
+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+ ${LDFLAGS}
-
+
ifeq ($(ARCH), x32)
CFLAGS += -m32
Only in
patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins:
Makefile.orig
@@ -137,9 +137,9 @@
---
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
-
+
-CFLAGS =-fPIC \
+CFLAGS :=-fPIC \
-Wformat \
@@ -158,13 +158,13 @@
-endif
+ -ffunction-sections -fdata-sections \
+ ${CFLAGS}
-
+
INCLUDES = -I$(BASE_DIR)/plugins \
-I$(SRCBASE_DIR)/projects/build/linux/common \
@@ -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)
-
+
-LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
+LDFLAGS := -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
-z relro \
@@ -171,7 +171,7 @@
- -static-libgcc -static-libstdc++ -Wl,--gc-sections
+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+ ${LDFLAGS}
-
+
ifeq ($(ARCH), x32)
CFLAGS += -m32
Only in
patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite:
Makefile.orig
@@ -179,9 +179,9 @@
--- 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
-
+
-CFLAGS = -DTARGET_OS_LINUX=1 \
+CFLAGS := -DTARGET_OS_LINUX=1 \
-D_GNU_SOURCE \
@@ -194,13 +194,13 @@
- -ffunction-sections -fdata-sections
+ -ffunction-sections -fdata-sections \
+ ${CFLAGS}
-
+
CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
-
+
@@ -87,21 +88,16 @@
-I$(GSTREAMER_LITE_DIR)/gstreamer/libs \
$(PACKAGES_INCLUDES)
-
+
- LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite
$(PACKAGES_LIBS) \
+ LDFLAGS := -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite
$(PACKAGES_LIBS) \
-z relro \
@@ -212,7 +212,7 @@
INCLUDES = $(BASE_INCLUDES)
LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
endif
-
+
-ifeq ($(BUILD_TYPE), Release)
- CFLAGS += -Os
-else
