Unverified Commit 0e53ac2a authored by Marcus Ramberg's avatar Marcus Ramberg Committed by GitHub
Browse files

Merge pull request #326722 from eclairevoyant/obs-update

parents 0fe8af35 079489e4

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

+4 −7
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ security model. 
 1 file changed, 6 insertions(+), 3 deletions(-)



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

+++ 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) {

-			/* Disable web security for file:// URLs to allow

-			 * local content access to remote APIs */
@@ -30,7 +30,4 @@ index ab1181e..c775283 100644 
+				STATE_ENABLED;

 		}

 #endif

 

-- 

2.31.1

 		auto browser = CefBrowserHost::CreateBrowserSync(

pkgs/applications/video/obs-studio/default.nix

+7 −4
Original line number Diff line number Diff line 
{ config

, uthash

, lib

, stdenv

, nv-codec-headers-12

, fetchFromGitHub

, fetchpatch

, addOpenGLRunpath
@@ -39,7 +41,6 @@ 
, withFdk ? true

, pipewire

, libdrm

, libajantv2

, librist

, libva

, srt
@@ -62,13 +63,13 @@ in 


stdenv.mkDerivation (finalAttrs: {

  pname = "obs-studio";

  version = "30.1.2";

  version = "30.2.0";



  src = fetchFromGitHub {

    owner = "obsproject";

    repo = "obs-studio";

    rev = finalAttrs.version;

    hash = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo=";

    hash = "sha256-mwh2KLSz+I/8f3i/wST/2vKL/hWTCTaq53sinIEX75M=";

    fetchSubmodules = true;

  };
@@ -113,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: { 
    libvlc

    mbedtls

    pciutils

    libajantv2

    librist

    libva

    srt
@@ -124,6 +124,8 @@ stdenv.mkDerivation (finalAttrs: { 
    libdatachannel

    libvpl

    qrcodegencpp

    uthash

    nv-codec-headers-12

  ]

  ++ optionals scriptingSupport [ luajit python3 ]

  ++ optional alsaSupport alsa-lib
@@ -155,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.cmakeBool "ENABLE_ALSA" alsaSupport)

    (lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport)

    (lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport)

    (lib.cmakeBool "ENABLE_AJA" false) # TODO: fix linking against libajantv2

  ];



  env.NIX_CFLAGS_COMPILE = toString [

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

+6 −6
Original line number Diff line number Diff line 
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

+++ b/cmake/Modules/ObsDefaults_Linux.cmake

@@ -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_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}")
@@ -12,15 +12,15 @@ index d1e58a083..a03c6b98e 100644 
   else()

     set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit")

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

+++ b/libobs/obs-nix.c

@@ -56,7 +56,7 @@ const char *get_module_extension(void)

 #define FLATPAK_PLUGIN_PATH "/app/plugins"

@@ -51,7 +51,7 @@ const char *get_module_extension(void)

 

 static const char *module_bin[] = {

 	"../../obs-plugins/64bit",

-	OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION,

+	OBS_PLUGIN_DESTINATION,

 	"../../obs-plugins/" BIT_STRING,

 	FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION,

 };