Merge pull request #216551 from centromere/tl-expected-2023-02-15

tl-expected: 2019-11-11 -> 2023-02-15
This commit is contained in:
Nick Cao
2023-02-17 19:14:26 +08:00
committed by GitHub
3 changed files with 30 additions and 3 deletions
@@ -56,6 +56,10 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
patches = [
./tg_owt.patch
];
postPatch = lib.optionalString stdenv.isLinux ''
substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
--replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \
@@ -0,0 +1,23 @@
--- a/src/modules/include/module_common_types_public.h
+++ b/src/modules/include/module_common_types_public.h
@@ -11,6 +11,7 @@
#ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
#define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
+#include <cstdint>
#include <limits>
#include "absl/types/optional.h"
diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h
index 28c95ea9..790b0b73 100644
--- a/src/common_video/h265/h265_pps_parser.h
+++ b/src/common_video/h265/h265_pps_parser.h
@@ -13,6 +13,8 @@
#include "absl/types/optional.h"
+#include <stdint.h>
+
namespace rtc {
class BitBuffer;
}
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "tl-expected-unstable";
version = "2019-11-11"; # 5 commits ahead of version 1.0.0
version = "2023-02-15"; # 37 commits ahead of version 1.0.0
src = fetchFromGitHub {
owner = "TartanLlama";
repo = "expected";
rev = "1d9c5d8c0da84b8ddc54bd3d90d632eec95c1f13";
rev = "9d812f5e3b5bc68023f6e31d29489cdcaacef606";
fetchSubmodules = true;
sha256 = "0rzfn9yyg70zwpxbmv22qy0015baymi2rdd65ixmcb31fgnap68i";
hash = "sha256-ZokcGQgHH37nmTMLmxFcun4S1RjXuXb9NfWHet8Fbc4=";
};
nativeBuildInputs = [ cmake ];