[bug#33902] [PATCH] gnu: Add wlstream.

[bug#33902] [PATCH] gnu: Add wlstream.

[Rutger Helling]

[-- Attachment #1.1: Type: text/plain, Size: 214 bytes --]

Hey Guix,

these patches add wlstream. It needs libdrm support in ffmpeg, which
the first patch does.

Tested and working under Sway with:
wlstream 25 vaapi /dev/dri/renderD128 libx264rgb bgr0 12 output.mkv

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-ffmpeg-Add-libdrm-support.patch --]
[-- Type: text/x-patch, Size: 1097 bytes --]

From b38bdecd0dee379f50241092aab2be4b69606209 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Fri, 28 Dec 2018 20:15:22 +0100
Subject: [PATCH 1/2] gnu: ffmpeg: Add libdrm support.

* gnu/packages/video.scm (ffmpeg): Add libdrm support.
---
 gnu/packages/video.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ba0320548..d7675d5cd 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -701,6 +701,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
        ("libbluray" ,libbluray)
        ("libcaca" ,libcaca)
        ("libcdio-paranoia" ,libcdio-paranoia)
+       ("libdrm" ,libdrm)
        ("libtheora" ,libtheora)
        ("libva" ,libva)
        ("libvdpau" ,libvdpau)
@@ -802,6 +803,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
          "--enable-libx265"
          "--enable-openal"
          "--enable-opengl"
+         "--enable-libdrm"
 
          "--enable-runtime-cpudetect"
 
-- 
2.20.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-Add-wlstream.patch --]
[-- Type: text/x-patch, Size: 1865 bytes --]

From 5593f737c1fbbc9761c3ec667539a99be0f40526 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Fri, 28 Dec 2018 20:37:01 +0100
Subject: [PATCH 2/2] gnu: Add wlstream.

* gnu/packages/video.scm (wlstream): New variable.
---
 gnu/packages/video.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d7675d5cd..8edf3fb8c 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3286,3 +3286,31 @@ transitions, and effects and then export your film to many common formats.")
     (description "dav1d is a new AV1 cross-platform decoder, and focused on
 speed and correctness.")
     (license license:bsd-2)))
+
+(define-public wlstream
+  (let ((commit "182076a94562b128c3a97ecc53cc68905ea86838")
+        (revision "1"))
+    (package
+     (name "wlstream")
+     (version (git-version "0.0" revision commit))
+     (source
+      (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/atomnuker/wlstream.git")
+             (commit commit)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "01qbcgfl3g9kfwn1jf1z9pdj3bvf5lmg71d1vwkcllc2az24bjqp"))))
+     (build-system meson-build-system)
+     (native-inputs `(("libdrm" ,libdrm)
+                      ("pkg-config" ,pkg-config)))
+     (inputs `(("ffmpeg" ,ffmpeg)
+               ("pulseaudio" ,pulseaudio)
+               ("wayland" ,wayland)
+               ("wayland-protocols" ,wayland-protocols)))
+     (home-page "https://github.com/atomnuker/wlstream")
+     (synopsis "Record and streams from a Wayland session")
+     (description "Wlstream can record and streams from a Wayland session.")
+     (license license:lgpl2.1+))))
-- 
2.20.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#33902] [PATCH] gnu: Add wlstream.

[Brendan Tildesley]

The description for wlstream is vague and the English unnatural
("streams" should be "stream"). I'm not sure what it does and the git
repo doesn't even provide an explanation. Could you write  a more
thorough description?

[bug#33902] [PATCH] gnu: Add wlstream.

[Rutger Helling]

[-- Attachment #1.1: Type: text/plain, Size: 333 bytes --]

Here's a second version of the patch with a synopsis
and description that's hopefully clearer.

> The description for wlstream is vague and the English unnatural
> ("streams" should be "stream"). I'm not sure what it does and the git
> repo doesn't even provide an explanation. Could you write  a more
> thorough description?

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-ffmpeg-Add-libdrm-support.patch --]
[-- Type: text/x-patch, Size: 1097 bytes --]

From b38bdecd0dee379f50241092aab2be4b69606209 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Fri, 28 Dec 2018 20:15:22 +0100
Subject: [PATCH 1/2] gnu: ffmpeg: Add libdrm support.

* gnu/packages/video.scm (ffmpeg): Add libdrm support.
---
 gnu/packages/video.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ba0320548..d7675d5cd 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -701,6 +701,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
        ("libbluray" ,libbluray)
        ("libcaca" ,libcaca)
        ("libcdio-paranoia" ,libcdio-paranoia)
+       ("libdrm" ,libdrm)
        ("libtheora" ,libtheora)
        ("libva" ,libva)
        ("libvdpau" ,libvdpau)
@@ -802,6 +803,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
          "--enable-libx265"
          "--enable-openal"
          "--enable-opengl"
+         "--enable-libdrm"
 
          "--enable-runtime-cpudetect"
 
-- 
2.20.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-Add-wlstream-v2.patch --]
[-- Type: text/x-patch, Size: 1899 bytes --]

From 5d18a851060605deee53c275159a6d37bfc0b007 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Sat, 29 Dec 2018 16:17:59 +0100
Subject: [PATCH 2/2] gnu: Add wlstream.

* gnu/packages/video.scm (wlstream): New variable.
---
 gnu/packages/video.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d7675d5cd..566b0a4e2 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3286,3 +3286,32 @@ transitions, and effects and then export your film to many common formats.")
     (description "dav1d is a new AV1 cross-platform decoder, and focused on
 speed and correctness.")
     (license license:bsd-2)))
+
+(define-public wlstream
+  (let ((commit "182076a94562b128c3a97ecc53cc68905ea86838")
+        (revision "1"))
+    (package
+     (name "wlstream")
+     (version (git-version "0.0" revision commit))
+     (source
+      (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/atomnuker/wlstream.git")
+             (commit commit)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "01qbcgfl3g9kfwn1jf1z9pdj3bvf5lmg71d1vwkcllc2az24bjqp"))))
+     (build-system meson-build-system)
+     (native-inputs `(("libdrm" ,libdrm)
+                      ("pkg-config" ,pkg-config)))
+     (inputs `(("ffmpeg" ,ffmpeg)
+               ("pulseaudio" ,pulseaudio)
+               ("wayland" ,wayland)
+               ("wayland-protocols" ,wayland-protocols)))
+     (home-page "https://github.com/atomnuker/wlstream")
+     (synopsis "Screen capture tool for Wayland sessions")
+     (description "Wlstream is a screen capture tool for recording audio and
+video from a Wayland session.")
+     (license license:lgpl2.1+))))
-- 
2.20.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#33902] [PATCH] gnu: Add wlstream.

[Ludovic Courtès]

Hello Rutger,

Rutger Helling <rhelling@mykolab.com> skribis:

> From b38bdecd0dee379f50241092aab2be4b69606209 Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Fri, 28 Dec 2018 20:15:22 +0100
> Subject: [PATCH 1/2] gnu: ffmpeg: Add libdrm support.
>
> * gnu/packages/video.scm (ffmpeg): Add libdrm support.

[...]

> From 5d18a851060605deee53c275159a6d37bfc0b007 Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Sat, 29 Dec 2018 16:17:59 +0100
> Subject: [PATCH 2/2] gnu: Add wlstream.
>
> * gnu/packages/video.scm (wlstream): New variable.

Both LGTM!

> +(define-public wlstream
> +  (let ((commit "182076a94562b128c3a97ecc53cc68905ea86838")
> +        (revision "1"))
> +    (package
> +     (name "wlstream")
       ^

We usually add an extra space here.  Did you try running
./etc/indent-code.el on your packages?  Or is it too inconvenient?

Thanks,
Ludo’.

bug#33902: [PATCH] gnu: Add wlstream.

[Rutger Helling]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

Thanks for the review, pushed with fixed indentation.

I'll make sure to double check with ./etc/indent-code.el from now on.

On Wed, 09 Jan 2019 16:41:31 +0100
Ludovic Courtès <ludo@gnu.org> wrote:

> Hello Rutger,
> 
> Rutger Helling <rhelling@mykolab.com> skribis:
> 
> > From b38bdecd0dee379f50241092aab2be4b69606209 Mon Sep 17 00:00:00
> > 2001 From: Rutger Helling <rhelling@mykolab.com>
> > Date: Fri, 28 Dec 2018 20:15:22 +0100
> > Subject: [PATCH 1/2] gnu: ffmpeg: Add libdrm support.
> >
> > * gnu/packages/video.scm (ffmpeg): Add libdrm support.  
> 
> [...]
> 
> > From 5d18a851060605deee53c275159a6d37bfc0b007 Mon Sep 17 00:00:00
> > 2001 From: Rutger Helling <rhelling@mykolab.com>
> > Date: Sat, 29 Dec 2018 16:17:59 +0100
> > Subject: [PATCH 2/2] gnu: Add wlstream.
> >
> > * gnu/packages/video.scm (wlstream): New variable.  
> 
> Both LGTM!
> 
> > +(define-public wlstream
> > +  (let ((commit "182076a94562b128c3a97ecc53cc68905ea86838")
> > +        (revision "1"))
> > +    (package
> > +     (name "wlstream")  
>        ^
> 
> We usually add an extra space here.  Did you try running
> ./etc/indent-code.el on your packages?  Or is it too inconvenient?
> 
> Thanks,
> Ludo’.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#33902] [PATCH] gnu: Add wlstream.

[Ludovic Courtès]

Rutger Helling <rhelling@mykolab.com> skribis:

> Thanks for the review, pushed with fixed indentation.

Thank you.

> I'll make sure to double check with ./etc/indent-code.el from now on.

You shouldn’t lose your hair on it obviously, but if indent-code.el
works well for you, that’d be great.  (We could also add config snippets
for your editor in the repo, if you know what it would take to customize
its indentation facility.)

Ludo’.

[bug#33902] [PATCH] gnu: Add wlstream.

[Rutger Helling]

[-- Attachment #1: Type: text/plain, Size: 726 bytes --]

I'm actually using Emacs (with Evil :) ). I think I might have been
using an old version of indent-code.el. I'll see what happens in the
future.

On Thu, 10 Jan 2019 09:54:42 +0100
Ludovic Courtès <ludo@gnu.org> wrote:

> Rutger Helling <rhelling@mykolab.com> skribis:
> 
> > Thanks for the review, pushed with fixed indentation.  
> 
> Thank you.
> 
> > I'll make sure to double check with ./etc/indent-code.el from now
> > on.  
> 
> You shouldn’t lose your hair on it obviously, but if indent-code.el
> works well for you, that’d be great.  (We could also add config
> snippets for your editor in the repo, if you know what it would take
> to customize its indentation facility.)
> 
> Ludo’.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]