java11-openjfx/repos/extra-x86_64/java11-openjfx-flags.patch

   1 diff -aur orig/buildSrc/linux.gradle patched/buildSrc/linux.gradle
   2 --- orig/buildSrc/linux.gradle  2022-05-25 14:11:20.000000000 +0200
   3 +++ patched/buildSrc/linux.gradle       2022-07-22 12:45:39.164493724 +0200
   4 @@ -44,8 +44,11 @@
   5  def commonFlags = [
   6          "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
   7          "-fstack-protector",
   8 +        "-Wno-error=cast-function-type",
   9          "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=trampolines"] // warning flags
  10
  11 +commonFlags.addAll(System.getenv("CFLAGS").trim().replaceAll(" +", " ").split(" "))
  12 +
  13  if (!IS_64) {
  14      commonFlags += "-m32"
  15  }
  16 @@ -72,6 +75,8 @@
  17
  18  def linkFlags = IS_STATIC_BUILD ? staticLinkFlags : dynamicLinkFlags;
  19
  20 +linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" "))
  21 +
  22  if (IS_DEBUG_NATIVE) {
  23      linkFlags += "-g"
  24  }
  25 @@ -305,7 +310,7 @@
  26  LINUX.iio.compiler = compiler
  27  LINUX.iio.ccFlags = [cFlags, "-fvisibility=hidden"].flatten()
  28  LINUX.iio.linker = IS_STATIC_BUILD ? "ld" : linker
  29 -LINUX.iio.linkFlags = [linkFlags].flatten()
  30 +LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
  31  LINUX.iio.lib = "javafx_iio"
  32
  33  LINUX.prismES2 = [:]
  34 @@ -353,5 +358,5 @@
  35  LINUX.webkit = [:]
  36  LINUX.webkit.compiler = compiler
  37  LINUX.webkit.linker = linker
  38 -LINUX.webkit.ccFlags = commonFlags.flatten()
  39 +LINUX.webkit.ccFlags = [commonFlags, "-fno-lto"].flatten()
  40  LINUX.webkit.linkFlags = linkFlags.flatten()
  41 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
  42 --- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile        2022-05-25 14:11:20.000000000 +0200
  43 +++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile     2022-07-22 12:45:39.167827045 +0200
  44 @@ -17,7 +17,7 @@
  45  OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
  46  endif
  47
  48 -CFLAGS = -fPIC                   \
  49 +CFLAGS := -fPIC                   \
  50           -Wformat                \
  51           -Wextra                 \
  52           -Wformat-security       \
  53 @@ -32,13 +32,8 @@
  54           -DGSTREAMER_LITE \
  55           -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \
  56           -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \
  57 -         -ffunction-sections -fdata-sections
  58 -
  59 -ifeq ($(BUILD_TYPE), Release)
  60 -    CFLAGS += -Os
  61 -else
  62 -    CFLAGS += -g -Wall
  63 -endif
  64 +         -ffunction-sections -fdata-sections \
  65 +         ${CFLAGS}
  66
  67  PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
  68  PACKAGES_LIBS     := $(shell pkg-config --libs glib-2.0 gobject-2.0)
  69 @@ -49,11 +44,12 @@
  70            -I../../../gstreamer-lite/gstreamer/libs    \
  71            $(PACKAGES_INCLUDES)
  72
  73 -LDFLAGS = -L$(BUILD_DIR)    \
  74 +LDFLAGS := -L$(BUILD_DIR)    \
  75            -lgstreamer-lite  \
  76             $(PACKAGES_LIBS) \
  77            -z relro          \
  78 -          -static-libgcc -static-libstdc++ -Wl,--gc-sections
  79 +          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
  80 +          ${LDFLAGS}
  81
  82  ifneq ($(strip $(LIBAV_DIR)),)
  83  INCLUDES += -I$(LIBAV_DIR)/include
  84 Only in patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin: Makefile.orig
  85 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
  86 --- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile       2022-05-25 14:11:20.000000000 +0200
  87 +++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile    2022-07-22 12:45:39.167827045 +0200
  88 @@ -14,7 +14,7 @@
  89
  90  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
  91
  92 -CFLAGS = -fPIC                   \
  93 +CFLAGS := -fPIC                   \
  94           -Wformat                \
  95           -Wextra                 \
  96           -Wformat-security       \
  97 @@ -34,14 +34,8 @@
  98           -DGSTREAMER_LITE \
  99           -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \
 100           -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \
 101 -         -ffunction-sections -fdata-sections
 102 -
 103 -ifeq ($(BUILD_TYPE), Release)
 104 -    CFLAGS += -Os
 105 -else
 106 -    CFLAGS += -g -Wall
 107 -endif
 108 -
 109 +         -ffunction-sections -fdata-sections \
 110 +         ${CFLAGS}
 111
 112  INCLUDES = -I$(SRCBASE_DIR) \
 113            $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
 114 @@ -51,9 +45,10 @@
 115  PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
 116  PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
 117
 118 -LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
 119 +LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
 120            -z relro \
 121 -          -static-libgcc -static-libstdc++ -Wl,--gc-sections
 122 +          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
 123 +          ${LDFLAGS}
 124
 125  ifeq ($(ARCH), x32)
 126      CFLAGS += -m32
 127 Only in patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins: Makefile.orig
 128 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
 129 --- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile  2022-05-25 14:11:20.000000000 +0200
 130 +++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile       2022-07-22 12:45:39.167827045 +0200
 131 @@ -37,7 +37,7 @@
 132
 133  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
 134
 135 -CFLAGS =-fPIC                   \
 136 +CFLAGS :=-fPIC                   \
 137          -Wformat                \
 138          -Wextra                 \
 139          -Wformat-security       \
 140 @@ -55,13 +55,8 @@
 141          -DGST_DISABLE_LOADSAVE  \
 142          -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \
 143          -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \
 144 -        -ffunction-sections -fdata-sections
 145 -
 146 -ifeq ($(BUILD_TYPE), Release)
 147 -    CFLAGS += -Os
 148 -else
 149 -    CFLAGS += -g -Wall
 150 -endif
 151 +        -ffunction-sections -fdata-sections \
 152 +        ${CFLAGS}
 153
 154  INCLUDES = -I$(BASE_DIR)/plugins                          \
 155            -I$(SRCBASE_DIR)/projects/build/linux/common   \
 156 @@ -79,9 +74,10 @@
 157  PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa glib-2.0)
 158  PACKAGES_LIBS := $(shell pkg-config --libs alsa glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0)
 159
 160 -LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
 161 +LDFLAGS := -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
 162            -z relro \
 163 -          -static-libgcc -static-libstdc++ -Wl,--gc-sections
 164 +          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
 165 +          ${LDFLAGS}
 166
 167  ifeq ($(ARCH), x32)
 168      CFLAGS += -m32
 169 Only in patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite: Makefile.orig
 170 diff -aur orig/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
 171 --- orig/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile  2022-05-25 14:11:20.000000000 +0200
 172 +++ patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile       2022-07-22 12:45:39.167827045 +0200
 173 @@ -42,7 +42,7 @@
 174
 175  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
 176
 177 -CFLAGS = -DTARGET_OS_LINUX=1     \
 178 +CFLAGS := -DTARGET_OS_LINUX=1     \
 179           -D_GNU_SOURCE           \
 180           -DGST_REMOVE_DEPRECATED \
 181           -DGST_DISABLE_GST_DEBUG \
 182 @@ -54,7 +54,8 @@
 183           -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \
 184           -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \
 185           -Werror=deprecated-declarations \
 186 -         -ffunction-sections -fdata-sections
 187 +         -ffunction-sections -fdata-sections \
 188 +         ${CFLAGS}
 189
 190  CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
 191
 192 @@ -84,21 +85,16 @@
 193                    -I$(GSTREAMER_LITE_DIR)/gstreamer/libs \
 194                   $(PACKAGES_INCLUDES)
 195
 196 -       LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
 197 +       LDFLAGS := -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
 198              -z relro \
 199 -            -static-libgcc -static-libstdc++ -Wl,--gc-sections
 200 +            -static-libgcc -static-libstdc++ -Wl,--gc-sections \
 201 +            ${LDFLAGS}
 202  else
 203         CFLAGS += $(EXTRA_CFLAGS)
 204         INCLUDES = $(BASE_INCLUDES)
 205         LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
 206  endif
 207
 208 -ifeq ($(BUILD_TYPE), Release)
 209 -       CFLAGS += -Os
 210 -else
 211 -       CFLAGS += -g -Wall -D_DEBUG
 212 -endif
 213 -
 214  ifeq ($(ARCH), x32)
 215      CFLAGS += -m32
 216      LDFLAGS += -m32
 217 Only in patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux: Makefile.orig