Unverified Commit 73a62fdf authored by Emily's avatar Emily Committed by GitHub
Browse files

x265: fix compilation against gcc15 (#442632)

parents 0b9ac689 44f169c5

pkgs/by-name/x2/x265/gcc15-fixes.patch

0 → 100644
+24 −0
Original line number Diff line number Diff line 
From 43e696a388ddf4ce5f4b9f756e726544b6310092 Mon Sep 17 00:00:00 2001

From: ReenigneArcher <reenignearcher@gmail.com>

Date: Wed, 9 Jul 2025 14:41:33 +0000

Subject: [PATCH] fix(dynamicHDR10): undefined-uint8_t



---

 source/dynamicHDR10/json11/json11.cpp | 1 +

 1 file changed, 1 insertion(+)



diff --git a/source/dynamicHDR10/json11/json11.cpp b/source/dynamicHDR10/json11/json11.cpp

index 762577735..c111ebb82 100644

--- a/dynamicHDR10/json11/json11.cpp

+++ b/dynamicHDR10/json11/json11.cpp

@@ -22,6 +22,7 @@

 #include "json11.h"

 #include <cassert>

 #include <cmath>

+#include <cstdint>

 #include <cstdlib>

 #include <cstdio>

 #include <limits>

-- 

2.49.0

pkgs/by-name/x2/x265/package.nix

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ stdenv.mkDerivation rec { 


  patches = [

    ./darwin-__rdtsc.patch

    # fix compilation with gcc15

    # https://bitbucket.org/multicoreware/x265_git/pull-requests/36

    ./gcc15-fixes.patch

  ]

  # TODO: remove after update to version 4.2

  ++ lib.optionals (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isLinux) [