Date: Thursday, April 20, 2023 @ 19:15:10 Author: freswa Revision: 474801
upgpkg: java-openjfx 20.0.1.u1-1 Modified: java-openjfx/trunk/PKGBUILD java-openjfx/trunk/java-openjfx-flags.patch --------------------------+ PKGBUILD | 18 ++++++------- java-openjfx-flags.patch | 61 ++++++++++++++++++++++----------------------- 2 files changed, 39 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-04-20 18:53:18 UTC (rev 474800) +++ PKGBUILD 2023-04-20 19:15:10 UTC (rev 474801) @@ -15,7 +15,7 @@ java-openjfx-doc java-openjfx-src ) -pkgver=19.0.2.1.u1 +pkgver=20.0.1.u1 pkgrel=1 pkgdesc="Java OpenJFX client application platform (open-source implementation of JavaFX) - latest version" arch=(x86_64) @@ -47,19 +47,19 @@ zip ) source=( - https://github.com/openjdk/jfx/archive/refs/tags/${pkgver//.u/+}.tar.gz + https://github.com/openjdk/jfx${pkgver//.*}u/archive/refs/tags/${pkgver//.u/+}.tar.gz # ${pkgname}-${pkgver}.tar.gz::https://github.com/openjdk/jfx${pkgver%%.*}u/archive/refs/tags/${pkgver//.u/+}.tar.gz gradle.properties java-openjfx-flags.patch java-openjfx-no-xlocale.patch ) -b2sums=('fba1046c83e709ba9558b0e9a5a164a86ca919781b822e52c7fa6a514d44aaa78a58e3639ca7be429916b95549f85ae8d916cd4b2b3f8e471c1fb87b988f4c46' +b2sums=('f90129048df11e7b313681c974731ce8b47bb01a3a3e60b70b93385a9d924127f2420310faec79d84a23fb669fb0d8c003142494054d672c44e978ce44b5c788' 'a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498' - '30f5f096f29a85b7d3a40de6bd3420fc951e24eee1d19017c41f3553c1d44832bd87742af691c9f68c1149ea827faf88edfa6af1e27cb324b7bf7d093a74398e' + '609ffbc0938922f00ccebab6d1e9ab0d54b84f088f75c10c0eb4211ff1b33438481d76092eae8811a5e9f53dfc3ff422f7aa4e98abd8fc27fb73f1c3d4661c41' '13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e') prepare() { - cd jfx-${pkgver//.u/-} + cd jfx${pkgver//.*}u-${pkgver//.u/-} # cd jfx${pkgver%%.*}u-${pkgver//.u/-} ln -sf ../gradle.properties . @@ -69,7 +69,7 @@ } build() { - cd jfx-${pkgver//.u/-} + cd jfx${pkgver//.*}u-${pkgver//.u/-} # cd jfx${pkgver%%.*}u-${pkgver//.u/-} # build against ffmpeg4.4 @@ -93,7 +93,7 @@ ) provides=(java-openjfx=${pkgver%%.*}) - cd jfx-${pkgver//.u/-} + cd jfx${pkgver//.*}u-${pkgver//.u/-} # cd jfx${pkgver%%.*}u-${pkgver//.u/-} install -dm 755 "${pkgdir}"/usr/{lib/jvm/java-${pkgver%%.*}-openjdk,share/licenses} @@ -103,7 +103,7 @@ } package_java-openjfx-doc() { - cd jfx-${pkgver//.u/-} + cd jfx${pkgver//.*}u-${pkgver//.u/-} # cd jfx${pkgver%%.*}u-${pkgver//.u/-} install -dm 755 "${pkgdir}"/usr/share/{doc,licenses} @@ -112,7 +112,7 @@ } package_java-openjfx-src() { - cd jfx-${pkgver//.u/-} + cd jfx${pkgver//.*}u-${pkgver//.u/-} # cd jfx${pkgver%%.*}u-${pkgver//.u/-} install -dm 755 "${pkgdir}"/usr/{lib/jvm/java-${pkgver%%.*}-openjdk,share/licenses} Modified: java-openjfx-flags.patch =================================================================== --- java-openjfx-flags.patch 2023-04-20 18:53:18 UTC (rev 474800) +++ java-openjfx-flags.patch 2023-04-20 19:15:10 UTC (rev 474801) @@ -22,7 +22,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) { @@ -30,10 +30,10 @@ } @@ -70,6 +73,7 @@ def dynamicLinkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", common 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 @@ LINUX.iio.nativeSource = [ @@ -43,7 +43,7 @@ -LINUX.iio.linkFlags = [linkFlags].flatten() +LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten() LINUX.iio.lib = "javafx_iio" - + LINUX.prismES2 = [:] @@ -332,5 +336,5 @@ LINUX.media.ar = "${toolchainDir}ar" LINUX.webkit = [:] @@ -59,7 +59,7 @@ @@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin endif - + -CFLAGS = -fPIC \ +CFLAGS := -fPIC \ -Wformat \ @@ -72,11 +72,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 @@ -85,11 +85,11 @@ - PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0) - + @@ -52,11 +47,12 @@ INCLUDES= -I../../../plugins \ -I../../../gstreamer-lite/gstreamer/libs \ $(PACKAGES_INCLUDES) - + -LDFLAGS = -L$(BUILD_DIR) \ +LDFLAGS := -L$(BUILD_DIR) \ -lgstreamer-lite \ @@ -98,7 +98,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 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 @@ -106,9 +106,9 @@ --- 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 \ - + TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so - + -CFLAGS = -fPIC \ +CFLAGS := -fPIC \ -Wformat \ @@ -121,11 +121,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 @@ -139,7 +139,7 @@ @@ -54,9 +48,10 @@ INCLUDES = -I$(SRCBASE_DIR) \ 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 \ @@ -146,7 +146,7 @@ - -static-libgcc -static-libstdc++ -Wl,--gc-sections + -static-libgcc -static-libstdc++ -Wl,--gc-sections \ + ${LDFLAGS} - + 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 @@ -154,9 +154,9 @@ --- 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 \ - + TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so - + -CFLAGS =-fPIC \ +CFLAGS :=-fPIC \ -Wformat \ @@ -175,13 +175,13 @@ -endif + -ffunction-sections -fdata-sections \ + ${CFLAGS} - + INCLUDES = -I$(BASE_DIR)/plugins \ -I$(SRCBASE_DIR)/projects/build/linux/common \ @@ -79,9 +74,10 @@ INCLUDES = -I$(BASE_DIR)/plugins \ 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 \ @@ -188,7 +188,7 @@ - -static-libgcc -static-libstdc++ -Wl,--gc-sections + -static-libgcc -static-libstdc++ -Wl,--gc-sections \ + ${LDFLAGS} - + 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 @@ -196,9 +196,9 @@ --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -42,7 +42,7 @@ DIRLIST = jni \ - + TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so - + -CFLAGS = -DTARGET_OS_LINUX=1 \ +CFLAGS := -DTARGET_OS_LINUX=1 \ -D_GNU_SOURCE \ @@ -211,13 +211,13 @@ - -ffunction-sections -fdata-sections + -ffunction-sections -fdata-sections \ + ${CFLAGS} - + CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections - + @@ -89,21 +90,16 @@ ifdef HOST_COMPILE -I$(PLUGINS_DIR) \ $(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 \ @@ -229,7 +229,7 @@ INCLUDES = $(BASE_INCLUDES) LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS) endif - + -ifeq ($(BUILD_TYPE), Release) - CFLAGS += -Os -else @@ -239,6 +239,5 @@ ifeq ($(ARCH), x32) CFLAGS += -m32 LDFLAGS += -m32 --- +-- 2.38.1 -
