tag 1013009 + pending
tag 1004638 + pending
thanks
On Sun, Oct 16, 2022 at 03:53:13PM +0200, Philipp Kern wrote:
> I think it's still worthwhile to upload this build.
While arm64/armhf remains unfixed (and could have its own t-p-u upload
based on the +0 version plus Ubuntu's patch), there's also a question if
a newer version would actually fix the issue.
I talked to Sebastian on IRC and we agreed that I'd upload the Ubuntu
patch for now. It doesn't make anything worse and will allow building
on amd64 again.
nmudiff attached.
Kind regards
Philipp Kern
diff -Nru openjfx-11.0.11+1/debian/changelog openjfx-11.0.11+1/debian/changelog
--- openjfx-11.0.11+1/debian/changelog 2022-05-03 16:48:31.000000000 +0200
+++ openjfx-11.0.11+1/debian/changelog 2022-10-16 12:19:38.000000000 +0200
@@ -1,3 +1,14 @@
+openjfx (11.0.11+1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop build-dependency on ffmpeg, openjfx isn't source-compatible with
+ ffmpeg 5.0. Closes: #1004638.
+ * Build-depend on g++-11, source not compatible with g++ 12.
+ Closes: #1013009.
+ (Both patches taken from Ubuntu, thanks to Steve Langasek)
+
+ -- Philipp Kern <pk...@debian.org> Sun, 16 Oct 2022 12:19:38 +0200
+
openjfx (11.0.11+1-1) unstable; urgency=medium
* New upstream release
diff -Nru openjfx-11.0.11+1/debian/control openjfx-11.0.11+1/debian/control
--- openjfx-11.0.11+1/debian/control 2022-05-03 15:33:58.000000000 +0200
+++ openjfx-11.0.11+1/debian/control 2022-10-16 12:19:38.000000000 +0200
@@ -10,13 +10,12 @@
default-jdk,
default-jdk-doc,
flex,
+ g++-11,
gperf,
gradle (>= 4.4),
gradle-debian-helper (>= 2.0),
junit4,
libasound2-dev,
- libavcodec-dev,
- libavformat-dev,
libgl1-mesa-dev,
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
diff -Nru openjfx-11.0.11+1/debian/patches/disable-ffmpeg.patch
openjfx-11.0.11+1/debian/patches/disable-ffmpeg.patch
--- openjfx-11.0.11+1/debian/patches/disable-ffmpeg.patch 1970-01-01
01:00:00.000000000 +0100
+++ openjfx-11.0.11+1/debian/patches/disable-ffmpeg.patch 2022-10-16
12:19:38.000000000 +0200
@@ -0,0 +1,24 @@
+Description: Don't build ffmpeg plugin when ffmpeg is disabled
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Last-Update: 2022-09-21
+Bug-Debian: https://bugs.debian.org/1004638
+
+Index: openjfx-11.0.11+1/build.gradle
+===================================================================
+--- openjfx-11.0.11+1.orig/build.gradle
++++ openjfx-11.0.11+1/build.gradle
+@@ -3715,14 +3715,6 @@ project(":media") {
+ }
+ }
+ }
+- } else {
+- // Building fxavcodec plugin (libav plugin)
+- exec {
+- commandLine ("make", "${makeJobsFlag}", "-C",
"${nativeSrcDir}/gstreamer/projects/linux/avplugin")
+- args("CC=${mediaProperties.compiler}",
"LINKER=${mediaProperties.linker}",
+- "OUTPUT_DIR=${nativeOutputDir}",
"BUILD_TYPE=${buildType}",
+- "BASE_NAME=avplugin", IS_64 ? "ARCH=x64"
: "ARCH=x32")
+- }
+ }
+ }
+ }
diff -Nru openjfx-11.0.11+1/debian/patches/series
openjfx-11.0.11+1/debian/patches/series
--- openjfx-11.0.11+1/debian/patches/series 2022-05-03 15:27:46.000000000
+0200
+++ openjfx-11.0.11+1/debian/patches/series 2022-10-16 12:19:38.000000000
+0200
@@ -18,3 +18,4 @@
no-error_deprecated-declarations.patch
32-gradle-compatibility.patch
36-disable-swt-on-32bit-arch.patch
+disable-ffmpeg.patch
diff -Nru openjfx-11.0.11+1/debian/rules openjfx-11.0.11+1/debian/rules
--- openjfx-11.0.11+1/debian/rules 2022-05-03 15:27:46.000000000 +0200
+++ openjfx-11.0.11+1/debian/rules 2022-10-16 12:19:38.000000000 +0200
@@ -3,6 +3,8 @@
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export CXX=g++-11
+
# FIXME: looks like s390x is recognized as a 32bit arch ...
# more heap on s390x needed
ifneq (,$(filter $(DEB_HOST_ARCH), s390x))
