[Git][java-team/openjfx][master] Import Debian changes 11.0.11+1-1.1

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / openjfx


Commits:
39346488 by Philipp Kern at 2022-10-20T00:29:09+02:00
Import Debian changes 11.0.11+1-1.1

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)

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/disable-ffmpeg.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -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 <pkern at debian.org>  Sun, 16 Oct 2022 12:19:38 +0200
+
 openjfx (11.0.11+1-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/control
=====================================
@@ -10,13 +10,12 @@ Build-Depends: antlr4,
                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,


=====================================
debian/patches/disable-ffmpeg.patch
=====================================
@@ -0,0 +1,24 @@
+Description: Don't build ffmpeg plugin when ffmpeg is disabled
+Author: Steve Langasek <steve.langasek at 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")
+-                            }
+                         }
+                     }
+                 }


=====================================
debian/patches/series
=====================================
@@ -18,3 +18,4 @@ disable-jit-for-non-x86.patch
 no-error_deprecated-declarations.patch
 32-gradle-compatibility.patch
 36-disable-swt-on-32bit-arch.patch
+disable-ffmpeg.patch


=====================================
debian/rules
=====================================
@@ -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))



View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/commit/39346488957b4f100c23836cb9618c981be7703e

-- 
View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/commit/39346488957b4f100c23836cb9618c981be7703e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20221019/a094ede3/attachment.htm>