[bug#29115] [PATCH] gnu: mpv: enable Wayland support.

[bug#29115] [PATCH] gnu: mpv: enable Wayland support.

[Rutger Helling]

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

Hey Guix, 

this patch enables Wayland support for mpv.

[-- Attachment #1.2: Type: text/html, Size: 268 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-PATCH-gnu-mpv-enable-Wayland-support.patch --]
[-- Type: text/x-diff; name=0001-PATCH-gnu-mpv-enable-Wayland-support.patch, Size: 1584 bytes --]

From b18aa7cb448116c689306c07fccec32afc84dc4b Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 2 Nov 2017 10:19:45 +0100
Subject: [PATCH] gnu: mpv: enable Wayland support.

* gnu/packages/video.scm (mpv)[inputs]: Add wayland, wayland-protocols and libxkbcommon.
---
 gnu/packages/video.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index e66a30a82..47653f8dc 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
 ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
+;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1006,7 +1007,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
      `(("perl" ,perl) ; for zsh completion file
        ("pkg-config" ,pkg-config)
        ("python-docutils" ,python-docutils)))
-    ;; Missing features: libguess, Wayland, V4L2
+    ;; Missing features: libguess, V4L2
     (inputs
      `(("alsa-lib" ,alsa-lib)
        ("enca" ,enca)
@@ -1038,6 +1039,9 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
        ("pulseaudio" ,pulseaudio)
        ("rsound" ,rsound)
        ("waf" ,python-waf)
+       ("wayland" ,wayland)
+       ("wayland-protocols" ,wayland-protocols)
+       ("libxkbcommon", libxkbcommon)
        ("youtube-dl" ,youtube-dl)
        ("zlib" ,zlib)))
     (arguments
-- 
2.15.0

[bug#29115] [PATCH] gnu: mpv: enable Wayland support.

[Leo Famulari]

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

On Thu, Nov 02, 2017 at 10:23:15AM +0100, Rutger Helling wrote:
> Hey Guix, 
> 
> this patch enables Wayland support for mpv.

> From b18aa7cb448116c689306c07fccec32afc84dc4b Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Thu, 2 Nov 2017 10:19:45 +0100
> Subject: [PATCH] gnu: mpv: enable Wayland support.
> 
> * gnu/packages/video.scm (mpv)[inputs]: Add wayland, wayland-protocols and libxkbcommon.

Thanks!

>         ("pulseaudio" ,pulseaudio)
>         ("rsound" ,rsound)
>         ("waf" ,python-waf)
> +       ("wayland" ,wayland)
> +       ("wayland-protocols" ,wayland-protocols)
> +       ("libxkbcommon", libxkbcommon)

I tried `guix gc --reference $(./pre-inst-env guix build mpv)`, and it
doesn't keep a reference to wayland-protocols. Also, without
wayland-protocols, it does still build for Wayland, according to the
configure phase.

Do you think we can omit wayland-protocols from the set of inputs?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#29115] [PATCH] gnu: mpv: enable Wayland support.

[Rutger Helling]

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

On 2017-11-02 18:52, Rutger Helling wrote:

> Hey Leo, 
> 
> you're right, it works fine without wayland-protocols. Here's an updated patch without it. 
> 
> On 2017-11-02 18:24, Leo Famulari wrote: 
> On Thu, Nov 02, 2017 at 10:23:15AM +0100, Rutger Helling wrote: Hey Guix, 
> 
> this patch enables Wayland support for mpv. 
> From b18aa7cb448116c689306c07fccec32afc84dc4b Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Thu, 2 Nov 2017 10:19:45 +0100
> Subject: [PATCH] gnu: mpv: enable Wayland support.
> 
> * gnu/packages/video.scm (mpv)[inputs]: Add wayland, wayland-protocols and libxkbcommon. 
> Thanks!
> 
> ("pulseaudio" ,pulseaudio)
> ("rsound" ,rsound)
> ("waf" ,python-waf)
> +       ("wayland" ,wayland)
> +       ("wayland-protocols" ,wayland-protocols)
> +       ("libxkbcommon", libxkbcommon) 
> I tried `guix gc --reference $(./pre-inst-env guix build mpv)`, and it
> doesn't keep a reference to wayland-protocols. Also, without
> wayland-protocols, it does still build for Wayland, according to the
> configure phase.
> 
> Do you think we can omit wayland-protocols from the set of inputs?

[-- Attachment #2: Type: text/html, Size: 2369 bytes --]

[bug#29115] [PATCH] gnu: mpv: enable Wayland support.

[Leo Famulari]

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

On Thu, Nov 02, 2017 at 06:52:58PM +0100, Rutger Helling wrote:
> Hey Leo, 
> 
> you're right, it works fine without wayland-protocols. Here's an updated
> patch without it. 

Great! I pushed the updated patch as
3440f12a7ee65692c809a8fa867c25c317e1e4e6

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]