openjfx-21: rebuild for ffmpeg

androidnisse · androidnisse · commit 05e311e5db33 · 2026-04-25T08:02:53.000+02:00
**Summary**
diff --git a/packages/o/openjfx-21/abi_used_libs b/packages/o/openjfx-21/abi_used_libs
@@ -4,8 +4,8 @@ libGL.so.1
 libX11.so.6
 libXtst.so.6
 libasound.so.2
-libavcodec.so.61
-libavformat.so.61
+libavcodec.so.62
+libavformat.so.62
 libc.so.6
 libcairo.so.2
 libfreetype.so.6
diff --git a/packages/o/openjfx-21/abi_used_symbols b/packages/o/openjfx-21/abi_used_symbols
@@ -146,23 +146,23 @@ libasound.so.2:snd_pcm_sw_params_set_start_threshold
 libasound.so.2:snd_pcm_wait
 libasound.so.2:snd_pcm_writei
 libasound.so.2:snd_strerror
-libavcodec.so.61:av_init_packet
-libavcodec.so.61:av_new_packet
-libavcodec.so.61:av_packet_unref
-libavcodec.so.61:avcodec_alloc_context3
-libavcodec.so.61:avcodec_close
-libavcodec.so.61:avcodec_find_decoder
-libavcodec.so.61:avcodec_flush_buffers
-libavcodec.so.61:avcodec_open2
-libavcodec.so.61:avcodec_receive_frame
-libavcodec.so.61:avcodec_send_packet
-libavformat.so.61:av_find_input_format
-libavformat.so.61:av_read_frame
-libavformat.so.61:avformat_alloc_context
-libavformat.so.61:avformat_find_stream_info
-libavformat.so.61:avformat_free_context
-libavformat.so.61:avformat_open_input
-libavformat.so.61:avio_alloc_context
+libavcodec.so.62:av_init_packet
+libavcodec.so.62:av_new_packet
+libavcodec.so.62:av_packet_unref
+libavcodec.so.62:avcodec_alloc_context3
+libavcodec.so.62:avcodec_find_decoder
+libavcodec.so.62:avcodec_flush_buffers
+libavcodec.so.62:avcodec_free_context
+libavcodec.so.62:avcodec_open2
+libavcodec.so.62:avcodec_receive_frame
+libavcodec.so.62:avcodec_send_packet
+libavformat.so.62:av_find_input_format
+libavformat.so.62:av_read_frame
+libavformat.so.62:avformat_alloc_context
+libavformat.so.62:avformat_find_stream_info
+libavformat.so.62:avformat_free_context
+libavformat.so.62:avformat_open_input
+libavformat.so.62:avio_alloc_context
 libc.so.6:__ctype_b_loc
 libc.so.6:__ctype_get_mb_cur_max
 libc.so.6:__ctype_toupper_loc
diff --git a/packages/o/openjfx-21/files/0001-8378510-Provide-media-support-for-libavcodec-version.patch b/packages/o/openjfx-21/files/0001-8378510-Provide-media-support-for-libavcodec-version.patch
@@ -1,110 +1,117 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alexander Matveev <almatvee@openjdk.org>
-Date: Tue, 3 Sep 2024 20:13:30 +0000
-Subject: [PATCH] 8338701: Provide media support for libavcodec version 61
+From 1d2bf739f975ca265455cf93e300b7c69f940127 Mon Sep 17 00:00:00 2001
+From: Jakob Gezelius <jakob@knugen.nu>
+Date: Sun, 19 Apr 2026 09:00:46 +0200
+Subject: [PATCH] 8378510: Provide media support for libavcodec version 62
 
-Reviewed-by: sykora, arapte
 ---
- build.gradle                                  |  7 ++--
- gradle/verification-metadata.xml              |  5 +++
- .../jfxmediaimpl/NativeMediaManager.java      |  3 +-
+ build.gradle                                  |  8 ++--
+ gradle/verification-metadata.xml              | 10 +++++
+ .../jfxmediaimpl/NativeMediaManager.java      |  4 +-
  .../gstreamer/gst/gstregistry.c               |  2 +-
- .../native/gstreamer/plugins/av/avdefines.h   | 10 ++++-
+ .../native/gstreamer/plugins/av/avdefines.h   | 15 ++++++-
+ .../native/gstreamer/plugins/av/decoder.c     |  7 +++-
  .../gstreamer/plugins/av/videodecoder.c       | 40 ++++++++++++++++---
- 6 files changed, 56 insertions(+), 11 deletions(-)
+ 7 files changed, 74 insertions(+), 12 deletions(-)
 
 diff --git a/build.gradle b/build.gradle
-index f9dbc53076..77856226a6 100644
+index f9dbc53076..361dbac1ff 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -2946,6 +2946,7 @@ project(":media") {
+@@ -2946,6 +2946,8 @@ project(":media") {
              media name: "ffmpeg-4.0.2", ext: "tar.gz"
              media name: "ffmpeg-5.1.2", ext: "tar.gz"
              media name: "ffmpeg-6.0", ext: "tar.gz"
 +            media name: "ffmpeg-7.0.2", ext: "tar.gz"
++            media name: "ffmpeg-8.1", ext: "tar.gz"
          }
          implementation project(":base")
          implementation project(":graphics")
-@@ -3292,8 +3293,8 @@ project(":media") {
+@@ -3292,8 +3294,8 @@ project(":media") {
                      doLast {
                          project.ext.libav = [:]
                          project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg"
 -                        project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ]
 -                        project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ]
-+                        project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ]
-+                        project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ]
++                        project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2", "8.1" ]
++                        project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61", "8.1" : "62" ]
  
                          libav.versions.each { version ->
                              def libavDir = "${libav.basedir}/ffmpeg-${version}"
-@@ -3373,7 +3374,7 @@ project(":media") {
+@@ -3373,7 +3375,7 @@ project(":media") {
                              project.ext.libav.libavffmpeg.versions = [ "56" ]
                              project.ext.libav.ffmpeg = [:]
                              project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg"
 -                            project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ]
-+                            project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ]
++                            project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61", "62" ]
  
                              project.ext.libav.versions.each { version ->
                                  def libavDir = "${project.ext.libav.basedir}-${version}"
 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
-index 887b9d100c..a10610b0f5 100644
+index 887b9d100c..80ebc6219b 100644
 --- a/gradle/verification-metadata.xml
 +++ b/gradle/verification-metadata.xml
-@@ -28,6 +28,11 @@
+@@ -28,6 +28,16 @@
              <sha256 value="f4ccf961403752c93961927715f524576d1f4dd02cd76d8c76aed3bbe6686656" origin="Generated by Gradle"/>
           </artifact>
        </component>
 +      <component group="" name="ffmpeg-7.0.2" version="">
 +         <artifact name="ffmpeg-7.0.2-.tar.gz">
 +            <sha256 value="1233b3a93dd7517cc3c56b72a67f64041c044848d981e3deff4bebffa25f1054" origin="Generated by Gradle"/>
 +         </artifact>
++      </component>
++      <component group="" name="ffmpeg-8.1" version="">
++         <artifact name="ffmpeg-8.1-.tar.gz">
++            <sha256 value="b13510e7a6a4ca28fa04307f2be54ef5a31e168eb2bbe055a7f4e4d2cadd51b1" origin="Generated by Gradle"/>
++         </artifact>
 +      </component>
        <component group="" name="icu4c-73_1-data-bin-l" version="">
           <artifact name="icu4c-73_1-data-bin-l-.zip">
              <sha256 value="4038298ee02a0c38917185ef8ff4ebde9c8b552c777fd03e4df6c6b4b1825e20" origin="Generated by Gradle"/>
 diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
-index 097004bd17..0c2ae1ddbc 100644
+index 097004bd17..7916e2660e 100644
 --- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
 +++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
 @@ -1,5 +1,5 @@
  /*
 - * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 2026, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
-@@ -127,6 +127,7 @@ public class NativeMediaManager {
+@@ -127,6 +127,8 @@ public class NativeMediaManager {
                      dependencies.add("avplugin-ffmpeg-58");
                      dependencies.add("avplugin-ffmpeg-59");
                      dependencies.add("avplugin-ffmpeg-60");
 +                    dependencies.add("avplugin-ffmpeg-61");
++                    dependencies.add("avplugin-ffmpeg-62");
                  }
                  if (PlatformUtil.isMac()) {
                      dependencies.add("fxplugins");
 diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
-index 22c8be9300..38bae197fe 100644
+index 22c8be9300..d4aafec26b 100644
 --- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
 +++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
 @@ -146,7 +146,7 @@ static const int AVCODEC_LIBAV_EXPLICIT_VERSIONS[] = { 54, 56 };
  // For ffmpeg (libavcodec-ffmpeg.so)
  static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 };
  // For libav or ffmpeg (libavcodec.so)
 -static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 };
-+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 };
++static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61, 62 };
  
  /*
   * Callback passed to dl_iterate_phdr(): finds the path of
 diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
-index 60fa7b631c..f49ad56e1e 100644
+index 60fa7b631c..bf7e57e0e2 100644
 --- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
 +++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
 @@ -1,5 +1,5 @@
  /*
 - * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 2026, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
-@@ -53,5 +53,13 @@
+@@ -53,5 +53,18 @@
  // Not required since 58 and removed in 59
  #define NO_REGISTER_ALL        (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0))
  
@@ -115,9 +122,39 @@ index 60fa7b631c..f49ad56e1e 100644
 +// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same
 +// except frame_num is 64-bit and frame_number is 32-bit. Since 61.
 +#define USE_FRAME_NUM          (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0))
++
++// avcodec_close() is removed in 62 and avcodec_free_context() should be used
++// instead. Note: avcodec_free_context() will free pointer as well, so no need to
++// call av_free().
++#define USE_FREE_CONTEXT       (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(62,0,0))
 +
  #endif  /* AVDEFINES_H */
  
+diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/decoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/decoder.c
+index 954e520950..8142eb9375 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/decoder.c
++++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/decoder.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 2026, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -187,8 +187,13 @@ void basedecoder_close_decoder(BaseDecoder *decoder)
+ {
+     if (decoder->context)
+     {
++#if USE_FREE_CONTEXT
++        // avcodec_free_context() will set pointer to NULL
++        avcodec_free_context(&decoder->context);
++#else
+         avcodec_close(decoder->context);
+         av_free(decoder->context);
++#endif
+     }
+     decoder->context = NULL;
+ 
 diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
 index c9fa787e63..8a5cd78f2d 100644
 --- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
@@ -222,3 +259,6 @@ index c9fa787e63..8a5cd78f2d 100644
                      GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same
                  }
  
+-- 
+2.53.0
+
diff --git a/packages/o/openjfx-21/package.yml b/packages/o/openjfx-21/package.yml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json
 name       : openjfx-21
 version    : 21.0.5
-release    : 3
+release    : 4
 source     :
     - https://github.com/openjdk/jfx21u/archive/refs/tags/21.0.5+0.tar.gz : 5766291a589fb7a5334b266016f5b47a6fe35b71c39346896385ecd449cd0274
 license    : GPL-2.0-only WITH Classpath-exception-2.0
@@ -35,7 +35,7 @@ setup      : |
     %patch -p1 -i $pkgfiles/0001-8323078-Incorrect-length-argument-to-g_utf8_strlen-i.patch
     %patch -p1 -i $pkgfiles/0001-8323077-C-type-error-incompatible-function-pointer-i.patch
     %patch -p1 -i $pkgfiles/0001-ftbfs-jfx11u-llvm-17.patch
-    %patch -p1 -i $pkgfiles/0001-8338701-Provide-media-support-for-libavcodec-version.patch
+    %patch -p1 -i $pkgfiles/0001-8378510-Provide-media-support-for-libavcodec-version.patch
 
     if [[ " ${PATH[*]} " =~ "ccache" ]]; then
         ccache --zero-stats
diff --git a/packages/o/openjfx-21/pspec_x86_64.xml b/packages/o/openjfx-21/pspec_x86_64.xml
@@ -54,8 +54,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="3">
-            <Date>2026-04-17</Date>
+        <Update release="4">
+            <Date>2026-04-19</Date>
             <Version>21.0.5</Version>
             <Comment>Packaging update</Comment>
             <Name>Jakob Gezelius</Name>
