Unverified Commit b34e8e9c authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

openjfx22: 22.0.1-ga -> 22.0.2-ga; openjfx{11,17,21,22}: add upstream patch for FFmpeg 7 (#339357)

parents 6df58ccb 19d7a635

pkgs/development/compilers/openjdk/openjfx/11/default.nix

+3 −2
Original line number Diff line number Diff line 
{ stdenv, lib, pkgs, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake

, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_6-headless, python3, ruby

, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_7-headless, python3, ruby

, openjdk11-bootstrap

, withMedia ? true

, withWebKit ? false
@@ -27,9 +27,10 @@ in stdenv.mkDerivation { 


  patches = [

    ../backport-ffmpeg-6-support-jfx11.patch

    ../backport-ffmpeg-7-support-jfx11.patch

  ];



  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6-headless ];

  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ];

  nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];



  dontUseCmakeConfigure = true;

pkgs/development/compilers/openjdk/openjfx/17/default.nix

+3 −2
Original line number Diff line number Diff line 
{ stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk17_headless, gradle_7

, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib

, ffmpeg_6-headless, python3, ruby

, ffmpeg_7-headless, python3, ruby

, withMedia ? true

, withWebKit ? false

}:
@@ -27,9 +27,10 @@ in stdenv.mkDerivation { 


  patches = [

    ../backport-ffmpeg-6-support-jfx11.patch

    ../backport-ffmpeg-7-support-jfx11.patch

  ];



  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6-headless ];

  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ];

  nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];



  dontUseCmakeConfigure = true;

pkgs/development/compilers/openjdk/openjfx/21/default.nix

+6 −2
Original line number Diff line number Diff line 
{ stdenv, lib, pkgs, fetchFromGitHub, writeText

, openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst

, libXxf86vm, glib, alsa-lib, ffmpeg_6, python3, ruby

, libXxf86vm, glib, alsa-lib, ffmpeg_7, python3, ruby

, withMedia ? true

, withWebKit ? false

}:
@@ -25,7 +25,11 @@ in stdenv.mkDerivation { 
    hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4=";

  };



  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6 ];

  patches = [

    ../backport-ffmpeg-7-support-jfx21.patch

  ];



  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ];

  nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];



  dontUseCmakeConfigure = true;

pkgs/development/compilers/openjdk/openjfx/22/default.nix

+14 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, lib

, pkgs

, fetchFromGitHub

, fetchpatch2

, writeText

, openjdk21_headless

, gradle
@@ -15,7 +16,7 @@ 
, libXxf86vm

, glib

, alsa-lib

, ffmpeg_6

, ffmpeg_7

, python3

, ruby

, withMedia ? true
@@ -25,7 +26,7 @@ 
let

  pname = "openjfx-modular-sdk";

  major = "22";

  update = ".0.1";

  update = ".0.2";

  build = "-ga";

  repover = "${major}${update}${build}";

  jdk = openjdk21_headless;
@@ -38,10 +39,19 @@ in stdenv.mkDerivation { 
    owner = "openjdk";

    repo = "jfx22u";

    rev = repover;

    hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q=";

    hash = "sha256-7Q9nZ2p3KfQPt1A2ULwk64OU/5/ghEkcsf9ECD6Ln2g=";

  };



  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6 ];

  patches = [

    # 8338701: Provide media support for libavcodec version 61

    # <https://github.com/openjdk/jfx/pull/1552>

    (fetchpatch2 {

      url = "https://github.com/openjdk/jfx/commit/6115b396bacf62f39dcaa93c7c0adcd60b428b8c.patch?full_index=1";

      hash = "sha256-6EES4qsumFgXePZSDEetJC1Li65zquz3UjwRbq/6YJM=";

    })

  ];



  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ];

  nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];



  dontUseCmakeConfigure = true;

pkgs/development/compilers/openjdk/openjfx/22/deps.json

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
  }

 },

 "https://github.com": {

  "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": {

   "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="

  "unicode-org/icu/releases/download/release-74-2/icu4c-74_2-data-bin-l": {

   "zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk="

  }

 },

 "https://repo.maven.apache.org/maven2": {