Unverified Commit 92663c97 authored by Emily's avatar Emily Committed by GitHub
Browse files

ffmpeg_7: 7.0.2 -> 7.1; xeve: 0.5.0 -> 0.5.1 (#346552)

parents f4d64b5b 7ad7e69a

nixos/doc/manual/release-notes/rl-2411.section.md

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ 
- Minimal installer ISOs are no longer built on the small channel.

  Please obtain installer images from the full release channels.



- The default FFmpeg version is now 7, and FFmpeg 5 has been removed.

- The default FFmpeg version is now 7.1, and FFmpeg 5 has been removed.

  Please prefer using the package variants without a version suffix,

  or pin FFmpeg 6 or 4 if necessary for compatibility.

  Note that we keep old versions around only as required

pkgs/by-name/xe/xeve/package.nix

+36 −42
Original line number Diff line number Diff line
@@ -9,17 +9,16 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "xeve";

  version = "0.5.0";

  version = "0.5.1";



  src = fetchFromGitHub {

    owner = "mpeg5";

    repo = "xeve";

    rev = "v${finalAttrs.version}";

    hash = "sha256-8jXntm/yFme9ZPImdW54jAr11hEsU1K+N5/7RLmITPs=";

    hash = "sha256-/DcYv2fInr8MN1wpOgJHcFWEvW//7SIXccheRfeaTHM=";

  };



  patches =

    lib.optionals (!lib.versionOlder "0.5.0" finalAttrs.version) (

    builtins.map fetchpatch2 [

      {

        url = "https://github.com/mpeg5/xeve/commit/954ed6e0494cd2438fd15c717c0146e88e582b33.patch?full_index=1";
@@ -41,9 +40,7 @@ stdenv.mkDerivation (finalAttrs: { 
    ++ [

      # Backport to 0.5.0 of upstream patch c564ac77c103dbba472df3e13f4733691fd499ed

      ./0001-CMakeLists.txt-Disable-static-linking-on-Darwin.patch

      ]

    )

    ++ [



      # Rejected upstream, can be dropped when a fix for

      # https://github.com/mpeg5/xeve/pull/123 is in a version bump.

      ./0002-sse2neon-Cast-to-variable-type.patch
@@ -64,8 +61,7 @@ stdenv.mkDerivation (finalAttrs: { 
    ++ optional isDarwin (cmakeFeature "CMAKE_SYSTEM_NAME" "Darwin");



  env.NIX_CFLAGS_COMPILE = builtins.toString (

    builtins.map (w: "-Wno-" + w) (

      [

    builtins.map (w: "-Wno-" + w) [

      # Patch addressing an if without a body was rejected upstream, third

      # line-based comment in this thread, https://github.com/mpeg5/xeve/pull/122#pullrequestreview-2187744305

      # Evaluate on version bump whether still necessary.
@@ -74,13 +70,11 @@ stdenv.mkDerivation (finalAttrs: { 
      # Evaluate on version bump whether still necessary.

      "parentheses-equality"

      "unknown-warning-option"

      ]

      ++ (



      # Fixed upstream in 325fd9f94f3fdf0231fa931a31ebb72e63dc3498 but might

      # change behavior, therefore opted to leave it out for now.

        lib.optional (!lib.versionOlder "0.5.0" finalAttrs.version) "for-loop-analysis"

      )

    )

      "for-loop-analysis"

    ]

  );



  postInstall = ''

pkgs/development/libraries/ffmpeg/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ let 
  };



  v7 = {

    version = "7.0.2";

    hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs=";

    version = "7.1";

    hash = "sha256-erTkv156VskhYEJWjpWFvHjmcr2hr6qgUi28Ho8NFYk=";

  };

in

pkgs/development/libraries/ffmpeg/fix-fate-ffmpeg-spec-disposition-7.1.patch

0 → 100644
+10 −0
Original line number Diff line number Diff line 
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak

index 869376dd18..d9348ee837 100644

--- a/tests/fate/ffmpeg.mak

+++ b/tests/fate/ffmpeg.mak

@@ -266,4 +266,4 @@

 

 # test matching by stream disposition

 fate-ffmpeg-spec-disposition: CMD = framecrc -i $(TARGET_SAMPLES)/mpegts/pmtchange.ts -map '0:disp:visual_impaired+descriptions:1' -c copy

-FATE_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition

+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition

pkgs/development/libraries/ffmpeg/generic.nix

+2 −9
Original line number Diff line number Diff line
@@ -457,16 +457,9 @@ stdenv.mkDerivation (finalAttrs: { 
        hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y=";

      })

    ]

    ++ optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.0.1") [

      (fetchpatch2 {

        # Will likely be obsolete in >7.0

        name = "fate_avoid_dependency_on_samples";

        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7b7b7819bd21cc92ac07f6696b0e7f26fa8f9834";

        hash = "sha256-TKI289XqtG86Sj9s7mVYvmkjAuRXeK+2cYYEDkg6u6I=";

      })

    ]

    ++ optionals (lib.versionAtLeast version "7.0") [

    ++ optionals (lib.versionAtLeast version "7.1") [

      ./0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch

      ./fix-fate-ffmpeg-spec-disposition-7.1.patch



      # Expose a private API for Chromium / Qt WebEngine.

      (fetchpatch2 {