Commit e6248182 authored by Emily's avatar Emily
Browse files

xeve: 0.5.0 -> 0.5.1

Closes: #322990
parent 192fd67c
Loading
Loading
Loading
Loading
+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 = ''