[arch-commits] Commit in java8-openjfx/repos/staging-x86_64 (8 files)
Maxime Gauduin
alucryd at archlinux.org
Tue Jun 4 08:08:36 UTC 2019
Date: Tuesday, June 4, 2019 @ 08:08:35
Author: alucryd
Revision: 354772
archrelease: copy trunk to staging-x86_64
Added:
java8-openjfx/repos/staging-x86_64/PKGBUILD
(from rev 354771, java8-openjfx/trunk/PKGBUILD)
java8-openjfx/repos/staging-x86_64/gradle.properties
(from rev 354771, java8-openjfx/trunk/gradle.properties)
java8-openjfx/repos/staging-x86_64/java8-openjfx-flags.patch
(from rev 354771, java8-openjfx/trunk/java8-openjfx-flags.patch)
java8-openjfx/repos/staging-x86_64/java8-openjfx-no-xlocale.patch
(from rev 354771, java8-openjfx/trunk/java8-openjfx-no-xlocale.patch)
Deleted:
java8-openjfx/repos/staging-x86_64/PKGBUILD
java8-openjfx/repos/staging-x86_64/gradle.properties
java8-openjfx/repos/staging-x86_64/java8-openjfx-flags.patch
java8-openjfx/repos/staging-x86_64/java8-openjfx-no-xlocale.patch
--------------------------------+
PKGBUILD | 230 ++++++++++----------
gradle.properties | 10
java8-openjfx-flags.patch | 442 ++++++++++++++++++++-------------------
java8-openjfx-no-xlocale.patch | 58 ++---
4 files changed, 383 insertions(+), 357 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-06-04 08:08:26 UTC (rev 354771)
+++ PKGBUILD 2019-06-04 08:08:35 UTC (rev 354772)
@@ -1,115 +0,0 @@
-# Maintainer: Guillaume Alaux <guillaume at archlinux.org>
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: William Gathoye <william + archlinux at gathoye dot be>
-# Contributor: Emanuel Couto <emanuel dot amaral dot couto at gmail dot com>
-# Contributor: Richard Jackson <rdjack21 at gmail dot com>
-# Contributor: Tinx <arch at tinx dot eu>
-# Contributor: Jens Kapitza <j dot kapitza at schwarze-allianz dot de>
-# Contributor: Olli <olli at coderkun dot de>
-
-pkgbase=java8-openjfx
-pkgname=(
- java8-openjfx
- java8-openjfx-doc
- java8-openjfx-src
-)
-pkgver=8.u202
-pkgrel=2
-pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX)'
-arch=(x86_64)
-url=https://wiki.openjdk.java.net/display/OpenJFX/Main
-license=(GPL)
-makedepends=(
- alsa-lib
- cairo
- cmake
- ffmpeg
- freetype2
- gdk-pixbuf2
- glib2
- gperf
- gtk2
- gtk3
- java-environment-openjdk=8
- libgl
- libx11
- libxtst
- pango
- python2
- qt5-base
- ruby
- unzip
- webkit2gtk
-)
-source=(
- https://hg.openjdk.java.net/openjfx/8u/rt/archive/${pkgver//./}-ga.tar.bz2
- gradle.properties
- https://services.gradle.org/distributions/gradle-4.8-bin.zip
- java8-openjfx-flags.patch
- java8-openjfx-no-xlocale.patch
-)
-sha256sums=('12b0538d04c4bd451e4692ee06357ac36233ff4ec2af9fa3b9bbdbab48c3f2fc'
- '75335ac8ccae143ab4dbb81fc32c70d34d95baa360388f55bf2d237e8821ad97'
- 'f3e29692a8faa94eb0b02ebf36fa263a642b3ae8694ef806c45c345b8683f1ba'
- '1838a1f9a65dd4a0fd72b3940b54c7e03b9b5eb51b30a1856bb4dbc69d9a0bb4'
- 'b21f6b254acc7aa2124521b6521d3bdfdfcfd9b062624a84ef73608120957d0d')
-
-prepare() {
- cd rt-${pkgver//./}-ga
-
- ln -sf ../gradle.properties .
- patch -Np1 -i ../java8-openjfx-flags.patch
- patch -Np1 -i ../java8-openjfx-no-xlocale.patch
-}
-
-build() {
- cd rt-${pkgver//./}-ga
-
- ../gradle-4.8/bin/gradle
-}
-
-package_java8-openjfx() {
- depends=(
- alsa-lib
- cairo
- ffmpeg
- gdk-pixbuf2
- glib2
- gtk2
- gtk3
- java-runtime-openjdk=8
- libavcodec.so
- libavformat.so
- libfreetype.so
- libgl
- libx11
- libxtst
- pango
- python2
- qt5-base
- ruby
- unzip
- webkit2gtk
- )
-
- cd rt-${pkgver//./}-ga
-
- install -dm 755 "${pkgdir}"/usr/lib/jvm/java-8-openjdk/jre
- cp -dr --no-preserve=ownership build/sdk/{bin,lib} "${pkgdir}"/usr/lib/jvm/java-8-openjdk/
- cp -dr --no-preserve=ownership build/sdk/rt/lib "${pkgdir}"/usr/lib/jvm/java-8-openjdk/jre/
-}
-
-package_java8-openjfx-doc() {
- cd rt-${pkgver//./}-ga
-
- install -dm 755 "${pkgdir}"/usr/share/doc
- cp -dr --no-preserve=ownership build/javadoc "${pkgdir}"/usr/share/doc/java8-openjfx
-}
-
-package_java8-openjfx-src() {
- cd rt-${pkgver//./}-ga
-
- install -Dm 644 build/javafx-src.zip -t "${pkgdir}"/usr/lib/jvm/java-8-openjdk/
-}
-
-# vim: ts=2 sw=2 et:
Copied: java8-openjfx/repos/staging-x86_64/PKGBUILD (from rev 354771, java8-openjfx/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-06-04 08:08:35 UTC (rev 354772)
@@ -0,0 +1,115 @@
+# Maintainer: Guillaume Alaux <guillaume at archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: William Gathoye <william + archlinux at gathoye dot be>
+# Contributor: Emanuel Couto <emanuel dot amaral dot couto at gmail dot com>
+# Contributor: Richard Jackson <rdjack21 at gmail dot com>
+# Contributor: Tinx <arch at tinx dot eu>
+# Contributor: Jens Kapitza <j dot kapitza at schwarze-allianz dot de>
+# Contributor: Olli <olli at coderkun dot de>
+
+pkgbase=java8-openjfx
+pkgname=(
+ java8-openjfx
+ java8-openjfx-doc
+ java8-openjfx-src
+)
+pkgver=8.u202
+pkgrel=3
+pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX)'
+arch=(x86_64)
+url=https://wiki.openjdk.java.net/display/OpenJFX/Main
+license=(GPL)
+makedepends=(
+ alsa-lib
+ cairo
+ cmake
+ ffmpeg
+ freetype2
+ gdk-pixbuf2
+ glib2
+ gperf
+ gtk2
+ gtk3
+ java-environment-openjdk=8
+ libgl
+ libx11
+ libxtst
+ pango
+ python2
+ qt5-base
+ ruby
+ unzip
+ webkit2gtk
+)
+source=(
+ https://hg.openjdk.java.net/openjfx/8u/rt/archive/${pkgver//./}-ga.tar.bz2
+ gradle.properties
+ https://services.gradle.org/distributions/gradle-4.8-bin.zip
+ java8-openjfx-flags.patch
+ java8-openjfx-no-xlocale.patch
+)
+sha256sums=('12b0538d04c4bd451e4692ee06357ac36233ff4ec2af9fa3b9bbdbab48c3f2fc'
+ '75335ac8ccae143ab4dbb81fc32c70d34d95baa360388f55bf2d237e8821ad97'
+ 'f3e29692a8faa94eb0b02ebf36fa263a642b3ae8694ef806c45c345b8683f1ba'
+ '867badaca506f130f918bdc620ae7ae5be8b176fcdfc91fef551b636d6390b19'
+ 'b21f6b254acc7aa2124521b6521d3bdfdfcfd9b062624a84ef73608120957d0d')
+
+prepare() {
+ cd rt-${pkgver//./}-ga
+
+ ln -sf ../gradle.properties .
+ patch -Np1 -i ../java8-openjfx-flags.patch
+ patch -Np1 -i ../java8-openjfx-no-xlocale.patch
+}
+
+build() {
+ cd rt-${pkgver//./}-ga
+
+ ../gradle-4.8/bin/gradle
+}
+
+package_java8-openjfx() {
+ depends=(
+ alsa-lib
+ cairo
+ ffmpeg
+ gdk-pixbuf2
+ glib2
+ gtk2
+ gtk3
+ java-runtime-openjdk=8
+ libavcodec.so
+ libavformat.so
+ libfreetype.so
+ libgl
+ libx11
+ libxtst
+ pango
+ python2
+ qt5-base
+ ruby
+ unzip
+ webkit2gtk
+ )
+
+ cd rt-${pkgver//./}-ga
+
+ install -dm 755 "${pkgdir}"/usr/lib/jvm/java-8-openjdk/jre
+ cp -dr --no-preserve=ownership build/sdk/{bin,lib} "${pkgdir}"/usr/lib/jvm/java-8-openjdk/
+ cp -dr --no-preserve=ownership build/sdk/rt/lib "${pkgdir}"/usr/lib/jvm/java-8-openjdk/jre/
+}
+
+package_java8-openjfx-doc() {
+ cd rt-${pkgver//./}-ga
+
+ install -dm 755 "${pkgdir}"/usr/share/doc
+ cp -dr --no-preserve=ownership build/javadoc "${pkgdir}"/usr/share/doc/java8-openjfx
+}
+
+package_java8-openjfx-src() {
+ cd rt-${pkgver//./}-ga
+
+ install -Dm 644 build/javafx-src.zip -t "${pkgdir}"/usr/lib/jvm/java-8-openjdk/
+}
+
+# vim: ts=2 sw=2 et:
Deleted: gradle.properties
===================================================================
--- gradle.properties 2019-06-04 08:08:26 UTC (rev 354771)
+++ gradle.properties 2019-06-04 08:08:35 UTC (rev 354772)
@@ -1,5 +0,0 @@
-BUILD_JAVADOC = true
-BUILD_SRC_ZIP = true
-COMPILE_MEDIA = true
-COMPILE_WEBKIT = true
-CONF = Release
Copied: java8-openjfx/repos/staging-x86_64/gradle.properties (from rev 354771, java8-openjfx/trunk/gradle.properties)
===================================================================
--- gradle.properties (rev 0)
+++ gradle.properties 2019-06-04 08:08:35 UTC (rev 354772)
@@ -0,0 +1,5 @@
+BUILD_JAVADOC = true
+BUILD_SRC_ZIP = true
+COMPILE_MEDIA = true
+COMPILE_WEBKIT = true
+CONF = Release
Deleted: java8-openjfx-flags.patch
===================================================================
--- java8-openjfx-flags.patch 2019-06-04 08:08:26 UTC (rev 354771)
+++ java8-openjfx-flags.patch 2019-06-04 08:08:35 UTC (rev 354772)
@@ -1,208 +0,0 @@
-diff -rupN rt-8u202-ga.orig/buildSrc/linux.gradle rt-8u202-ga/buildSrc/linux.gradle
---- rt-8u202-ga.orig/buildSrc/linux.gradle 2019-06-03 15:45:22.599465670 +0200
-+++ rt-8u202-ga/buildSrc/linux.gradle 2019-06-03 15:50:59.746039363 +0200
-@@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${n
- def commonFlags = [
- "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
- "-fstack-protector",
-+ "-Wno-error=cast-function-type",
- "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
-
-+commonFlags.addAll(System.getenv("CFLAGS").trim().split(" "))
-+
- if (!IS_64) {
- commonFlags += "-m32"
- }
-@@ -60,6 +63,9 @@ def ccFlagsGTK3 = ccFlags
- def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
- "-z", "relro",
- "-Wl,--gc-sections"].flatten()
-+
-+linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" "))
-+
- def defaultLinkFlags = linkFlags.flatten()
-
- def gtk2CCFlags = [ ];
-@@ -274,7 +280,7 @@ LINUX.iio.nativeSource = [
- LINUX.iio.compiler = compiler
- LINUX.iio.ccFlags = [ccFlags].flatten()
- LINUX.iio.linker = linker
--LINUX.iio.linkFlags = [linkFlags].flatten()
-+LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
- LINUX.iio.lib = "javafx_iio"
-
- LINUX.prismES2 = [:]
-diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
---- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile 2019-06-03 15:45:28.772858454 +0200
-+++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile 2019-06-03 15:52:15.503480874 +0200
-@@ -22,7 +22,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
- OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
- endif
-
--CFLAGS = -fPIC \
-+CFLAGS := -fPIC \
- -Wformat \
- -Wextra \
- -Wformat-security \
-@@ -35,13 +35,8 @@ CFLAGS = -fPIC \
- -DGST_DISABLE_LOADSAVE \
- -DGSTREAMER_LITE \
- -DG_DISABLE_DEPRECATED \
-- -ffunction-sections -fdata-sections
--
--ifeq ($(BUILD_TYPE), Release)
-- CFLAGS += -Os
--else
-- CFLAGS += -g -Wall
--endif
-+ -ffunction-sections -fdata-sections \
-+ ${CFLAGS}
-
- INCLUDES= -I../../../plugins \
- -I../../../plugins/av \
-@@ -51,11 +46,12 @@ INCLUDES= -I../../../plugins
- -I$(GLIB_DIR)/glib \
- -I$(GLIB_DIR)/gmodule
-
--LDFLAGS = -L$(BUILD_DIR) \
-+LDFLAGS := -L$(BUILD_DIR) \
- -z relro \
- -lgstreamer-lite \
- -lglib-lite \
-- -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 rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
---- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile 2019-06-03 15:45:28.772858454 +0200
-+++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile 2019-06-03 15:53:26.784252777 +0200
-@@ -19,7 +19,7 @@ DIRLIST = progressbuffer \
-
- TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-
--CFLAGS = -fPIC \
-+CFLAGS := -fPIC \
- -Wformat \
- -Wextra \
- -Wformat-security \
-@@ -36,14 +36,8 @@ CFLAGS = -fPIC \
- -DGST_DISABLE_GST_DEBUG \
- -DGSTREAMER_LITE \
- -DG_DISABLE_DEPRECATED \
-- -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)) \
-@@ -53,9 +47,10 @@ INCLUDES = -I$(SRCBASE_DIR) \
- -I$(GLIB_DIR)/glib \
- -I$(GLIB_DIR)/gmodule
-
--LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
-+LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
- -z relro \
-- -static-libgcc -static-libstdc++ -Wl,--gc-sections
-+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
-+ ${LDFLAGS}
-
- ifeq ($(ARCH), x32)
- CFLAGS += -m32
-diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
---- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2019-06-03 15:45:28.772858454 +0200
-+++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2019-06-03 15:55:03.568631974 +0200
-@@ -41,7 +41,7 @@ DIRLIST = gstreamer/gst \
-
- TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-
--CFLAGS =-fPIC \
-+CFLAGS :=-fPIC \
- -Wformat \
- -Wextra \
- -Wformat-security \
-@@ -56,13 +56,8 @@ CFLAGS =-fPIC \
- -DGST_DISABLE_GST_DEBUG \
- -DGST_DISABLE_LOADSAVE \
- -DG_DISABLE_DEPRECATED \
-- -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 \
-@@ -83,9 +78,10 @@ INCLUDES = -I$(BASE_DIR)/plugins
- PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa)
- PACKAGES_LIBS := $(shell pkg-config --libs alsa)
-
--LDFLAGS = -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \
-+LDFLAGS := -L$(BUILD_DIR) -lm -lglib-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 rt-8u202-ga.orig/modules/media/src/main/native/jfxmedia/projects/linux/Makefile rt-8u202-ga/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
---- rt-8u202-ga.orig/modules/media/src/main/native/jfxmedia/projects/linux/Makefile 2019-06-03 15:45:28.819525570 +0200
-+++ rt-8u202-ga/modules/media/src/main/native/jfxmedia/projects/linux/Makefile 2019-06-03 15:57:02.209910725 +0200
-@@ -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 \
-@@ -27,7 +27,8 @@ CFLAGS = -DTARGET_OS_LINUX=1 \
- -DJFXMEDIA_JNI_EXPORTS \
- -DLINUX \
- -DG_DISABLE_DEPRECATED \
-- -ffunction-sections -fdata-sections
-+ -ffunction-sections -fdata-sections \
-+ ${CFLAGS}
-
- CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
-
-@@ -57,21 +58,16 @@ ifdef HOST_COMPILE
- -I$(GLIB_LITE_DIR)/glib \
- -I$(GLIB_LITE_DIR)/gmodule
-
-- LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
-+LDFLAGS := -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
- -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: java8-openjfx/repos/staging-x86_64/java8-openjfx-flags.patch (from rev 354771, java8-openjfx/trunk/java8-openjfx-flags.patch)
===================================================================
--- java8-openjfx-flags.patch (rev 0)
+++ java8-openjfx-flags.patch 2019-06-04 08:08:35 UTC (rev 354772)
@@ -0,0 +1,234 @@
+diff -rupN rt-8u202-ga.orig/buildSrc/linux.gradle rt-8u202-ga/buildSrc/linux.gradle
+--- rt-8u202-ga.orig/buildSrc/linux.gradle 2019-06-03 15:45:22.599465670 +0200
++++ rt-8u202-ga/buildSrc/linux.gradle 2019-06-03 15:50:59.746039363 +0200
+@@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${n
+ def commonFlags = [
+ "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
+ "-fstack-protector",
++ "-Wno-error=cast-function-type",
+ "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
+
++commonFlags.addAll(System.getenv("CFLAGS").trim().split(" "))
++
+ if (!IS_64) {
+ commonFlags += "-m32"
+ }
+@@ -60,6 +63,9 @@ def ccFlagsGTK3 = ccFlags
+ def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
+ "-z", "relro",
+ "-Wl,--gc-sections"].flatten()
++
++linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" "))
++
+ def defaultLinkFlags = linkFlags.flatten()
+
+ def gtk2CCFlags = [ ];
+@@ -274,7 +280,7 @@ LINUX.iio.nativeSource = [
+ LINUX.iio.compiler = compiler
+ LINUX.iio.ccFlags = [ccFlags].flatten()
+ LINUX.iio.linker = linker
+-LINUX.iio.linkFlags = [linkFlags].flatten()
++LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
+ LINUX.iio.lib = "javafx_iio"
+
+ LINUX.prismES2 = [:]
+diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+--- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile 2019-06-03 15:45:28.772858454 +0200
++++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile 2019-06-03 15:52:15.503480874 +0200
+@@ -22,7 +22,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+ OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
+ endif
+
+-CFLAGS = -fPIC \
++CFLAGS := -fPIC \
+ -Wformat \
+ -Wextra \
+ -Wformat-security \
+@@ -35,13 +35,8 @@ CFLAGS = -fPIC \
+ -DGST_DISABLE_LOADSAVE \
+ -DGSTREAMER_LITE \
+ -DG_DISABLE_DEPRECATED \
+- -ffunction-sections -fdata-sections
+-
+-ifeq ($(BUILD_TYPE), Release)
+- CFLAGS += -Os
+-else
+- CFLAGS += -g -Wall
+-endif
++ -ffunction-sections -fdata-sections \
++ ${CFLAGS}
+
+ INCLUDES= -I../../../plugins \
+ -I../../../plugins/av \
+@@ -51,11 +46,12 @@ INCLUDES= -I../../../plugins
+ -I$(GLIB_DIR)/glib \
+ -I$(GLIB_DIR)/gmodule
+
+-LDFLAGS = -L$(BUILD_DIR) \
++LDFLAGS := -L$(BUILD_DIR) \
+ -z relro \
+ -lgstreamer-lite \
+ -lglib-lite \
+- -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 rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+--- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile 2019-06-03 15:45:28.772858454 +0200
++++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile 2019-06-03 15:53:26.784252777 +0200
+@@ -19,7 +19,7 @@ DIRLIST = progressbuffer \
+
+ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+
+-CFLAGS = -fPIC \
++CFLAGS := -fPIC \
+ -Wformat \
+ -Wextra \
+ -Wformat-security \
+@@ -36,14 +36,8 @@ CFLAGS = -fPIC \
+ -DGST_DISABLE_GST_DEBUG \
+ -DGSTREAMER_LITE \
+ -DG_DISABLE_DEPRECATED \
+- -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)) \
+@@ -53,9 +47,10 @@ INCLUDES = -I$(SRCBASE_DIR) \
+ -I$(GLIB_DIR)/glib \
+ -I$(GLIB_DIR)/gmodule
+
+-LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
++LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
+ -z relro \
+- -static-libgcc -static-libstdc++ -Wl,--gc-sections
++ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
++ ${LDFLAGS}
+
+ ifeq ($(ARCH), x32)
+ CFLAGS += -m32
+diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+--- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2019-06-03 15:45:28.772858454 +0200
++++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2019-06-03 15:55:03.568631974 +0200
+@@ -41,7 +41,7 @@ DIRLIST = gstreamer/gst \
+
+ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
+
+-CFLAGS =-fPIC \
++CFLAGS :=-fPIC \
+ -Wformat \
+ -Wextra \
+ -Wformat-security \
+@@ -56,13 +56,8 @@ CFLAGS =-fPIC \
+ -DGST_DISABLE_GST_DEBUG \
+ -DGST_DISABLE_LOADSAVE \
+ -DG_DISABLE_DEPRECATED \
+- -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 \
+@@ -83,9 +78,10 @@ INCLUDES = -I$(BASE_DIR)/plugins
+ PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa)
+ PACKAGES_LIBS := $(shell pkg-config --libs alsa)
+
+-LDFLAGS = -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \
++LDFLAGS := -L$(BUILD_DIR) -lm -lglib-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 rt-8u202-ga.orig/modules/media/src/main/native/jfxmedia/projects/linux/Makefile rt-8u202-ga/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
+--- rt-8u202-ga.orig/modules/media/src/main/native/jfxmedia/projects/linux/Makefile 2019-06-03 15:45:28.819525570 +0200
++++ rt-8u202-ga/modules/media/src/main/native/jfxmedia/projects/linux/Makefile 2019-06-03 15:57:02.209910725 +0200
+@@ -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 \
+@@ -27,7 +27,8 @@ CFLAGS = -DTARGET_OS_LINUX=1 \
+ -DJFXMEDIA_JNI_EXPORTS \
+ -DLINUX \
+ -DG_DISABLE_DEPRECATED \
+- -ffunction-sections -fdata-sections
++ -ffunction-sections -fdata-sections \
++ ${CFLAGS}
+
+ CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
+
+@@ -57,21 +58,16 @@ ifdef HOST_COMPILE
+ -I$(GLIB_LITE_DIR)/glib \
+ -I$(GLIB_LITE_DIR)/gmodule
+
+- LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
++LDFLAGS := -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
+ -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
+--- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile 2019-06-04 07:44:53.882738260 +0000
++++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile 2019-06-04 07:47:36.024744987 +0000
+@@ -40,20 +40,15 @@ CFLAGS += -fPIC \
+ -DMATCH_LIMIT=10000000 \
+ -DMATCH_LIMIT_RECURSION=10000000
+
+-ifeq ($(BUILD_TYPE), Release)
+- CFLAGS += -Os
+-else
+- CFLAGS += -g -Wall
+-endif
+-
+ INCLUDES = -I$(SRCBASE_DIR) \
+ -I$(SRCBASE_DIR)/glib \
+ -I$(SRCBASE_DIR)/build/linux \
+ -I$(LIBFFI_DIR)/include
+
+-LDFLAGS = -L$(BUILD_DIR) -lffi \
++LDFLAGS := -L$(BUILD_DIR) -lffi \
+ -z relro \
+- -static-libgcc -static-libstdc++ -Wl,--gc-sections
++ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
++ ${LDFLAGS}
+
+ ifeq ($(ARCH), x32)
+ CFLAGS += -m32
+
Deleted: java8-openjfx-no-xlocale.patch
===================================================================
--- java8-openjfx-no-xlocale.patch 2019-06-04 08:08:26 UTC (rev 354771)
+++ java8-openjfx-no-xlocale.patch 2019-06-04 08:08:35 UTC (rev 354772)
@@ -1,29 +0,0 @@
-diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c rt-8u202-ga/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c
---- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c 2019-06-03 14:24:26.400583977 +0200
-+++ rt-8u202-ga/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c 2019-06-03 14:25:04.844259624 +0200
-@@ -37,11 +37,6 @@
- #include <errno.h>
- #include <ctype.h> /* For tolower() */
-
--#ifdef HAVE_XLOCALE_H
--/* Needed on BSD/OS X for e.g. strtod_l */
--#include <xlocale.h>
--#endif
--
- #ifdef G_OS_WIN32
- #include <windows.h>
- #endif
-
---- rt-8u202-ga.orig/modules/web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h
-+++ rt-8u202-ga/modules/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: java8-openjfx/repos/staging-x86_64/java8-openjfx-no-xlocale.patch (from rev 354771, java8-openjfx/trunk/java8-openjfx-no-xlocale.patch)
===================================================================
--- java8-openjfx-no-xlocale.patch (rev 0)
+++ java8-openjfx-no-xlocale.patch 2019-06-04 08:08:35 UTC (rev 354772)
@@ -0,0 +1,29 @@
+diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c rt-8u202-ga/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c
+--- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c 2019-06-03 14:24:26.400583977 +0200
++++ rt-8u202-ga/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c 2019-06-03 14:25:04.844259624 +0200
+@@ -37,11 +37,6 @@
+ #include <errno.h>
+ #include <ctype.h> /* For tolower() */
+
+-#ifdef HAVE_XLOCALE_H
+-/* Needed on BSD/OS X for e.g. strtod_l */
+-#include <xlocale.h>
+-#endif
+-
+ #ifdef G_OS_WIN32
+ #include <windows.h>
+ #endif
+
+--- rt-8u202-ga.orig/modules/web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h
++++ rt-8u202-ga/modules/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;
+
More information about the arch-commits
mailing list