obs-studio: Add builtin support for browser source #99284

Munksgaard · 2020-10-01T14:49:07Z

Motivation for this change

Bump obs-studio and enable builtin support for browser source.

Since version 25, OBS Studio has shipped with a version of obs-browser that includes linux support (which means that we don't need the obs-linuxbrowser any more). However, previously, we didn't built obs-studio with that support enabled. This PR enables it.

For some reason, I'm getting a patchelf: open: Permission denied at the end of my nix-build -A obs-studio, but I can run the binary manually, and I have confirmed that the browser source is present and working. Does anyone have an idea how I can fix the permission issue?

This PR removes the need for the obs-linuxbrowser package (obs-linuxbrowser has also been archived and discontinued, as detailed here)

Fixes #98035

Things done

Munksgaard · 2020-10-01T14:54:13Z

Oh damn, I'm late to the party! #99242

I'll update my PR to only add support for the browser source.

Munksgaard · 2020-10-01T23:31:06Z

I've updated it now. Should I also remove obs-linuxbrowser, now that it's no longer needed? If so, how do I do that?

mohe2015 · 2020-10-02T13:47:12Z

@Munksgaard I would assume you would need to remove

nixpkgs/pkgs/top-level/all-packages.nix

Line 21026 in 84cf00f

    
           obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { };

and https://github.com/NixOS/nixpkgs/blob/84cf00f98031e93f389f1eb93c4a7374a33cc0a9/pkgs/applications/video/obs-studio/linuxbrowser.nix

mohe2015 · 2020-10-02T14:24:42Z

@Munksgaard
Also I fixed the patchelf thing by using the following patch

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 35c7ce93c6d..93eecae8d5c 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -80,12 +80,13 @@ in mkDerivation rec {
   postUnpack = ''
     mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/
     for i in ${libcef}/share/cef/*; do
-      ln -s $i cef/Release/
-      ln -s $i cef/Resources/
+      cp -r $i cef/Release/
+      cp -r $i cef/Resources/
     done
-    ln -s ${libcef}/lib/libcef.so cef/Release/
-    ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
-    ln -s ${libcef}/include cef/
+    cp -r ${libcef}/lib/libcef.so cef/Release/
+    cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
+    cp -r ${libcef}/include cef/
+    ls -R cef
   '';
 
   # obs attempts to dlopen libobs-opengl, it fails unless we make sure

I don't know if this is a proper fix but this works. I think the underlying issues is that obs-studio's findCEF.cmake is flawed.

Munksgaard · 2020-10-02T14:59:55Z

Thank you, I'll try it later tonight.

…

On Fri, Oct 2, 2020, at 16:24, Moritz Hedtke wrote: @Munksgaard <https://github.com/Munksgaard> Also I fixed the patchelf thing by using the following patch diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 35c7ce93c6d..93eecae8d5c 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -80,12 +80,13 @@ in mkDerivation rec { postUnpack = '' mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/ for i in ${libcef}/share/cef/*; do - ln -s $i cef/Release/ - ln -s $i cef/Resources/ + cp -r $i cef/Release/ + cp -r $i cef/Resources/ done - ln -s ${libcef}/lib/libcef.so cef/Release/ - ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ - ln -s ${libcef}/include cef/ + cp -r ${libcef}/lib/libcef.so cef/Release/ + cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/ + cp -r ${libcef}/include cef/ + ls -R cef ''; # obs attempts to dlopen libobs-opengl, it fails unless we make sure I don't know if this is a proper fix but this works. I think the underlying issues is that obs-studio's findCEF.cmake is flawed. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#99284 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AABYJVK3RD5E7SQPBOHBWITSIXPDVANCNFSM4SARAOGQ>.

mohe2015

Tested it locally - the changes in #99284 (comment) could still be done in my opinion. I don't think a migration of the package is necessary.

Munksgaard · 2020-10-03T18:12:06Z

Tested it locally - the changes in #99284 (comment) could still be done in my opinion. I don't think a migration of the package is necessary.

Oh yes, I forgot! Fixed that now :)

mohe2015 · 2020-10-03T19:31:15Z

Not pushed yet? @Munksgaard

Munksgaard · 2020-10-03T20:48:06Z

Sorry! Should be done now :)

Munksgaard · 2020-10-12T13:23:23Z

What's needed for this to get merged?

Munksgaard · 2020-10-30T13:24:26Z

Rebased on top of current master (to support 26.0.2)

Munksgaard · 2020-11-01T07:29:20Z

Can we get this merged? @mohe2015

mohe2015

Otherwise it should be good do go.
I don't have merge permissions btw.

mohe2015 · 2020-11-01T09:22:13Z

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

+    cp -r ${libcef}/lib/libcef.so cef/Release/
+    cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
+    cp -r ${libcef}/include cef/
+    ls -R cef


This line should probably be removed

Fixed and rebased

mohe2015

~~This can be merged in my opinion.~~ @Munksgaard Where did you get the version of cef from? Because I couldn't find any recommendation at obs-studio's repository and http://opensource.spotify.com/cefbuilds/index.html#linux64 shows that version 86 would be available. Or is cef also used by other packages? Anyways this would be something for a later pull request.

mohe2015

I think you broke something. My rebuild took a bit longer because I also rebased to master but I can't find the browser source option. Please check yourself.
Edit: Submodule fetching seems to be broken @Munksgaard

If we're at it you could also change the commit messages according to the contributing guide. I think "libcef: oldversion -> 75.1.14" should be better. See https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md

mohe2015 · 2020-11-01T12:16:38Z

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

@@ -44,8 +45,9 @@ in mkDerivation rec {
  src = fetchFromGitHub {
    owner = "obsproject";
    repo = "obs-studio";
-    rev = version;
+    rev = "refs/tags/${version}";
    sha256 = "1d502f80whh686mvq0yn6zpa5nvmnlzxwp5sjz43vpbbvhpbrdqj";


Suggested change

sha256 = "1d502f80whh686mvq0yn6zpa5nvmnlzxwp5sjz43vpbbvhpbrdqj";

sha256 = "vMrPMuZPeFefpbtQykeWifLBkhkSM47tDPid5cU3xa0=";

something changed the hash and this didn't get attention because we both had the old version in cache probably.

Update libcef package to 75.1.14 This will allow us to enable browser source in the obs-studio build. It will also mean that obs-linuxbrowser probably doesn't work, but it's not needed any longer, so that shouldn't be a problem.

@mohe2015

Since version 25, OBS Studio has shipped with a version of obs-browser that includes linux support (which means that we don't need the obs-linuxbrowser any more). This commit enables the builtin browser source. Fixes NixOS#98035 Thanks to @mohe2015 for fixing a patchelf issue I had!

No longer needed since NixOS#99284

Munksgaard · 2020-11-01T20:39:57Z

~~This can be merged in my opinion.~~ @Munksgaard Where did you get the version of cef from? Because I couldn't find any recommendation at obs-studio's repository and http://opensource.spotify.com/cefbuilds/index.html#linux64 shows that version 86 would be available. Or is cef also used by other packages? Anyways this would be something for a later pull request.

I took it from the build instructions on the obs-studio wiki: https://github.com/obsproject/obs-studio/wiki/Install-Instructions#linux-build-directions.

Trying to build with cef 86.0.2 causes problems I don't know how to fix:


/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: warning: libdrm.so.2, needed by /build/cef/Release/libcef.so, not found (try using -rpath or -rpath-link)
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: warning: libgbm.so.1, needed by /build/cef/Release/libcef.so, not found (try using -rpath or -rpath-link)
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_bo_get_stride'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_bo_get_handle'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_bo_get_height'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_device_destroy'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_create_device'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_bo_destroy'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_bo_import'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_device_is_format_supported'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `drmPrimeHandleToFD'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_bo_get_device'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_device_get_fd'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_bo_create'
/nix/store/hiwz81i1g3fn3p0acjs042a4h5fri6dh-binutils-2.31.1/bin/ld: /build/cef/Release/libcef.so: undefined reference to `gbm_bo_get_width'
collect2: error: ld returned 1 exit status
make[2]: *** [plugins/obs-browser/CMakeFiles/obs-browser-page.dir/build.make:150: plugins/obs-browser/obs-browser-page] Error 1
make[1]: *** [CMakeFiles/Makefile2:1381: plugins/obs-browser/CMakeFiles/obs-browser-page.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....

I've updated the sha now, and it should compile correctly again. Please take a look when you have time @mohe2015

Edit: And thank you, once again, for helping me out!

mohe2015

LGTM!

Munksgaard · 2020-11-02T08:17:20Z

@puffnfresh How can I push this forward?

Munksgaard · 2020-11-12T14:57:54Z

@MP2E, @jb55, @puffnfresh: You guys were automatically assigned as reviewers on this PR, what can I do to push it forward? Is there someone else I should be nudging instead?

Munksgaard · 2020-11-12T15:00:09Z

@mweinelt, I saw you merged #101710, could you also merge this one, so we don't need to rely on obs-linuxbrowser anymore?

jb55 · 2020-11-12T17:43:56Z

Philip Munksgaard <notifications@github.com> writes:

@MP2E, @jb55, @puffnfresh: You guys were automatically assigned as reviewers on this PR, what can I do to push it forward? Is there someone else I should be nudging instead?

I haven't been able to test this yet but it's an awesome plugin that I would love to see in nixpkgs! I don't have commit access so I can't do much personally to push it through

mweinelt · 2020-11-12T18:10:21Z

Result of nixpkgs-review pr 99284 1

1 package failed to build:

obs-ndi

4 packages built:

libcef
obs-studio
obs-v4l2sink
obs-wlrobs

mweinelt · 2020-11-12T18:13:10Z

Thanks, tested and LGTM.

Munksgaard · 2020-11-12T18:48:56Z

Thank you @mweinelt :)

mweinelt · 2020-11-12T19:20:35Z

Happy to help.

Munksgaard changed the title ~~Bump obs~~ Update obs-studio to 26.0.0 and add builtin support for browser source Oct 1, 2020

Munksgaard force-pushed the bump-obs branch from 4d0b945 to ccfd95b Compare October 1, 2020 14:55

ofborg bot requested review from puffnfresh, MP2E and jb55 October 1, 2020 17:43

ofborg bot added 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Oct 1, 2020

Munksgaard changed the title ~~Update obs-studio to 26.0.0 and add builtin support for browser source~~ obs-studio: Add builtin support for browser source Oct 1, 2020

mohe2015 approved these changes Oct 3, 2020

View reviewed changes

ofborg bot added the 8.has: clean-up label Oct 3, 2020

Munksgaard force-pushed the bump-obs branch from 9fd9ac7 to 364e4bc Compare October 30, 2020 13:23

mohe2015 suggested changes Nov 1, 2020

View reviewed changes

Munksgaard force-pushed the bump-obs branch from 364e4bc to 27c61c4 Compare November 1, 2020 09:34

mohe2015 approved these changes Nov 1, 2020

View reviewed changes

mohe2015 suggested changes Nov 1, 2020

View reviewed changes

mohe2015 reviewed Nov 1, 2020

View reviewed changes

Munksgaard added 3 commits November 1, 2020 21:32

libcef: 74.1.14 -> 75.1.14

de5875a

Update libcef package to 75.1.14 This will allow us to enable browser source in the obs-studio build. It will also mean that obs-linuxbrowser probably doesn't work, but it's not needed any longer, so that shouldn't be a problem.

Remove obs-linuxbrowser

cbcb841

No longer needed since NixOS#99284

Munksgaard force-pushed the bump-obs branch from 27c61c4 to cbcb841 Compare November 1, 2020 20:38

mohe2015 approved these changes Nov 1, 2020

View reviewed changes

mweinelt approved these changes Nov 12, 2020

View reviewed changes

mweinelt merged commit a6c7b75 into NixOS:master Nov 12, 2020

Munksgaard deleted the bump-obs branch November 12, 2020 18:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

obs-studio: Add builtin support for browser source #99284

obs-studio: Add builtin support for browser source #99284

Munksgaard commented Oct 1, 2020 •

edited

Munksgaard commented Oct 1, 2020

Munksgaard commented Oct 1, 2020 •

edited

mohe2015 commented Oct 2, 2020

mohe2015 commented Oct 2, 2020

Munksgaard commented Oct 2, 2020 via email

mohe2015 left a comment

Munksgaard commented Oct 3, 2020

mohe2015 commented Oct 3, 2020

Munksgaard commented Oct 3, 2020

Munksgaard commented Oct 12, 2020

Munksgaard commented Oct 30, 2020

Munksgaard commented Nov 1, 2020

mohe2015 left a comment

mohe2015 Nov 1, 2020

Munksgaard Nov 1, 2020

mohe2015 left a comment •

edited

mohe2015 left a comment •

edited

mohe2015 Nov 1, 2020 •

edited

Munksgaard commented Nov 1, 2020 •

edited

mohe2015 left a comment

Munksgaard commented Nov 2, 2020

Munksgaard commented Nov 12, 2020

Munksgaard commented Nov 12, 2020

jb55 commented Nov 12, 2020 via email

mweinelt commented Nov 12, 2020

mweinelt commented Nov 12, 2020

Munksgaard commented Nov 12, 2020

mweinelt commented Nov 12, 2020

	sha256 = "1d502f80whh686mvq0yn6zpa5nvmnlzxwp5sjz43vpbbvhpbrdqj";
	sha256 = "vMrPMuZPeFefpbtQykeWifLBkhkSM47tDPid5cU3xa0=";

obs-studio: Add builtin support for browser source #99284

obs-studio: Add builtin support for browser source #99284

Conversation

Munksgaard commented Oct 1, 2020 • edited

Motivation for this change

Things done

Munksgaard commented Oct 1, 2020

Munksgaard commented Oct 1, 2020 • edited

mohe2015 commented Oct 2, 2020

mohe2015 commented Oct 2, 2020

Munksgaard commented Oct 2, 2020 via email

mohe2015 left a comment

Choose a reason for hiding this comment

Munksgaard commented Oct 3, 2020

mohe2015 commented Oct 3, 2020

Munksgaard commented Oct 3, 2020

Munksgaard commented Oct 12, 2020

Munksgaard commented Oct 30, 2020

Munksgaard commented Nov 1, 2020

mohe2015 left a comment

Choose a reason for hiding this comment

mohe2015 Nov 1, 2020

Choose a reason for hiding this comment

Munksgaard Nov 1, 2020

Choose a reason for hiding this comment

mohe2015 left a comment • edited

Choose a reason for hiding this comment

mohe2015 left a comment • edited

Choose a reason for hiding this comment

mohe2015 Nov 1, 2020 • edited

Choose a reason for hiding this comment

Munksgaard commented Nov 1, 2020 • edited

mohe2015 left a comment

Choose a reason for hiding this comment

Munksgaard commented Nov 2, 2020

Munksgaard commented Nov 12, 2020

Munksgaard commented Nov 12, 2020

jb55 commented Nov 12, 2020 via email

mweinelt commented Nov 12, 2020

mweinelt commented Nov 12, 2020

Munksgaard commented Nov 12, 2020

mweinelt commented Nov 12, 2020

Munksgaard commented Oct 1, 2020 •

edited

Munksgaard commented Oct 1, 2020 •

edited

mohe2015 left a comment •

edited

mohe2015 left a comment •

edited

mohe2015 Nov 1, 2020 •

edited

Munksgaard commented Nov 1, 2020 •

edited