upgpkg: 19.u11-1

3 files changed, 72 insertions, 67 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6828869a3827..5a939660a4e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=(
   java-openjfx-doc
   java-openjfx-src
 )
-pkgver=18.0.2.u2
+pkgver=19.u11
 pkgrel=1
 pkgdesc="Java OpenJFX client application platform (open-source implementation of JavaFX) - latest version"
 arch=(x86_64)
@@ -52,13 +52,11 @@ source=(
   gradle.properties
   java-openjfx-flags.patch
   java-openjfx-no-xlocale.patch
-  java-openjfx-gstreamer-lite-gcc10-compat.patch
 )
-b2sums=('7c913def2a1f1248221a51a7730a6067183f3f7ce1bea5a2792c961f73f423754e50e4f01b0f51ae4703a24bf11c334f4dfa4e8913623399d457cff88f820ab7'
+b2sums=('5a7f1402a5fac2d2442814fcf2c1338a260b8a372e5a7359661e852a389deae83491a466dfc707fd83ea71557df3ecf661d438f8544cf442012c8c36d986e03c'
         'a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498'
-        'c8372fef5837b0c9067e7f01d3310ddc6f9143cdd6891b6627f783a63b24e3b69a88e17b82e01686a0d43a17c692008c3b20a563abc647964f2b34300e6ffc1a'
-        '13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e'
-        '119fa1cc5da2cdefa22bbe9b6f76581faa74e05fa7b6e5576470fc0251c6e257f122fbba03754cc01f7c7251145cfa1cab4ffc2f9d59ff0c175a121e943a0f64')
+        '30f5f096f29a85b7d3a40de6bd3420fc951e24eee1d19017c41f3553c1d44832bd87742af691c9f68c1149ea827faf88edfa6af1e27cb324b7bf7d093a74398e'
+        '13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e')
 
 prepare() {
   cd jfx-${pkgver//.u/-}
@@ -67,7 +65,6 @@ prepare() {
   ln -sf ../gradle.properties .
   patch -Np1 -i ../java-openjfx-flags.patch
   patch -Np1 -i ../java-openjfx-no-xlocale.patch
-  patch -Np1 -i ../java-openjfx-gstreamer-lite-gcc10-compat.patch
   sed 's|, "-Werror"||g' -i buildSrc/linux.gradle
 }
 
diff --git a/java-openjfx-flags.patch b/java-openjfx-flags.patch
index fc81171a6258..df726013ac3f 100644
--- a/java-openjfx-flags.patch
+++ b/java-openjfx-flags.patch
@@ -1,7 +1,22 @@
-diff -aur orig/buildSrc/linux.gradle patched/buildSrc/linux.gradle
---- orig/buildSrc/linux.gradle	2022-07-19 13:11:40.000000000 +0200
-+++ patched/buildSrc/linux.gradle	2022-07-22 12:49:26.553662841 +0200
-@@ -43,8 +43,11 @@
+From 6a90da118a7ab787c675e25ff871f7f8aa03dc53 Mon Sep 17 00:00:00 2001
+From: Frederik Schwan <frederik.schwan@linux.com>
+Date: Wed, 19 Oct 2022 12:18:28 +0200
+Subject: [PATCH] use the systems CFLAGS and LDFLAGS
+
+(cherry picked from commit 7895d73c94aebec4786ab5dbdcdac0361aa3c548)
+---
+ buildSrc/linux.gradle                           |  8 ++++++--
+ .../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(+), 43 deletions(-)
+
+diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
+index 387d5eee06..ac3be55f6a 100644
+--- a/buildSrc/linux.gradle
++++ b/buildSrc/linux.gradle
+@@ -43,8 +43,11 @@ LINUX.library = { name -> return (IS_STATIC_BUILD ? "lib${name}.a" : "lib${name}
  def commonFlags = [
          "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
          "-fstack-protector",
@@ -13,7 +28,7 @@ diff -aur orig/buildSrc/linux.gradle patched/buildSrc/linux.gradle
  if (!IS_64) {
      commonFlags += "-m32"
  }
-@@ -70,6 +73,7 @@
+@@ -70,6 +73,7 @@ def dynamicLinkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", common
  def staticLinkFlags = [].flatten()
  
  def linkFlags = IS_STATIC_BUILD ? staticLinkFlags : dynamicLinkFlags;
@@ -21,7 +36,7 @@ diff -aur orig/buildSrc/linux.gradle patched/buildSrc/linux.gradle
  
  if (IS_DEBUG_NATIVE) {
      linkFlags += "-g"
-@@ -284,7 +288,7 @@
+@@ -284,7 +288,7 @@ LINUX.iio.nativeSource = [
  LINUX.iio.compiler = compiler
  LINUX.iio.ccFlags = [cFlags, "-fvisibility=hidden"].flatten()
  LINUX.iio.linker = IS_STATIC_BUILD ? "ld" : linker
@@ -30,18 +45,18 @@ diff -aur orig/buildSrc/linux.gradle patched/buildSrc/linux.gradle
  LINUX.iio.lib = "javafx_iio"
  
  LINUX.prismES2 = [:]
-@@ -332,5 +336,5 @@
+@@ -332,5 +336,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()
-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-19 13:11:40.000000000 +0200
-+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	2022-07-22 12:49:26.556996162 +0200
-@@ -17,7 +17,7 @@
+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 fbc3f45650..0e674d27ff 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
  OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
  endif
  
@@ -50,13 +65,13 @@ diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/avp
           -Wformat                \
           -Wextra                 \
           -Wformat-security       \
-@@ -29,17 +29,13 @@
-          -DLINUX                 \
-          -DGST_DISABLE_LOADSAVE  \
+@@ -31,18 +31,13 @@ CFLAGS = -fPIC                   \
           -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}
++				 ${CFLAGS}
  
  ifneq ($(ARCH), aarch64)
      CFLAGS += -msse2
@@ -67,10 +82,11 @@ diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/avp
 -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)
-@@ -50,11 +46,12 @@
+ 
+@@ -52,11 +47,12 @@ INCLUDES= -I../../../plugins                          \
            -I../../../gstreamer-lite/gstreamer/libs    \
            $(PACKAGES_INCLUDES)
  
@@ -85,11 +101,11 @@ diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/avp
  
  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-07-19 13:11:40.000000000 +0200
-+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	2022-07-22 12:49:26.556996162 +0200
-@@ -14,7 +14,7 @@
+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 d831760bbc..d29e13c765 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       \
  
  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
  
@@ -98,13 +114,13 @@ diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxp
           -Wformat                \
           -Wextra                 \
           -Wformat-security       \
-@@ -30,18 +30,13 @@
-          -DGST_DISABLE_LOADSAVE  \
-          -DGST_DISABLE_GST_DEBUG \
+@@ -33,19 +33,13 @@ CFLAGS = -fPIC                   \
           -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}
++				 ${CFLAGS}
  
  ifneq ($(ARCH), aarch64)
      CFLAGS += -msse2
@@ -116,10 +132,11 @@ diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxp
 -    CFLAGS += -g -Wall
 -endif
 -
- 
+-
  INCLUDES = -I$(SRCBASE_DIR) \
  	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
-@@ -51,9 +46,10 @@
+            -I../../../gstreamer-lite/gstreamer       \
+@@ -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)
  
@@ -132,11 +149,11 @@ diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxp
  
  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-07-19 13:11:40.000000000 +0200
-+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	2022-07-22 12:49:26.556996162 +0200
-@@ -37,7 +37,7 @@
+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 86ef57d154..0942421aa0 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 \
  
  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
  
@@ -145,10 +162,10 @@ diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/gst
          -Wformat                \
          -Wextra                 \
          -Wformat-security       \
-@@ -52,13 +52,8 @@
-         -DLINUX                 \
-         -DGST_DISABLE_GST_DEBUG \
+@@ -55,13 +55,8 @@ CFLAGS =-fPIC                   \
          -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)
@@ -161,7 +178,7 @@ diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/gst
  
  INCLUDES = -I$(BASE_DIR)/plugins                          \
  	   -I$(SRCBASE_DIR)/projects/build/linux/common   \
-@@ -76,9 +71,10 @@
+@@ -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)
  
@@ -174,11 +191,11 @@ diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/gst
  
  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-07-19 13:11:40.000000000 +0200
-+++ patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile	2022-07-22 12:49:26.556996162 +0200
-@@ -42,7 +42,7 @@
+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 fc10e0f88b..e944f6e3ce 100644
+--- 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
  
@@ -187,17 +204,17 @@ diff -aur orig/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Make
           -D_GNU_SOURCE           \
           -DGST_REMOVE_DEPRECATED \
           -DGST_DISABLE_GST_DEBUG \
-@@ -51,7 +51,8 @@
-          -DHAVE_CONFIG_H         \
-          -DJFXMEDIA_JNI_EXPORTS  \
-          -DLINUX                 \
+@@ -54,7 +54,8 @@ CFLAGS = -DTARGET_OS_LINUX=1     \
+          -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
  
-@@ -86,21 +87,16 @@
+@@ -89,21 +90,16 @@ ifdef HOST_COMPILE
  	           -I$(PLUGINS_DIR) \
  		  $(PACKAGES_INCLUDES)
  
@@ -222,4 +239,6 @@ diff -aur orig/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Make
  ifeq ($(ARCH), x32)
      CFLAGS += -m32
      LDFLAGS += -m32
-Only in patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux: Makefile.orig
+-- 
+2.38.1
+
diff --git a/java-openjfx-gstreamer-lite-gcc10-compat.patch b/java-openjfx-gstreamer-lite-gcc10-compat.patch
deleted file mode 100644
index f6d2795d8adf..000000000000
--- a/java-openjfx-gstreamer-lite-gcc10-compat.patch
+++ /dev/null
@@ -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                          \