[arch-commits] Commit in java11-openjfx/trunk (java11-openjfx-flags.patch)

Frederik Schwan freswa at gemini.archlinux.org
Wed Jul 20 14:38:51 UTC 2022 

    Date: Wednesday, July 20, 2022 @ 14:38:50
  Author: freswa
Revision: 451502

update flags patch for next release

Modified:
  java11-openjfx/trunk/java11-openjfx-flags.patch

----------------------------+
 java11-openjfx-flags.patch |   63 +++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

Modified: java11-openjfx-flags.patch
===================================================================
--- java11-openjfx-flags.patch	2022-07-20 14:23:36 UTC (rev 451501)
+++ java11-openjfx-flags.patch	2022-07-20 14:38:50 UTC (rev 451502)
@@ -1,7 +1,7 @@
-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
+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
+@@ -44,8 +44,11 @@
  def commonFlags = [
          "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
          "-fstack-protector",
@@ -13,7 +13,7 @@
  if (!IS_64) {
      commonFlags += "-m32"
  }
-@@ -72,6 +75,8 @@ def staticLinkFlags = [].flatten()
+@@ -72,6 +75,8 @@
  
  def linkFlags = IS_STATIC_BUILD ? staticLinkFlags : dynamicLinkFlags;
  
@@ -22,7 +22,7 @@
  if (IS_DEBUG_NATIVE) {
      linkFlags += "-g"
  }
-@@ -301,7 +306,7 @@ LINUX.iio.nativeSource = [
+@@ -305,7 +310,7 @@
  LINUX.iio.compiler = compiler
  LINUX.iio.ccFlags = [cFlags, "-fvisibility=hidden"].flatten()
  LINUX.iio.linker = IS_STATIC_BUILD ? "ld" : linker
@@ -31,7 +31,7 @@
  LINUX.iio.lib = "javafx_iio"
  
  LINUX.prismES2 = [:]
-@@ -349,5 +354,5 @@ LINUX.media.ar = "${toolchainDir}ar"
+@@ -353,5 +358,5 @@
  LINUX.webkit = [:]
  LINUX.webkit.compiler = compiler
  LINUX.webkit.linker = linker
@@ -38,10 +38,11 @@
 -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
+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
+@@ -17,7 +17,7 @@
  OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
  endif
  
@@ -50,7 +51,7 @@
           -Wformat                \
           -Wextra                 \
           -Wformat-security       \
-@@ -30,13 +30,8 @@ CFLAGS = -fPIC                   \
+@@ -30,13 +30,8 @@
           -DLINUX                 \
           -DGST_DISABLE_LOADSAVE  \
           -DGSTREAMER_LITE \
@@ -66,7 +67,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 @@ INCLUDES= -I../../../plugins
+@@ -47,11 +42,12 @@
            -I../../../gstreamer-lite/gstreamer/libs    \
            $(PACKAGES_INCLUDES)
  
@@ -81,10 +82,10 @@
  
  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       \
+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
+@@ -14,7 +14,7 @@
  
  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
  
@@ -93,7 +94,7 @@
           -Wformat                \
           -Wextra                 \
           -Wformat-security       \
-@@ -31,14 +31,8 @@ CFLAGS = -fPIC                   \
+@@ -31,14 +31,8 @@
           -DGST_DISABLE_LOADSAVE  \
           -DGST_DISABLE_GST_DEBUG \
           -DGSTREAMER_LITE \
@@ -110,7 +111,7 @@
  
  INCLUDES = -I$(SRCBASE_DIR) \
  	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
-@@ -48,9 +42,10 @@ INCLUDES = -I$(SRCBASE_DIR) \
+@@ -48,9 +42,10 @@
  PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
  PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
  
@@ -123,10 +124,10 @@
  
  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 \
+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
+@@ -37,7 +37,7 @@
  
  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
  
@@ -135,7 +136,7 @@
          -Wformat                \
          -Wextra                 \
          -Wformat-security       \
-@@ -52,13 +52,8 @@ CFLAGS =-fPIC                   \
+@@ -52,13 +52,8 @@
          -DLINUX                 \
          -DGST_DISABLE_GST_DEBUG \
          -DGST_DISABLE_LOADSAVE  \
@@ -151,7 +152,7 @@
  
  INCLUDES = -I$(BASE_DIR)/plugins                          \
  	   -I$(SRCBASE_DIR)/projects/build/linux/common   \
-@@ -76,9 +71,10 @@ INCLUDES = -I$(BASE_DIR)/plugins
+@@ -76,9 +71,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)
  
@@ -164,10 +165,10 @@
  
  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                \
+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 @@
  
  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
  
@@ -176,7 +177,7 @@
           -D_GNU_SOURCE           \
           -DGST_REMOVE_DEPRECATED \
           -DGST_DISABLE_GST_DEBUG \
-@@ -26,7 +26,8 @@ CFLAGS = -DTARGET_OS_LINUX=1     \
+@@ -26,7 +26,8 @@
           -DHAVE_CONFIG_H         \
           -DJFXMEDIA_JNI_EXPORTS  \
           -DLINUX                 \
@@ -186,7 +187,7 @@
  
  CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
  
-@@ -56,21 +57,16 @@ ifdef HOST_COMPILE
+@@ -56,21 +57,16 @@
  	           -I$(GSTREAMER_LITE_DIR)/gstreamer/libs \
  		  $(PACKAGES_INCLUDES)

More information about the arch-commits mailing list