Date: Friday, July 22, 2022 @ 12:00:26 Author: freswa Revision: 451540
archrelease: copy trunk to extra-x86_64 Added: java11-openjfx/repos/extra-x86_64/PKGBUILD (from rev 451539, java11-openjfx/trunk/PKGBUILD) java11-openjfx/repos/extra-x86_64/gradle.properties (from rev 451539, java11-openjfx/trunk/gradle.properties) java11-openjfx/repos/extra-x86_64/java11-openjfx-flags.patch (from rev 451539, java11-openjfx/trunk/java11-openjfx-flags.patch) java11-openjfx/repos/extra-x86_64/java11-openjfx-gstreamer-lite-gcc10-compat.patch (from rev 451539, java11-openjfx/trunk/java11-openjfx-gstreamer-lite-gcc10-compat.patch) java11-openjfx/repos/extra-x86_64/java11-openjfx-no-xlocale.patch (from rev 451539, java11-openjfx/trunk/java11-openjfx-no-xlocale.patch) Deleted: java11-openjfx/repos/extra-x86_64/PKGBUILD java11-openjfx/repos/extra-x86_64/gradle.properties java11-openjfx/repos/extra-x86_64/java11-openjfx-flags.patch java11-openjfx/repos/extra-x86_64/java11-openjfx-gstreamer-lite-gcc10-compat.patch java11-openjfx/repos/extra-x86_64/java11-openjfx-no-xlocale.patch --------------------------------------------------+ PKGBUILD | 238 +++++------ gradle.properties | 6 java11-openjfx-flags.patch | 430 ++++++++++----------- java11-openjfx-gstreamer-lite-gcc10-compat.patch | 22 - java11-openjfx-no-xlocale.patch | 32 - 5 files changed, 366 insertions(+), 362 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-07-22 12:00:21 UTC (rev 451539) +++ PKGBUILD 2022-07-22 12:00:26 UTC (rev 451540) @@ -1,119 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Maintainer: Frederik Schwan <freswa at archlinux dot org> -# Contributor: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Guillaume Alaux <guilla...@archlinux.org> -# Contributor: William Gathoye <william+archli...@gathoye.be> -# Contributor: Emanuel Couto <emanuel.amaral.co...@gmail.com> -# Contributor: Richard Jackson <rdjac...@gmail.com> -# Contributor: Tinx <a...@tinx.eu> -# Contributor: Jens Kapitza <j.kapi...@schwarze-allianz.de> -# Contributor: Olli <o...@coderkun.de> - -pkgbase=java11-openjfx -pkgname=( - java11-openjfx - java11-openjfx-doc - java11-openjfx-src -) -pkgver=11.0.15.u2 -pkgrel=1 -pkgdesc='Java OpenJFX 11 client application platform (open-source implementation of JavaFX)' -arch=(x86_64) -url=https://wiki.openjdk.java.net/display/OpenJFX/Main -license=(custom) -makedepends=( - alsa-lib - ant - cairo - cmake - ffmpeg4.4 - freetype2 - gdk-pixbuf2 - glib2 - gperf - gradle - gtk2 - gtk3 - java-environment-openjdk=11 - libgl - libx11 - libxtst - pango - python - ruby - unzip - webkit2gtk - zip -) -source=( - ${pkgname}-${pkgver}.tar.gz::https://github.com/openjdk/jfx11u/archive/refs/tags/${pkgver//.u/+}.tar.gz - gradle.properties - java11-openjfx-flags.patch - java11-openjfx-no-xlocale.patch - java11-openjfx-gstreamer-lite-gcc10-compat.patch -) -b2sums=('4d60c9ec1a81b2ed1305575a9a16ac0703c782b5bb80395c347086ce7418fa4ca07987585d3bde0527a5922d2bb84c3e1bdc3bb043ca29666c85fd0ed4aa2f89' - 'a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498' - '84565ff95e1f78e6635644611a02a19f2ca37351c5e9363a19e050d1715f50746482bf5948c9a658cd530330c0bdb9dc1ff6fa4eeb992309894366e7a60dca77' - '13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e' - '119fa1cc5da2cdefa22bbe9b6f76581faa74e05fa7b6e5576470fc0251c6e257f122fbba03754cc01f7c7251145cfa1cab4ffc2f9d59ff0c175a121e943a0f64') - -prepare() { - cd jfx11u-${pkgver//.u/-} - - ln -sf ../gradle.properties . - patch -Np1 -i ../java11-openjfx-flags.patch - patch -Np1 -i ../java11-openjfx-no-xlocale.patch - patch -Np1 -i ../java11-openjfx-gstreamer-lite-gcc10-compat.patch -} - -build() { - cd jfx11u-${pkgver//.u/-} - - # build against ffmpeg4.4 - export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig' - - gradle zips -} - -package_java11-openjfx() { - depends=( - java-runtime-openjdk=11 - libgl - libx11 - libxtst - ) - optdepends=( - 'ffmpeg4.4: Media support', - 'gtk2: GTK2 support', - 'gtk3: GTK3 support', - 'webkit2gtk: Web support' - ) - provides=('java-openjfx=11') - - cd jfx11u-${pkgver//.u/-} - - install -dm 755 "${pkgdir}"/usr/{lib/jvm/java-11-openjfx,share/licenses} - cp -dr --no-preserve=ownership build/sdk/lib "${pkgdir}"/usr/lib/jvm/java-11-openjfx/ - rm "${pkgdir}"/usr/lib/jvm/java-11-openjfx/lib/src.zip - cp -dr --no-preserve=ownership build/jmods "${pkgdir}"/usr/lib/jvm/java-11-openjfx/ - cp -dr --no-preserve=ownership build/sdk/legal "${pkgdir}"/usr/share/licenses/java11-openjfx -} - -package_java11-openjfx-doc() { - cd jfx11u-${pkgver//.u/-} - - install -dm 755 "${pkgdir}"/usr/share/{doc,licenses} - cp -dr --no-preserve=ownership build/javadoc "${pkgdir}"/usr/share/doc/java11-openjfx - ln -s java11-openjfx "${pkgdir}"/usr/share/licenses/java11-openjfx-doc -} - -package_java11-openjfx-src() { - cd jfx11u-${pkgver//.u/-} - - install -dm 755 "${pkgdir}"/usr/{lib/jvm/java-11-openjfx,share/licenses} - install -m 644 build/sdk/lib/src.zip "${pkgdir}"/usr/lib/jvm/java-11-openjfx/javafx-src.zip - ln -s java11-openjfx "${pkgdir}"/usr/share/licenses/java11-openjfx-src -} - -# vim: ts=2 sw=2 et: Copied: java11-openjfx/repos/extra-x86_64/PKGBUILD (from rev 451539, java11-openjfx/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-07-22 12:00:26 UTC (rev 451540) @@ -0,0 +1,119 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Frederik Schwan <freswa at archlinux dot org> +# Contributor: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Guillaume Alaux <guilla...@archlinux.org> +# Contributor: William Gathoye <william+archli...@gathoye.be> +# Contributor: Emanuel Couto <emanuel.amaral.co...@gmail.com> +# Contributor: Richard Jackson <rdjac...@gmail.com> +# Contributor: Tinx <a...@tinx.eu> +# Contributor: Jens Kapitza <j.kapi...@schwarze-allianz.de> +# Contributor: Olli <o...@coderkun.de> + +pkgbase=java11-openjfx +pkgname=( + java11-openjfx + java11-openjfx-doc + java11-openjfx-src +) +pkgver=11.0.16.u2 +pkgrel=1 +pkgdesc='Java OpenJFX 11 client application platform (open-source implementation of JavaFX)' +arch=(x86_64) +url=https://wiki.openjdk.java.net/display/OpenJFX/Main +license=(custom) +makedepends=( + alsa-lib + ant + cairo + cmake + ffmpeg4.4 + freetype2 + gdk-pixbuf2 + glib2 + gperf + gradle + gtk2 + gtk3 + java-environment-openjdk=11 + libgl + libx11 + libxtst + pango + python + ruby + unzip + webkit2gtk + zip +) +source=( + ${pkgname}-${pkgver}.tar.gz::https://github.com/openjdk/jfx11u/archive/refs/tags/${pkgver//.u/+}.tar.gz + gradle.properties + java11-openjfx-flags.patch + java11-openjfx-no-xlocale.patch + java11-openjfx-gstreamer-lite-gcc10-compat.patch +) +b2sums=('7711c39a5c85a7cf1e7e39b6e0972dac9fc1f517f55fd52cd43b36b1cad7bceb212040946f7d3ad86096694b627529e74c4e9eb859a59767c2861eee6fe2661c' + 'a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498' + '191de086c12e4ae8fd901a06c6382891544d1a336c51dbd491c76c0ecff808c042a2117e3f25239768809a38cceddcb17c32331715cc2bbdd057fe307b908df3' + '13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e' + '119fa1cc5da2cdefa22bbe9b6f76581faa74e05fa7b6e5576470fc0251c6e257f122fbba03754cc01f7c7251145cfa1cab4ffc2f9d59ff0c175a121e943a0f64') + +prepare() { + cd jfx11u-${pkgver//.u/-} + + ln -sf ../gradle.properties . + patch -Np1 -i ../java11-openjfx-flags.patch + patch -Np1 -i ../java11-openjfx-no-xlocale.patch + patch -Np1 -i ../java11-openjfx-gstreamer-lite-gcc10-compat.patch +} + +build() { + cd jfx11u-${pkgver//.u/-} + + # build against ffmpeg4.4 + export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig' + + gradle zips +} + +package_java11-openjfx() { + depends=( + java-runtime-openjdk=11 + libgl + libx11 + libxtst + ) + optdepends=( + 'ffmpeg4.4: Media support', + 'gtk2: GTK2 support', + 'gtk3: GTK3 support', + 'webkit2gtk: Web support' + ) + provides=('java-openjfx=11') + + cd jfx11u-${pkgver//.u/-} + + install -dm 755 "${pkgdir}"/usr/{lib/jvm/java-11-openjfx,share/licenses} + cp -dr --no-preserve=ownership build/sdk/lib "${pkgdir}"/usr/lib/jvm/java-11-openjfx/ + rm "${pkgdir}"/usr/lib/jvm/java-11-openjfx/lib/src.zip + cp -dr --no-preserve=ownership build/jmods "${pkgdir}"/usr/lib/jvm/java-11-openjfx/ + cp -dr --no-preserve=ownership build/sdk/legal "${pkgdir}"/usr/share/licenses/java11-openjfx +} + +package_java11-openjfx-doc() { + cd jfx11u-${pkgver//.u/-} + + install -dm 755 "${pkgdir}"/usr/share/{doc,licenses} + cp -dr --no-preserve=ownership build/javadoc "${pkgdir}"/usr/share/doc/java11-openjfx + ln -s java11-openjfx "${pkgdir}"/usr/share/licenses/java11-openjfx-doc +} + +package_java11-openjfx-src() { + cd jfx11u-${pkgver//.u/-} + + install -dm 755 "${pkgdir}"/usr/{lib/jvm/java-11-openjfx,share/licenses} + install -m 644 build/sdk/lib/src.zip "${pkgdir}"/usr/lib/jvm/java-11-openjfx/javafx-src.zip + ln -s java11-openjfx "${pkgdir}"/usr/share/licenses/java11-openjfx-src +} + +# vim: ts=2 sw=2 et: Deleted: gradle.properties =================================================================== --- gradle.properties 2022-07-22 12:00:21 UTC (rev 451539) +++ gradle.properties 2022-07-22 12:00:26 UTC (rev 451540) @@ -1,3 +0,0 @@ -COMPILE_MEDIA = true -COMPILE_WEBKIT = true -CONF = Release Copied: java11-openjfx/repos/extra-x86_64/gradle.properties (from rev 451539, java11-openjfx/trunk/gradle.properties) =================================================================== --- gradle.properties (rev 0) +++ gradle.properties 2022-07-22 12:00:26 UTC (rev 451540) @@ -0,0 +1,3 @@ +COMPILE_MEDIA = true +COMPILE_WEBKIT = true +CONF = Release Deleted: java11-openjfx-flags.patch =================================================================== --- java11-openjfx-flags.patch 2022-07-22 12:00:21 UTC (rev 451539) +++ java11-openjfx-flags.patch 2022-07-22 12:00:26 UTC (rev 451540) @@ -1,213 +0,0 @@ -diff -rupN orig/buildSrc/linux.gradle patched/buildSrc/linux.gradle ---- orig/buildSrc/linux.gradle 2021-12-07 10:56:58.000000000 +0100 -+++ patched/buildSrc/linux.gradle 2022-02-17 00:55:05.307968721 +0100 -@@ -44,8 +44,11 @@ LINUX.library = { name -> return (IS_STA - def commonFlags = [ - "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags - "-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) { - commonFlags += "-m32" - } -@@ -72,6 +75,8 @@ def staticLinkFlags = [].flatten() - - def linkFlags = IS_STATIC_BUILD ? staticLinkFlags : dynamicLinkFlags; - -+linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" ")) -+ - if (IS_DEBUG_NATIVE) { - linkFlags += "-g" - } -@@ -301,7 +306,7 @@ LINUX.iio.nativeSource = [ - LINUX.iio.compiler = compiler - LINUX.iio.ccFlags = [cFlags, "-fvisibility=hidden"].flatten() - LINUX.iio.linker = IS_STATIC_BUILD ? "ld" : linker --LINUX.iio.linkFlags = [linkFlags].flatten() -+LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten() - LINUX.iio.lib = "javafx_iio" - - LINUX.prismES2 = [:] -@@ -349,5 +354,5 @@ LINUX.media.ar = "${toolchainDir}ar" - LINUX.webkit = [:] - LINUX.webkit.compiler = compiler - LINUX.webkit.linker = linker --LINUX.webkit.ccFlags = commonFlags.flatten() -+LINUX.webkit.ccFlags = [commonFlags, "-fno-lto"].flatten() - LINUX.webkit.linkFlags = linkFlags.flatten() -diff -rupN 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 2021-12-07 10:56:58.000000000 +0100 -+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile 2022-02-17 00:54:26.207056670 +0100 -@@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so - OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin - endif - --CFLAGS = -fPIC \ -+CFLAGS := -fPIC \ - -Wformat \ - -Wextra \ - -Wformat-security \ -@@ -30,13 +30,8 @@ CFLAGS = -fPIC \ - -DLINUX \ - -DGST_DISABLE_LOADSAVE \ - -DGSTREAMER_LITE \ -- -ffunction-sections -fdata-sections -- --ifeq ($(BUILD_TYPE), Release) -- CFLAGS += -Os --else -- CFLAGS += -g -Wall --endif -+ -ffunction-sections -fdata-sections \ -+ ${CFLAGS} - - 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 @@ INCLUDES= -I../../../plugins - -I../../../gstreamer-lite/gstreamer/libs \ - $(PACKAGES_INCLUDES) - --LDFLAGS = -L$(BUILD_DIR) \ -+LDFLAGS := -L$(BUILD_DIR) \ - -lgstreamer-lite \ - $(PACKAGES_LIBS) \ - -z relro \ -- -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 -rupN 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 2021-12-07 10:56:58.000000000 +0100 -+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile 2022-02-17 00:54:26.207056670 +0100 -@@ -14,7 +14,7 @@ DIRLIST = progressbuffer \ - - TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so - --CFLAGS = -fPIC \ -+CFLAGS := -fPIC \ - -Wformat \ - -Wextra \ - -Wformat-security \ -@@ -31,14 +31,8 @@ CFLAGS = -fPIC \ - -DGST_DISABLE_LOADSAVE \ - -DGST_DISABLE_GST_DEBUG \ - -DGSTREAMER_LITE \ -- -ffunction-sections -fdata-sections -- --ifeq ($(BUILD_TYPE), Release) -- CFLAGS += -Os --else -- CFLAGS += -g -Wall --endif -- -+ -ffunction-sections -fdata-sections \ -+ ${CFLAGS} - - INCLUDES = -I$(SRCBASE_DIR) \ - $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \ -@@ -48,9 +42,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 \ -- -static-libgcc -static-libstdc++ -Wl,--gc-sections -+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \ -+ ${LDFLAGS} - - ifeq ($(ARCH), x32) - CFLAGS += -m32 -diff -rupN 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 2021-12-07 10:56:58.000000000 +0100 -+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2022-02-17 00:54:26.207056670 +0100 -@@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \ - - TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so - --CFLAGS =-fPIC \ -+CFLAGS :=-fPIC \ - -Wformat \ - -Wextra \ - -Wformat-security \ -@@ -52,13 +52,8 @@ CFLAGS =-fPIC \ - -DLINUX \ - -DGST_DISABLE_GST_DEBUG \ - -DGST_DISABLE_LOADSAVE \ -- -ffunction-sections -fdata-sections -- --ifeq ($(BUILD_TYPE), Release) -- CFLAGS += -Os --else -- CFLAGS += -g -Wall --endif -+ -ffunction-sections -fdata-sections \ -+ ${CFLAGS} - - INCLUDES = -I$(BASE_DIR)/plugins \ - -I$(SRCBASE_DIR)/projects/build/linux/common \ -@@ -76,9 +71,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 \ -- -static-libgcc -static-libstdc++ -Wl,--gc-sections -+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \ -+ ${LDFLAGS} - - ifeq ($(ARCH), x32) - CFLAGS += -m32 -diff -rupN 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 2021-12-07 10:56:58.000000000 +0100 -+++ patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile 2022-02-17 00:54:26.207056670 +0100 -@@ -17,7 +17,7 @@ DIRLIST = jni \ - - TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so - --CFLAGS = -DTARGET_OS_LINUX=1 \ -+CFLAGS := -DTARGET_OS_LINUX=1 \ - -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 \ -- -ffunction-sections -fdata-sections -+ -ffunction-sections -fdata-sections \ -+ ${CFLAGS} - - CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections - -@@ -56,21 +57,16 @@ ifdef HOST_COMPILE - -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 \ -- -static-libgcc -static-libstdc++ -Wl,--gc-sections -+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \ -+ ${LDFLAGS} - else - CFLAGS += $(EXTRA_CFLAGS) - INCLUDES = $(BASE_INCLUDES) - LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS) - endif - --ifeq ($(BUILD_TYPE), Release) -- CFLAGS += -Os --else -- CFLAGS += -g -Wall -D_DEBUG --endif -- - ifeq ($(ARCH), x32) - CFLAGS += -m32 - LDFLAGS += -m32 Copied: java11-openjfx/repos/extra-x86_64/java11-openjfx-flags.patch (from rev 451539, java11-openjfx/trunk/java11-openjfx-flags.patch) =================================================================== --- java11-openjfx-flags.patch (rev 0) +++ java11-openjfx-flags.patch 2022-07-22 12:00:26 UTC (rev 451540) @@ -0,0 +1,217 @@ +diff -aur orig/buildSrc/linux.gradle patched/buildSrc/linux.gradle +--- 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 + "-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) { + commonFlags += "-m32" + } +@@ -72,6 +75,8 @@ + + def linkFlags = IS_STATIC_BUILD ? staticLinkFlags : dynamicLinkFlags; + ++linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" ")) ++ + if (IS_DEBUG_NATIVE) { + linkFlags += "-g" + } +@@ -305,7 +310,7 @@ + LINUX.iio.compiler = compiler + LINUX.iio.ccFlags = [cFlags, "-fvisibility=hidden"].flatten() + LINUX.iio.linker = IS_STATIC_BUILD ? "ld" : linker +-LINUX.iio.linkFlags = [linkFlags].flatten() ++LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten() + LINUX.iio.lib = "javafx_iio" + + LINUX.prismES2 = [:] +@@ -353,5 +358,5 @@ + LINUX.webkit = [:] + LINUX.webkit.compiler = compiler + LINUX.webkit.linker = linker +-LINUX.webkit.ccFlags = commonFlags.flatten() ++LINUX.webkit.ccFlags = [commonFlags, "-fno-lto"].flatten() + LINUX.webkit.linkFlags = linkFlags.flatten() +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-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 + +-CFLAGS = -fPIC \ ++CFLAGS := -fPIC \ + -Wformat \ + -Wextra \ + -Wformat-security \ +@@ -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) +- CFLAGS += -Os +-else +- CFLAGS += -g -Wall +-endif ++ -ffunction-sections -fdata-sections \ ++ ${CFLAGS} + + PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) + PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0) +@@ -49,11 +44,12 @@ + -I../../../gstreamer-lite/gstreamer/libs \ + $(PACKAGES_INCLUDES) + +-LDFLAGS = -L$(BUILD_DIR) \ ++LDFLAGS := -L$(BUILD_DIR) \ + -lgstreamer-lite \ + $(PACKAGES_LIBS) \ + -z relro \ +- -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 +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-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 + +-CFLAGS = -fPIC \ ++CFLAGS := -fPIC \ + -Wformat \ + -Wextra \ + -Wformat-security \ +@@ -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) +- CFLAGS += -Os +-else +- CFLAGS += -g -Wall +-endif +- ++ -ffunction-sections -fdata-sections \ ++ ${CFLAGS} + + INCLUDES = -I$(SRCBASE_DIR) \ + $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \ +@@ -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) + +-LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \ ++LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \ + -z relro \ +- -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 +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-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 + +-CFLAGS =-fPIC \ ++CFLAGS :=-fPIC \ + -Wformat \ + -Wextra \ + -Wformat-security \ +@@ -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) +- CFLAGS += -Os +-else +- CFLAGS += -g -Wall +-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 \ +- -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 +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-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 + +-CFLAGS = -DTARGET_OS_LINUX=1 \ ++CFLAGS := -DTARGET_OS_LINUX=1 \ + -D_GNU_SOURCE \ + -DGST_REMOVE_DEPRECATED \ + -DGST_DISABLE_GST_DEBUG \ +@@ -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} + + CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections + +@@ -84,21 +85,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 \ +- -static-libgcc -static-libstdc++ -Wl,--gc-sections ++ -static-libgcc -static-libstdc++ -Wl,--gc-sections \ ++ ${LDFLAGS} + else + CFLAGS += $(EXTRA_CFLAGS) + INCLUDES = $(BASE_INCLUDES) + LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS) + endif + +-ifeq ($(BUILD_TYPE), Release) +- CFLAGS += -Os +-else +- CFLAGS += -g -Wall -D_DEBUG +-endif +- + ifeq ($(ARCH), x32) + CFLAGS += -m32 + LDFLAGS += -m32 +Only in patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux: Makefile.orig Deleted: java11-openjfx-gstreamer-lite-gcc10-compat.patch =================================================================== --- java11-openjfx-gstreamer-lite-gcc10-compat.patch 2022-07-22 12:00:21 UTC (rev 451539) +++ java11-openjfx-gstreamer-lite-gcc10-compat.patch 2022-07-22 12:00:26 UTC (rev 451540) @@ -1,11 +0,0 @@ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/jfx-14.0.2-0/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile ---- jfx-14.0.2-0/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2020-05-24 23:46:14.657738704 +0200 -+++ src/jfx-14.0.2-0/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2020-05-24 23:44:33.644120502 +0200 -@@ -53,6 +53,7 @@ - -DGST_DISABLE_GST_DEBUG \ - -DGST_DISABLE_LOADSAVE \ - -ffunction-sections -fdata-sections \ -+ -fcommon \ - ${CFLAGS} - - INCLUDES = -I$(BASE_DIR)/plugins \ Copied: java11-openjfx/repos/extra-x86_64/java11-openjfx-gstreamer-lite-gcc10-compat.patch (from rev 451539, java11-openjfx/trunk/java11-openjfx-gstreamer-lite-gcc10-compat.patch) =================================================================== --- java11-openjfx-gstreamer-lite-gcc10-compat.patch (rev 0) +++ java11-openjfx-gstreamer-lite-gcc10-compat.patch 2022-07-22 12:00:26 UTC (rev 451540) @@ -0,0 +1,11 @@ +diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/jfx-14.0.2-0/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +--- jfx-14.0.2-0/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2020-05-24 23:46:14.657738704 +0200 ++++ src/jfx-14.0.2-0/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2020-05-24 23:44:33.644120502 +0200 +@@ -53,6 +53,7 @@ + -DGST_DISABLE_GST_DEBUG \ + -DGST_DISABLE_LOADSAVE \ + -ffunction-sections -fdata-sections \ ++ -fcommon \ + ${CFLAGS} + + INCLUDES = -I$(BASE_DIR)/plugins \ Deleted: java11-openjfx-no-xlocale.patch =================================================================== --- java11-openjfx-no-xlocale.patch 2022-07-22 12:00:21 UTC (rev 451539) +++ java11-openjfx-no-xlocale.patch 2022-07-22 12:00:26 UTC (rev 451540) @@ -1,16 +0,0 @@ -Description: Fixes the compatibility with the version of glibc in Debian -Author: Emmanuel Bourg <ebo...@apache.org> -Forwarded: https://bugs.openjdk.java.net/browse/JDK-8211399 ---- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h -+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h -@@ -25,9 +25,6 @@ - #ifdef HAVE_LOCALE_H - #include <locale.h> - #endif --#ifdef HAVE_XLOCALE_H --#include <xlocale.h> --#endif - - typedef locale_t xsltLocale; - typedef xmlChar xsltLocaleChar; - Copied: java11-openjfx/repos/extra-x86_64/java11-openjfx-no-xlocale.patch (from rev 451539, java11-openjfx/trunk/java11-openjfx-no-xlocale.patch) =================================================================== --- java11-openjfx-no-xlocale.patch (rev 0) +++ java11-openjfx-no-xlocale.patch 2022-07-22 12:00:26 UTC (rev 451540) @@ -0,0 +1,16 @@ +Description: Fixes the compatibility with the version of glibc in Debian +Author: Emmanuel Bourg <ebo...@apache.org> +Forwarded: https://bugs.openjdk.java.net/browse/JDK-8211399 +--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h ++++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h +@@ -25,9 +25,6 @@ + #ifdef HAVE_LOCALE_H + #include <locale.h> + #endif +-#ifdef HAVE_XLOCALE_H +-#include <xlocale.h> +-#endif + + typedef locale_t xsltLocale; + typedef xmlChar xsltLocaleChar; +