[arch-commits] Commit in java11-openjfx/trunk (2 files)

[Maxime Gauduin]

    Date: Monday, September 21, 2020 @ 10:09:32
  Author: alucryd
Revision: 396382

upgpkg: java11-openjfx 11.0.8.u2-1

Added:
  java11-openjfx/trunk/java11-openjfx-gstreamer-lite-gcc10-compat.patch
Modified:
  java11-openjfx/trunk/PKGBUILD

--------------------------------------------------+
 PKGBUILD                                         |   59 +++++++++------------
 java11-openjfx-gstreamer-lite-gcc10-compat.patch |   11 +++
 2 files changed, 37 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-21 09:24:01 UTC (rev 396381)
+++ PKGBUILD	2020-09-21 10:09:32 UTC (rev 396382)
@@ -1,11 +1,11 @@
-# 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>
+# Contributor: Guillaume Alaux <guillaume at archlinux.org>
+# Contributor: William Gathoye <william+archlinux at gathoye.be>
+# Contributor: Emanuel Couto <emanuel.amaral.couto at gmail.com>
+# Contributor: Richard Jackson <rdjack21 at gmail.com>
+# Contributor: Tinx <arch at tinx.eu>
+# Contributor: Jens Kapitza <j.kapitza at schwarze-allianz.de>
+# Contributor: Olli <olli at coderkun.de>
 
 pkgbase=java11-openjfx
 pkgname=(
@@ -13,8 +13,8 @@
   java11-openjfx-doc
   java11-openjfx-src
 )
-pkgver=11.0.3.u1
-pkgrel=2
+pkgver=11.0.8.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
@@ -36,8 +36,7 @@
   libx11
   libxtst
   pango
-  python2
-  qt5-base
+  python
   ruby
   unzip
   webkit2gtk
@@ -44,17 +43,19 @@
   zip
 )
 source=(
-  https://hg.openjdk.java.net/openjfx/11/rt/archive/${pkgver//.u/+}.tar.bz2
+  https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/${pkgver//.u/+}.tar.bz2
   gradle.properties
   https://services.gradle.org/distributions/gradle-4.8-bin.zip
   java11-openjfx-flags.patch
   java11-openjfx-no-xlocale.patch
+  java11-openjfx-gstreamer-lite-gcc10-compat.patch
 )
-sha256sums=('c4a42e9f7ac94ca3b05b363375f782bc79be9446bee23eb94e6175a97b5262ae'
-            '2622aa35d733cc69f4421f1cd053bf425e89f93141cb52c9f016a9b425fc0cb6'
-            'f3e29692a8faa94eb0b02ebf36fa263a642b3ae8694ef806c45c345b8683f1ba'
-            '62d7356654b541a9f868cc7beb185e64a1375d9a734b906ba00eacbee258d16e'
-            '220c63396561867a6d07ae81b6390160d8f91502587e4873998e3b7a83793a1c')
+b2sums=('045dcfa35c52fe6f293713420147dd1a69b1851c8e1a1d09f0be1e0237d510e8d7b67d8c0ad36bcf23e1504a540c905a95c706faf0919da4de5005f3046e6cce'
+        'a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498'
+        'eb6592afe122690f5e013abec2821beabac070563556ceec67ce02506582d4d9ac9c5d9f97ad2c464e442446f26ff90e9ead2c04e462a564411259564e3332c6'
+        'b4455f5580a9b310e013c0d58ba39a3d9ebe15e7ed30e75a954c1f6ba36107f1c1a5b6bbc88e5a0e0d21f21d275214ad66ed012088f8fbbf81a6384127c8edfe'
+        '13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e'
+        '119fa1cc5da2cdefa22bbe9b6f76581faa74e05fa7b6e5576470fc0251c6e257f122fbba03754cc01f7c7251145cfa1cab4ffc2f9d59ff0c175a121e943a0f64')
 
 prepare() {
   cd rt-${pkgver//.u/+}
@@ -62,6 +63,7 @@
   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() {
@@ -72,27 +74,18 @@
 
 package_java11-openjfx() {
   depends=(
-    alsa-lib
-    cairo
-    ffmpeg
-    gdk-pixbuf2
-    glib2
-    gtk2
-    gtk3
     java-runtime-openjdk=11
-    libavcodec.so
-    libavformat.so
-    libfreetype.so
     libgl
     libx11
     libxtst
-    pango
-    python2
-    qt5-base
-    ruby
-    unzip
-    webkit2gtk
   )
+  optdepends=(
+    'ffmpeg: Media support',
+    'gtk2: GTK2 support',
+    'gtk3: GTK3 support',
+    'webkit2gtk: Web support'
+  )
+  provides=('java-openjfx=11')
 
   cd rt-${pkgver//.u/+}
 

Added: java11-openjfx-gstreamer-lite-gcc10-compat.patch
===================================================================
--- java11-openjfx-gstreamer-lite-gcc10-compat.patch	                        (rev 0)
+++ java11-openjfx-gstreamer-lite-gcc10-compat.patch	2020-09-21 10:09:32 UTC (rev 396382)
@@ -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                          \