flatpak: Update dependencies
- Update LuaJIT according to upstream recommendations (maintainers of this project prefer that distributors use the git repository directly, instead of archives. Do that, and also update the Lua path for swig.) - Update ffmpeg and drop patch which is included in this updated release now. - Update x264 - Update nv-codec-headers - Update mbedtlsmaster
Georges Basile Stavracas Neto
Jim
parent
7e36331c98
commit
1a05c4f48e
|
|
@ -41,7 +41,7 @@
|
|||
{
|
||||
"type": "git",
|
||||
"url": "https://code.videolan.org/videolan/x264.git",
|
||||
"commit": "cde9a93319bea766a92e306d69059c76de970190"
|
||||
"commit": "b86ae3c66f51ac9eab5ab7ad09a9d62e67961b8a"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
@ -79,8 +79,8 @@
|
|||
{
|
||||
"type": "git",
|
||||
"url": "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git",
|
||||
"commit": "a99740a84b49fd609e04b03279e66c5a8b767440",
|
||||
"tag": "n10.0.26.1"
|
||||
"commit": "7a81595786463d1c7efcb03aa85def69fc2cad41",
|
||||
"tag": "n11.0.10.0"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
@ -129,12 +129,8 @@
|
|||
"sources": [
|
||||
{
|
||||
"type": "archive",
|
||||
"url": "https://www.ffmpeg.org/releases/ffmpeg-4.3.1.tar.xz",
|
||||
"sha256": "ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb"
|
||||
},
|
||||
{
|
||||
"type": "patch",
|
||||
"path": "ffmpeg-libsrt.patch"
|
||||
"url": "https://www.ffmpeg.org/releases/ffmpeg-4.3.2.tar.xz",
|
||||
"sha256": "46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
@ -147,9 +143,11 @@
|
|||
],
|
||||
"sources": [
|
||||
{
|
||||
"type": "archive",
|
||||
"url": "http://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz",
|
||||
"sha256": "1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3"
|
||||
"type": "git",
|
||||
"url": "https://luajit.org/git/luajit-2.0.git",
|
||||
"branch": "v2.1",
|
||||
"commit": "787736990ac3b7d5ceaba2697c7d0f58f77bb782",
|
||||
"disable-shallow-clone": true
|
||||
},
|
||||
{
|
||||
"type": "shell",
|
||||
|
|
@ -165,7 +163,7 @@
|
|||
"--without-boost",
|
||||
"--without-pcre",
|
||||
"--without-alllang",
|
||||
"--with-lua=/app/bin/luajit-2.1.0-beta2",
|
||||
"--with-lua=/app/bin/luajit-2.1.0-beta3",
|
||||
"--with-luaincl=/app/include/luajit-2.1",
|
||||
"--with-python3"
|
||||
],
|
||||
|
|
@ -199,8 +197,8 @@
|
|||
{
|
||||
"type": "git",
|
||||
"url": "https://github.com/ARMmbed/mbedtls.git",
|
||||
"commit": "848a4e06b375e067552f1a21d4bc69322c673217",
|
||||
"tag": "mbedtls-2.16.8"
|
||||
"commit": "1c54b5410fd48d6bcada97e30cac417c5c7eea67",
|
||||
"tag": "v2.25.0"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
From 7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315 Mon Sep 17 00:00:00 2001
|
||||
From: Jun Zhao <barryjzhao@tencent.com>
|
||||
Date: Sun, 12 Jul 2020 13:48:48 +0800
|
||||
Subject: [PATCH 1/1] lavf/srt: fix build fail when used the libsrt 1.4.1
|
||||
|
||||
libsrt changed the:
|
||||
SRTO_SMOOTHER -> SRTO_CONGESTION
|
||||
SRTO_STRICTENC -> SRTO_ENFORCEDENCRYPTION
|
||||
and removed the front of deprecated options (SRTO_SMOOTHER/SRTO_STRICTENC)
|
||||
in the header, it's lead to build fail
|
||||
|
||||
fix #8760
|
||||
|
||||
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
|
||||
---
|
||||
libavformat/libsrt.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
|
||||
index 4de575b..4719ce0 100644
|
||||
--- a/libavformat/libsrt.c
|
||||
+++ b/libavformat/libsrt.c
|
||||
@@ -313,8 +313,12 @@ static int libsrt_set_options_pre(URLContext *h, int fd)
|
||||
(s->pbkeylen >= 0 && libsrt_setsockopt(h, fd, SRTO_PBKEYLEN, "SRTO_PBKEYLEN", &s->pbkeylen, sizeof(s->pbkeylen)) < 0) ||
|
||||
(s->passphrase && libsrt_setsockopt(h, fd, SRTO_PASSPHRASE, "SRTO_PASSPHRASE", s->passphrase, strlen(s->passphrase)) < 0) ||
|
||||
#if SRT_VERSION_VALUE >= 0x010302
|
||||
+#if SRT_VERSION_VALUE >= 0x010401
|
||||
+ (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_ENFORCEDENCRYPTION, "SRTO_ENFORCEDENCRYPTION", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) ||
|
||||
+#else
|
||||
/* SRTO_STRICTENC == SRTO_ENFORCEDENCRYPTION (53), but for compatibility, we used SRTO_STRICTENC */
|
||||
(s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_STRICTENC, "SRTO_STRICTENC", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) ||
|
||||
+#endif
|
||||
(s->kmrefreshrate >= 0 && libsrt_setsockopt(h, fd, SRTO_KMREFRESHRATE, "SRTO_KMREFRESHRATE", &s->kmrefreshrate, sizeof(s->kmrefreshrate)) < 0) ||
|
||||
(s->kmpreannounce >= 0 && libsrt_setsockopt(h, fd, SRTO_KMPREANNOUNCE, "SRTO_KMPREANNOUNCE", &s->kmpreannounce, sizeof(s->kmpreannounce)) < 0) ||
|
||||
#endif
|
||||
@@ -333,7 +337,11 @@ static int libsrt_set_options_pre(URLContext *h, int fd)
|
||||
(s->lossmaxttl >= 0 && libsrt_setsockopt(h, fd, SRTO_LOSSMAXTTL, "SRTO_LOSSMAXTTL", &s->lossmaxttl, sizeof(s->lossmaxttl)) < 0) ||
|
||||
(s->minversion >= 0 && libsrt_setsockopt(h, fd, SRTO_MINVERSION, "SRTO_MINVERSION", &s->minversion, sizeof(s->minversion)) < 0) ||
|
||||
(s->streamid && libsrt_setsockopt(h, fd, SRTO_STREAMID, "SRTO_STREAMID", s->streamid, strlen(s->streamid)) < 0) ||
|
||||
+#if SRT_VERSION_VALUE >= 0x010401
|
||||
+ (s->smoother && libsrt_setsockopt(h, fd, SRTO_CONGESTION, "SRTO_CONGESTION", s->smoother, strlen(s->smoother)) < 0) ||
|
||||
+#else
|
||||
(s->smoother && libsrt_setsockopt(h, fd, SRTO_SMOOTHER, "SRTO_SMOOTHER", s->smoother, strlen(s->smoother)) < 0) ||
|
||||
+#endif
|
||||
(s->messageapi >= 0 && libsrt_setsockopt(h, fd, SRTO_MESSAGEAPI, "SRTO_MESSAGEAPI", &s->messageapi, sizeof(s->messageapi)) < 0) ||
|
||||
(s->payload_size >= 0 && libsrt_setsockopt(h, fd, SRTO_PAYLOADSIZE, "SRTO_PAYLOADSIZE", &s->payload_size, sizeof(s->payload_size)) < 0) ||
|
||||
((h->flags & AVIO_FLAG_WRITE) && libsrt_setsockopt(h, fd, SRTO_SENDER, "SRTO_SENDER", &yes, sizeof(yes)) < 0)) {
|
||||
--
|
||||
2.7.4
|
||||
|
||||
Loading…
Reference in New Issue