dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions2 Packages Projects Releases Wiki Activity

Merge pull request from eclairevoyant/obs-update

Browse Source
This commit is contained in:
Marcus Ramberg 2024-07-20 09:05:51 +03:00 committed by GitHub
commit 0e53ac2ae8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 17 deletions

11
pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch
View File

@ -12,12 +12,12 @@ security model.
1 file changed, 6 insertions(+), 3 deletions(-) 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp
index ab1181e..c775283 100644 index 09b3017..1094340 100644
--- a/plugins/obs-browser/obs-browser-source.cpp --- a/plugins/obs-browser/obs-browser-source.cpp
+++ b/plugins/obs-browser/obs-browser-source.cpp +++ b/plugins/obs-browser/obs-browser-source.cpp
@@ -179,9 +179,12 @@ bool BrowserSource::CreateBrowser() @@ -239,9 +239,12 @@ bool BrowserSource::CreateBrowser()
#if ENABLE_LOCAL_FILE_URL_SCHEME #if ENABLE_LOCAL_FILE_URL_SCHEME && CHROME_VERSION_BUILD < 4430
if (is_local) { if (is_local) {
- /* Disable web security for file:// URLs to allow - /* Disable web security for file:// URLs to allow
- * local content access to remote APIs */ - * local content access to remote APIs */
@ -30,7 +30,4 @@ index ab1181e..c775283 100644
+ STATE_ENABLED; + STATE_ENABLED;
} }
#endif #endif
auto browser = CefBrowserHost::CreateBrowserSync(
--
2.31.1

11
pkgs/applications/video/obs-studio/default.nix
View File

@ -1,6 +1,8 @@
{ config { config
, uthash
, lib , lib
, stdenv , stdenv
, nv-codec-headers-12
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, addOpenGLRunpath , addOpenGLRunpath
@ -39,7 +41,6 @@
, withFdk ? true , withFdk ? true
, pipewire , pipewire
, libdrm , libdrm
, libajantv2
, librist , librist
, libva , libva
, srt , srt
@ -62,13 +63,13 @@ in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "obs-studio"; pname = "obs-studio";
version = "30.1.2"; version = "30.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "obsproject"; owner = "obsproject";
repo = "obs-studio"; repo = "obs-studio";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo="; hash = "sha256-mwh2KLSz+I/8f3i/wST/2vKL/hWTCTaq53sinIEX75M=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -113,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
libvlc libvlc
mbedtls mbedtls
pciutils pciutils
libajantv2
librist librist
libva libva
srt srt
@ -124,6 +124,8 @@ stdenv.mkDerivation (finalAttrs: {
libdatachannel libdatachannel
libvpl libvpl
qrcodegencpp qrcodegencpp
uthash
nv-codec-headers-12
] ]
++ optionals scriptingSupport [ luajit python3 ] ++ optionals scriptingSupport [ luajit python3 ]
++ optional alsaSupport alsa-lib ++ optional alsaSupport alsa-lib
@ -155,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "ENABLE_ALSA" alsaSupport) (lib.cmakeBool "ENABLE_ALSA" alsaSupport)
(lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport) (lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport)
(lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport) (lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport)
(lib.cmakeBool "ENABLE_AJA" false) # TODO: fix linking against libajantv2
]; ];
env.NIX_CFLAGS_COMPILE = toString [ env.NIX_CFLAGS_COMPILE = toString [

12
pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch
View File

@ -1,9 +1,9 @@
diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake
index d1e58a083..a03c6b98e 100644 index fe8d72364..1c590fcdb 100644
--- a/cmake/Modules/ObsDefaults_Linux.cmake --- a/cmake/Modules/ObsDefaults_Linux.cmake
+++ b/cmake/Modules/ObsDefaults_Linux.cmake +++ b/cmake/Modules/ObsDefaults_Linux.cmake
@@ -76,7 +76,7 @@ macro(setup_obs_project) @@ -76,7 +76,7 @@ macro(setup_obs_project)
set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}") set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}")
- set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}") - set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}")
@ -12,15 +12,15 @@ index d1e58a083..a03c6b98e 100644
else() else()
set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit") set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit")
diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c
index b006a5598..531655eb3 100644 index 77c36be5e..fe8a04813 100644
--- a/libobs/obs-nix.c --- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c +++ b/libobs/obs-nix.c
@@ -56,7 +56,7 @@ const char *get_module_extension(void) @@ -51,7 +51,7 @@ const char *get_module_extension(void)
#define FLATPAK_PLUGIN_PATH "/app/plugins"
static const char *module_bin[] = { static const char *module_bin[] = {
"../../obs-plugins/64bit",
- OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION, - OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION,
+ OBS_PLUGIN_DESTINATION, + OBS_PLUGIN_DESTINATION,
"../../obs-plugins/" BIT_STRING,
FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION, FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION,
}; };