mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-24 00:06:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

flatpak: Add RIST support to FFmpeg

Browse Source 
Mbed TLS module is moved before librist to allow the latter to be built
with Mbed TLS.

It also add FFmpeg librist patches from obs-deps.
This commit is contained in:
tytan652
2021-12-22 16:28:39 +01:00
committed by Georges Basile Stavracas Neto
parent f74c37043e
commit 9167a7177d
1 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
CI/flatpak/com.obsproject.Studio.json
View File

@@ -121,6 +121,51 @@
}
]
},
{
"name": "mbedtls",
"buildsystem": "cmake-ninja",
"builddir": true,
"config-opts": [
"-DCMAKE_BUILD_TYPE=Release",
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
"-DUSE_SHARED_MBEDTLS_LIBRARY=ON",
"-DUSE_STATIC_MBEDTLS_LIBRARY=OFF",
"-DENABLE_TESTING=OFF",
"-DENABLE_PROGRAMS=OFF"
],
"cleanup": [
"/include"
],
"sources": [
{
"type": "git",
"url": "https://github.com/ARMmbed/mbedtls.git",
"commit": "f71e2878084126737cc39083e1e15afc459bd93d",
"tag": "v2.27.0"
}
]
},
{
"name": "librist",
"buildsystem":"meson",
"builddir": true,
"config-opts": [
"-Duse_mbedtls=true",
"-Dtest=false",
"-Dbuilt_tools=false",
"-Dbuiltin_cjson=true"
],
"cleanup": [
"/include"
],
"sources": [
{
"type": "git",
"url": "https://code.videolan.org/rist/librist.git",
"commit": "0b1aaf995c4cad83d562ec7887180cc6ee132c84"
}
]
},
{
"name": "ffmpeg",
"config-opts": [
@@ -136,7 +181,8 @@
"--enable-libvorbis",
"--enable-libx264",
"--enable-nvenc",
"--enable-libsrt"
"--enable-libsrt",
"--enable-librist"
],
"cleanup": [
"/share/ffmpeg",
@@ -161,6 +207,7 @@
"commands": [
"git cherry-pick -n d1b47f3bfcc625ca1cae210fc198dcbd54381a88 # avcodec/vaapi_encode: Fix segfault upon closing uninitialized encoder",
"patch -Np1 -i obs-deps/CI/patches/FFmpeg-4.4.1-OBS.patch",
"patch -Np1 -i obs-deps/CI/patches/FFmpeg-4.4.1-librist.patch",
"patch -Np1 -i obs-deps/CI/patches/FFmpeg-9010.patch"
]
}
@@ -210,30 +257,6 @@
}
]
},
{
"name": "mbedtls",
"buildsystem": "cmake-ninja",
"builddir": true,
"config-opts": [
"-DCMAKE_BUILD_TYPE=Release",
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
"-DUSE_SHARED_MBEDTLS_LIBRARY=ON",
"-DUSE_STATIC_MBEDTLS_LIBRARY=OFF",
"-DENABLE_TESTING=OFF",
"-DENABLE_PROGRAMS=OFF"
],
"cleanup": [
"/include"
],
"sources": [
{
"type": "git",
"url": "https://github.com/ARMmbed/mbedtls.git",
"commit": "f71e2878084126737cc39083e1e15afc459bd93d",
"tag": "v2.27.0"
}
]
},
{
"name": "jack2",
"buildsystem": "simple",