[PATCH 1/7] gnu: Add usbredir.

[PATCH 1/7] gnu: Add usbredir.

[David Craven]

* gnu/local.mk: Add file.
* gnu/packages/spice.scm: Add file.
---
 gnu/local.mk           |  1 +
 gnu/packages/spice.scm | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 gnu/packages/spice.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index 5e32d87..314376a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -315,6 +315,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/slim.scm				\
   %D%/packages/smalltalk.scm			\
   %D%/packages/speech.scm			\
+  %D%/packages/spice.scm			\
   %D%/packages/ssh.scm				\
   %D%/packages/stalonetray.scm			\
   %D%/packages/statistics.scm			\
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
new file mode 100644
index 0000000..3c81a93
--- /dev/null
+++ b/gnu/packages/spice.scm
@@ -0,0 +1,33 @@
+(define-module (gnu packages spice)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages libusb)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix packages)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix utils))
+
+(define-public usbredir
+  (package
+    (name "usbredir")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://spice-space.org/download/usbredir/"
+                "usbredir-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("libusb" ,libusb)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (synopsis "Libraries to help implementing support for usbredir")
+    (description "Usbredir is a protocol for redirection USB traffic from a
+single USB device, to a different (virtual) machine then the one to which the
+USB device is attached.")
+    (home-page "http://www.spice-space.org")
+    (license license:gpl2)))
-- 
2.9.0

[PATCH 2/7] gnu: Add virglrenderer.

[David Craven]

* gnu/packages/spice.scm: Add it.
---
 gnu/packages/spice.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 3c81a93..8979d32 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -1,6 +1,8 @@
 (define-module (gnu packages spice)
   #:use-module (gnu packages)
+  #:use-module (gnu packages gl)
   #:use-module (gnu packages libusb)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
@@ -31,3 +33,28 @@ single USB device, to a different (virtual) machine then the one to which the
 USB device is attached.")
     (home-page "http://www.spice-space.org")
     (license license:gpl2)))
+
+(define-public virglrenderer
+  (package
+    (name "virglrenderer")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "https://www.freedesktop.org/software/virgl/"
+                "virglrenderer-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1dj0j8nbyr7nrpds4dqlp43ji8ixjyqhgw6ywlz1r9dn6cs5m5d1"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libepoxy" ,libepoxy)
+        ("mesa" ,mesa)
+        ("udev" ,eudev)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (synopsis "Virtual 3D GPU library")
+    (description "A virtual 3D GPU library, that allows the guest operating
+system to use the host GPU to accelerate 3D rendering")
+    (home-page "https://virgil3d.github.io")
+    (license license:expat)))
-- 
2.9.0

[PATCH 3/7] gnu: Add spice-protocol.

[David Craven]

* gnu/packages/spice.scm: Add it.
---
 gnu/packages/spice.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 8979d32..b571818 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -58,3 +58,23 @@ USB device is attached.")
 system to use the host GPU to accelerate 3D rendering")
     (home-page "https://virgil3d.github.io")
     (license license:expat)))
+
+(define-public spice-protocol
+  (package
+    (name "spice-protocol")
+    (version "0.12.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://www.spice-space.org/download/releases/"
+                "spice-protocol-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0c33kg3vdz3nnl2wjfbgmszz5hbjbvsw6map35dj9hxnpwwf9fi2"))))
+    (build-system gnu-build-system)
+    (synopsis "Protocol headers for the SPICE protocol")
+    (description "SPICE (the Simple Protocol for Independent Computing
+Environments) is a remote-display system built for virtual environments
+which allows users to view a computing desktop environment.")
+    (home-page "http://www.spice-space.org")
+    (license license:gpl2)))
-- 
2.9.0

[PATCH 4/7] gnu: Add spice-gtk.

[David Craven]

* gnu/packages/spice.scm: Add it.
---
 gnu/packages/spice.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index b571818..aa331db 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -1,9 +1,21 @@
 (define-module (gnu packages spice)
   #:use-module (gnu packages)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages xiph)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
   #:use-module (guix packages)
@@ -78,3 +90,62 @@ Environments) is a remote-display system built for virtual environments
 which allows users to view a computing desktop environment.")
     (home-page "http://www.spice-space.org")
     (license license:gpl2)))
+
+(define-public spice-gtk
+  (package
+    (name "spice-gtk")
+    (version "0.32")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://spice-space.org/download/gtk/"
+                "spice-gtk-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "00pf94xh2xf0h1g13lnavxrysd0d0x22l5jl108cvq1mjc4z8j2c"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("gstreamer" ,gstreamer)
+        ("gst-libav" ,gst-libav)
+        ("gst-plugins-base" ,gst-plugins-base)
+        ("gst-plugins-good" ,gst-plugins-good)
+        ("gst-plugins-bad" ,gst-plugins-bad)
+        ("gst-plugins-ugly" ,gst-plugins-ugly)
+        ("spice-protocol" ,spice-protocol)))
+    (inputs
+      `(("glib-networking" ,glib-networking)
+        ("gtk+" ,gtk+)
+        ("libepoxy" ,libepoxy)
+        ("libjpeg" ,libjpeg)
+        ("libxcb" ,libxcb)
+        ("lz4" ,lz4)
+        ("mesa" ,mesa)
+        ("pixman" ,pixman)
+        ("pulseaudio" ,pulseaudio)
+        ("python" ,python)
+        ("openssl" ,openssl)
+        ("opus" ,opus)
+        ("usbredir" ,usbredir)))
+    (native-inputs
+      `(("glib:bin" ,glib "bin")
+        ("intltool" ,intltool)
+        ("pkg-config" ,pkg-config)))
+    (arguments
+      `(#:configure-flags
+        '("--enable-gstaudio"
+          "--enable-gstvideo"
+          "--enable-pulse")
+        #:phases
+         (modify-phases %standard-phases
+           (add-after
+            'install 'wrap-spicy
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out             (assoc-ref outputs "out"))
+                    (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+                (wrap-program (string-append out "/bin/spicy")
+                  `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))
+              #t)))))
+    (synopsis "Gtk client and libraries for SPICE remote desktop servers")
+    (description "Gtk client and libraries for SPICE remote desktop servers.")
+    (home-page "http://www.spice-space.org")
+    (license license:gpl2)))
-- 
2.9.0

[PATCH 5/7] gnu: Add spice.

[David Craven]

* gnu/packages/spice.scm: Add it.
---
 gnu/packages/spice.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index aa331db..ccecb23 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -149,3 +149,43 @@ which allows users to view a computing desktop environment.")
     (description "Gtk client and libraries for SPICE remote desktop servers.")
     (home-page "http://www.spice-space.org")
     (license license:gpl2)))
+
+(define-public spice
+  (package
+    (name "spice")
+    (version "0.13.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://www.spice-space.org/download/releases/"
+                "spice-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "18hxk47z58cqbix5h477qmvcdmsrwzv984jw4c6fj0ns4h217jwy"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("openssl" ,openssl)
+        ("pixman" ,pixman)
+        ("spice-protocol" ,spice-protocol)))
+    (inputs
+      `(("glib" ,glib)
+        ("libjpeg" ,libjpeg)
+        ("lz4" ,lz4)
+        ("opus" ,opus)
+        ("python" ,python)
+        ("spice-gtk" ,spice-gtk)
+        ("zlib" ,zlib)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (arguments
+      `(#:configure-flags
+        '("--disable-celt051"
+          "--enable-lz4"
+          "--enable-automated-tests")))
+    (synopsis "Server implementation of the SPICE protocol")
+    (description "SPICE is a remote display system built for virtual
+environments which allows you to view a computing 'desktop' environment
+not only on the machine where it is running, but from anywhere on the
+Internet and from a wide variety of machine architectures.")
+    (home-page "http://www.spice-space.org")
+    (license license:gpl2)))
-- 
2.9.0

[PATCH 6/7] gnu: Add spice-vdagent.

[David Craven]

* gnu/packages/spice.scm: Add it.
* gnu/packages/patches/spice-vdagent-localstatedir.patch: Add it.
---
 .../patches/spice-vdagent-localstatedir.patch      | 13 ++++++++
 gnu/packages/spice.scm                             | 35 ++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 gnu/packages/patches/spice-vdagent-localstatedir.patch

diff --git a/gnu/packages/patches/spice-vdagent-localstatedir.patch b/gnu/packages/patches/spice-vdagent-localstatedir.patch
new file mode 100644
index 0000000..0d0881c
--- /dev/null
+++ b/gnu/packages/patches/spice-vdagent-localstatedir.patch
@@ -0,0 +1,13 @@
+Allow mkdir localstatedir to fail.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1412,7 +1412,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-gdmautostart2DATA \
+
+
+ install-data-local:
+-	$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd
++	-$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index ccecb23..182e76b 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -189,3 +189,38 @@ not only on the machine where it is running, but from anywhere on the
 Internet and from a wide variety of machine architectures.")
     (home-page "http://www.spice-space.org")
     (license license:gpl2)))
+
+(define-public spice-vdagent
+  (package
+    (name "spice-vdagent")
+    (version "0.17.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://www.spice-space.org/download/releases/"
+                "spice-vdagent-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0gdkyylyg1hksg0i0anvznqfli2q39335fnrmcd6847frpc8njpi"))
+              (patches (search-patches "spice-vdagent-localstatedir.patch"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("alsa-lib" ,alsa-lib)
+        ("dbus" ,dbus)
+        ("glib" ,glib)
+        ("libpciaccess" ,libpciaccess)
+        ("libx11" ,libx11)
+        ("libxext" ,libxext)
+        ("libxfixes" ,libxfixes)
+        ("libxinerama" ,libxinerama)
+        ("libxrandr" ,libxrandr)
+        ("spice-protocol" ,spice-protocol)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (arguments
+     '(#:configure-flags '("--localstatedir=/var")))
+    (synopsis "Spice agent for linux")
+    (description "Enables sharing the clipboard and guest display resolution
+scaling on graphical console window resize.")
+    (home-page "http://www.spice-space.org")
+    (license license:gpl2)))
-- 
2.9.0

[PATCH 7/7] gnu: Add virt-viewer.

[David Craven]

* gnu/packages/spice.scm: Add it.
---
 gnu/packages/spice.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 182e76b..7bbe0a1 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -9,6 +9,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
@@ -16,6 +17,7 @@
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xiph)
+  #:use-module (gnu packages xml)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
   #:use-module (guix packages)
@@ -224,3 +226,46 @@ Internet and from a wide variety of machine architectures.")
 scaling on graphical console window resize.")
     (home-page "http://www.spice-space.org")
     (license license:gpl2)))
+
+(define-public virt-viewer
+  (package
+    (name "virt-viewer")
+    (version "4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "https://virt-manager.org/download/sources/virt-viewer/"
+                "virt-viewer-" version ".tar.gz"))
+              (sha256
+               (base32
+                "07zsi1fqg05mag1ayniaqj25fzb6dxg76d4ka5196lq4l477nhhw"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("gtk+" ,gtk+)
+        ("libcap" ,libcap)
+        ("libxml2" ,libxml2)
+        ("openssl" ,openssl)
+        ("perl" ,perl)
+        ("spice-gtk" ,spice-gtk)))
+    (native-inputs
+      `(("glib:bin" ,glib "bin")
+        ("intltool" ,intltool)
+        ("pkg-config" ,pkg-config)))
+    (arguments
+      `(#:configure-flags
+        '("--with-spice-gtk")
+        #:phases
+         (modify-phases %standard-phases
+           (add-after
+            'install 'wrap-remote-viewer
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out             (assoc-ref outputs "out"))
+                    (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+                (wrap-program (string-append out "/bin/remote-viewer")
+                  `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))
+              #t)))))
+    (synopsis "Graphical console client for virtual machines")
+    (description "Graphical console client for virtual machines using spice or
+vnc.")
+    (home-page "https://virt-manager.org")
+    (license license:gpl2)))
-- 
2.9.0

Re: [PATCH 1/7] gnu: Add usbredir.

[Leo Famulari]

Thank you for these patches!

On Sat, Jul 23, 2016 at 03:18:53PM +0200, David Craven wrote:
> * gnu/local.mk: Add file.
> * gnu/packages/spice.scm: Add file.

> +    (license license:gpl2)))

I believe this source code is actually gpl2+, lgpl2+, and lgpl2.1+,
based on the copyright notices in the files.

I will change this when before I push the patch to Savannah. There's no
need to send a revised patch.

Re: [PATCH 2/7] gnu: Add virglrenderer.

[Leo Famulari]

On Sat, Jul 23, 2016 at 03:18:54PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.

> +(define-public virglrenderer

> +    (inputs
> +      `(("libepoxy" ,libepoxy)
> +        ("mesa" ,mesa)
> +        ("udev" ,eudev)))
> +    (native-inputs
> +      `(("pkg-config" ,pkg-config)))

I noticed the output has the following refernces:

$ guix gc --references $(./pre-inst-env guix build virglrenderer)
[...]
/gnu/store/35d9mmbdfk7fsgjwralbws88nm2d50qd-virglrenderer-0.5.0
/gnu/store/8m00x5x8ykmar27s9248cmhnkdb2n54a-glibc-2.22
/gnu/store/asr3mf4chdyadyqx8ml6jgvsa16s8j42-libepoxy-1.2
/gnu/store/lnrclizlj6kj5dag7f6fgc68nqybb941-mesa-11.0.9
/gnu/store/lp7dg7avv90rfdvis6hwbbwkxaqcx044-expat-2.1.0
/gnu/store/rhms73ac93maz7gxf8s00l9aj7ikwlx7-libdrm-2.4.65
/gnu/store/v39bh3ln3ncnzhyw0kd12d46kww9747v-gcc-4.9.3-lib

What do you think? Will it be a problem that virglrenderer will not know
how to find eudev?

And what about expat and libdrm? Should those be added to 'inputs',
since they are referred to by the virglrenderer shared library?

> +    (license license:expat)))

There is also some bsd-3 code.

And, it bundles something called Gallium, which is expat licensed. Do
you think this is something that should be packaged separately?

Re: [PATCH 3/7] gnu: Add spice-protocol.

[Leo Famulari]

On Sat, Jul 23, 2016 at 03:18:55PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.

> +(define-public spice-protocol

> +    (license license:gpl2)))

It appears to be a mix of bsd-3 and lgpl2.1+. Otherwise LGTM, and I can
fix the license myself.

Re: [PATCH 4/7] gnu: Add spice-gtk.

[Leo Famulari]

On Sat, Jul 23, 2016 at 03:18:56PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.

> +(define-public spice-gtk

> +    (propagated-inputs
> +      `(("gstreamer" ,gstreamer)
> +        ("gst-libav" ,gst-libav)
> +        ("gst-plugins-base" ,gst-plugins-base)
> +        ("gst-plugins-good" ,gst-plugins-good)
> +        ("gst-plugins-bad" ,gst-plugins-bad)
> +        ("gst-plugins-ugly" ,gst-plugins-ugly)
> +        ("spice-protocol" ,spice-protocol)))

Can you say why these are propagated?

> +    (license license:gpl2)))

It appears to be licensed under the lgpl2.1+, which some files under the
lgpl2.0+.

Re: [PATCH 5/7] gnu: Add spice.

[Leo Famulari]

On Sat, Jul 23, 2016 at 03:18:57PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.

> +(define-public spice

> +    (propagated-inputs
> +      `(("openssl" ,openssl)
> +        ("pixman" ,pixman)
> +        ("spice-protocol" ,spice-protocol)))

Same questions as with the previous patch. Do these need to be
propagated?

> +    (inputs
> +      `(("glib" ,glib)
> +        ("libjpeg" ,libjpeg)
> +        ("lz4" ,lz4)
> +        ("opus" ,opus)
> +        ("python" ,python)
> +        ("spice-gtk" ,spice-gtk)
> +        ("zlib" ,zlib)))

The built package is missing references to python and spice-gtk. Do you
think that's a problem? Are they needed?

> +      `(#:configure-flags
> +        '("--disable-celt051" 

Would a comment like "Disable support for unpackaged audio codec"
explain this flag?

> +    (license license:gpl2)))

Released under lgpl2.1+ with a few lgpl2.0+ files.

Re: [PATCH 6/7] gnu: Add spice-vdagent.

[Leo Famulari]

On Sat, Jul 23, 2016 at 03:18:58PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.
> * gnu/packages/patches/spice-vdagent-localstatedir.patch: Add it.

I will move this patch into a build phase, with a substitution, if you
don't mind. That way, it will not affect `guix build --source
spice-vdagent`, and will be right there in the package definition for
future readers.

> +(define-public spice-vdagent

> +    (inputs
> +      `(("alsa-lib" ,alsa-lib)
> +        ("dbus" ,dbus)
> +        ("glib" ,glib)
> +        ("libpciaccess" ,libpciaccess)
> +        ("libx11" ,libx11)
> +        ("libxext" ,libxext)
> +        ("libxfixes" ,libxfixes)
> +        ("libxinerama" ,libxinerama)
> +        ("libxrandr" ,libxrandr)
> +        ("spice-protocol" ,spice-protocol)))

The built output lacks a reference to spice-protocol. Do you think it's
a problem if spice-vdagent can't find spice-protocol at run-time?

> +    (license license:gpl2)))

This package appears to be gpl3+.

Re: [PATCH 7/7] gnu: Add virt-viewer.

[Leo Famulari]

On Sat, Jul 23, 2016 at 03:18:59PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.

> +(define-public virt-viewer

> +    (inputs
> +      `(("gtk+" ,gtk+)
> +        ("libcap" ,libcap)
> +        ("libxml2" ,libxml2)
> +        ("openssl" ,openssl)
> +        ("perl" ,perl)
> +        ("spice-gtk" ,spice-gtk)))

I noticed that the output did not refer to perl. virt-viewer builds
successfully without it. Do you think it's okay to remove it from this
list?

> +    (license license:gpl2)))

It is gpl2+.

Re: [PATCH 2/7] gnu: Add virglrenderer.

[David Craven]

Alot of the dependencies I had to add was because of stuff like this:

> Package 'libudev', required by 'gbm', not found

Is there a better way then adding libudev as a dependency? I don't
know why pkg-config checks for dependencies of dependencies, that's
kind of weird...

I couldn't find any information regarding gallium, but see it in the
source tree. Is it part of mesa that was copied/modified? I think that
in that case they are probably still working on upstreaming the
changes and don't think we have to bother making it a separate
package.

Re: [PATCH 4/7] gnu: Add spice-gtk.

[David Craven]

> Can you say why these are propagated?

spice-protocol shouldn't be progagated. I propagated the gstreamer
plugins so that the 'wrap-remote-viewer phase in the virt-viewer
package works. I didn't want to add them to virt-viewer since which
plugins are needed can depend on the configure-flags of the spice-gtk
build.

Re: [PATCH 5/7] gnu: Add spice.

[David Craven]

> Same questions as with the previous patch. Do these need to be
> propagated?

These are propagated because again I was getting pkg-config errors in
other packages saying openssl is needed by spice and wasn't found.
Maybe there's a better solution. What do you suggest?

> The built package is missing references to python and spice-gtk. Do you
> think that's a problem? Are they needed?

Spice-gtk and python are required by the --enable-automated-tests flag.

> Would a comment like "Disable support for unpackaged audio codec"
> explain this flag?

Yes. celt is a really old and I think unmaintained package, opus is
the 'cool' codec. I don't know why this is still a default configure
option.

Re: [PATCH 6/7] gnu: Add spice-vdagent.

[David Craven]

> The built output lacks a reference to spice-protocol. Do you think it's
> a problem if spice-vdagent can't find spice-protocol at run-time?

I think spice-protocol only contains headers so no I don't think this
is a problem.

Re: [PATCH 7/7] gnu: Add virt-viewer.

[David Craven]

> I noticed that the output did not refer to perl. virt-viewer builds
> successfully without it. Do you think it's okay to remove it from this
> list?

Can't remember why I added perl as a dependency. I think it's ok to
remove it.

> It is gpl2+.

I'll read the licenses more carefully next time.

Re: [PATCH 4/7] gnu: Add spice-gtk.

[David Craven]

What are valid reasons to propagate inputs?

Re: [PATCH 4/7] gnu: Add spice-gtk.

[Leo Famulari]

On Sun, Jul 24, 2016 at 01:34:13PM +0200, David Craven wrote:
> What are valid reasons to propagate inputs?

Ideally, dependencies can be found by their callers with an absolute
path to /gnu/store/...-foo. But, some software lacks this facility, and
can only find dependencies in the environment, for example on $PATH.

So, when a user installs the calling application into their profile,
propagated-inputs are installed along with it. So, with
~/.guix-profile/bin on the user's PATH, the dependencies are also on
$PATH. This increases the number of potential conflicts in the profile,
so we try to avoid propagating when we can. This is why I asked about
the propagated-inputs in your packages.

Wrappers can be used to avoid propagating in some cases. For example,
the python-build-system wraps all executables with a $PYTHONPATH
containing a list of absolute paths in /gnu/store. You can look at the
store directory of some Python package to see the wrappers.

I'll be happy if someone can correct any inaccuracies in this
explanation :) It's still a bit cloudy for me.

[PATCH 1/7] gnu: Add usbredir.

[David Craven]

* gnu/local.mk: Add file.
* gnu/packages/spice.scm: Add file.
---
 gnu/local.mk           |  1 +
 gnu/packages/spice.scm | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 gnu/packages/spice.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index 5e32d87..314376a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -315,6 +315,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/slim.scm				\
   %D%/packages/smalltalk.scm			\
   %D%/packages/speech.scm			\
+  %D%/packages/spice.scm			\
   %D%/packages/ssh.scm				\
   %D%/packages/stalonetray.scm			\
   %D%/packages/statistics.scm			\
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
new file mode 100644
index 0000000..c0cec99
--- /dev/null
+++ b/gnu/packages/spice.scm
@@ -0,0 +1,33 @@
+(define-module (gnu packages spice)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages libusb)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix packages)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix utils))
+
+(define-public usbredir
+  (package
+    (name "usbredir")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://spice-space.org/download/usbredir/"
+                "usbredir-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libusb" ,libusb)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (synopsis "Libraries to help implementing support for usbredir")
+    (description "Usbredir is a protocol for redirection USB traffic from a
+single USB device, to a different (virtual) machine then the one to which the
+USB device is attached.")
+    (home-page "http://www.spice-space.org")
+    (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+))))
-- 
2.9.0

[PATCH 2/7] gnu: Add virglrenderer.

[David Craven]

* gnu/packages/spice.scm: Add it.
---
 gnu/packages/spice.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index c0cec99..b3d795b 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -1,6 +1,8 @@
 (define-module (gnu packages spice)
   #:use-module (gnu packages)
+  #:use-module (gnu packages gl)
   #:use-module (gnu packages libusb)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
@@ -31,3 +33,30 @@ single USB device, to a different (virtual) machine then the one to which the
 USB device is attached.")
     (home-page "http://www.spice-space.org")
     (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+))))
+
+(define-public virglrenderer
+  (package
+    (name "virglrenderer")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "https://www.freedesktop.org/software/virgl/"
+                "virglrenderer-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1dj0j8nbyr7nrpds4dqlp43ji8ixjyqhgw6ywlz1r9dn6cs5m5d1"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("expat" ,expat)
+        ("libdrm" ,libdrm)
+        ("libepoxy" ,libepoxy)
+        ("mesa" ,mesa)
+        ("udev" ,eudev)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (synopsis "Virtual 3D GPU library")
+    (description "A virtual 3D GPU library, that allows the guest operating
+system to use the host GPU to accelerate 3D rendering")
+    (home-page "https://virgil3d.github.io")
+    (license (list license:expat license:bsd-3))))
-- 
2.9.0

[PATCH 3/7] gnu: Add spice-protocol.

[David Craven]

* gnu/packages/spice.scm: Add it.
---
 gnu/packages/spice.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index b3d795b..6c6fbed 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -60,3 +60,23 @@ USB device is attached.")
 system to use the host GPU to accelerate 3D rendering")
     (home-page "https://virgil3d.github.io")
     (license (list license:expat license:bsd-3))))
+
+(define-public spice-protocol
+  (package
+    (name "spice-protocol")
+    (version "0.12.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://www.spice-space.org/download/releases/"
+                "spice-protocol-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0c33kg3vdz3nnl2wjfbgmszz5hbjbvsw6map35dj9hxnpwwf9fi2"))))
+    (build-system gnu-build-system)
+    (synopsis "Protocol headers for the SPICE protocol")
+    (description "SPICE (the Simple Protocol for Independent Computing
+Environments) is a remote-display system built for virtual environments
+which allows users to view a computing desktop environment.")
+    (home-page "http://www.spice-space.org")
+    (license (list license:bsd-3 license:lgpl2.1+))))
-- 
2.9.0

[PATCH 4/7] gnu: Add spice-gtk.

[David Craven]

* gnu/packages/spice.scm: Add it.
---
 gnu/packages/spice.scm | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 6c6fbed..ee29f08 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -1,9 +1,21 @@
 (define-module (gnu packages spice)
   #:use-module (gnu packages)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages xiph)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
   #:use-module (guix packages)
@@ -80,3 +92,63 @@ Environments) is a remote-display system built for virtual environments
 which allows users to view a computing desktop environment.")
     (home-page "http://www.spice-space.org")
     (license (list license:bsd-3 license:lgpl2.1+))))
+
+(define-public spice-gtk
+  (package
+    (name "spice-gtk")
+    (version "0.32")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://spice-space.org/download/gtk/"
+                "spice-gtk-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "00pf94xh2xf0h1g13lnavxrysd0d0x22l5jl108cvq1mjc4z8j2c"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("gstreamer" ,gstreamer)
+        ("gst-libav" ,gst-libav)
+        ("gst-plugins-base" ,gst-plugins-base)
+        ("gst-plugins-good" ,gst-plugins-good)
+        ("gst-plugins-bad" ,gst-plugins-bad)
+        ("gst-plugins-ugly" ,gst-plugins-ugly)))
+    (inputs
+      `(("glib-networking" ,glib-networking)
+        ("gtk+" ,gtk+)
+        ("libepoxy" ,libepoxy)
+        ("libjpeg" ,libjpeg)
+        ("libusb" ,libusb)
+        ("libxcb" ,libxcb)
+        ("lz4" ,lz4)
+        ("mesa" ,mesa)
+        ("pixman" ,pixman)
+        ("pulseaudio" ,pulseaudio)
+        ("python" ,python)
+        ("openssl" ,openssl)
+        ("opus" ,opus)
+        ("spice-protocol" ,spice-protocol)
+        ("usbredir" ,usbredir)))
+    (native-inputs
+      `(("glib:bin" ,glib "bin")
+        ("intltool" ,intltool)
+        ("pkg-config" ,pkg-config)))
+    (arguments
+      `(#:configure-flags
+        '("--enable-gstaudio"
+          "--enable-gstvideo"
+          "--enable-pulse")
+        #:phases
+         (modify-phases %standard-phases
+           (add-after
+            'install 'wrap-spicy
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out             (assoc-ref outputs "out"))
+                    (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+                (wrap-program (string-append out "/bin/spicy")
+                  `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))
+              #t)))))
+    (synopsis "Gtk client and libraries for SPICE remote desktop servers")
+    (description "Gtk client and libraries for SPICE remote desktop servers.")
+    (home-page "http://www.spice-space.org")
+    (license (list license:lgpl2.1+ license:lgpl2.0+))))
-- 
2.9.0

[PATCH 5/7] gnu: Add spice.

[David Craven]

* gnu/packages/spice.scm: Add it.
---
 gnu/packages/spice.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index ee29f08..365385e 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -152,3 +152,42 @@ which allows users to view a computing desktop environment.")
     (description "Gtk client and libraries for SPICE remote desktop servers.")
     (home-page "http://www.spice-space.org")
     (license (list license:lgpl2.1+ license:lgpl2.0+))))
+
+(define-public spice
+  (package
+    (name "spice")
+    (version "0.13.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://www.spice-space.org/download/releases/"
+                "spice-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "18hxk47z58cqbix5h477qmvcdmsrwzv984jw4c6fj0ns4h217jwy"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("glib" ,glib)
+        ("libjpeg" ,libjpeg)
+        ("lz4" ,lz4)
+        ("openssl" ,openssl)
+        ("opus" ,opus)
+        ("pixman" ,pixman)
+        ("spice-protocol" ,spice-protocol)
+        ("zlib" ,zlib)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)
+        ("python" ,python)
+        ("spice-gtk" ,spice-gtk)))
+    (arguments
+      `(#:configure-flags
+        '("--disable-celt051" ;; Disable support for unpackaged audio codec
+          "--enable-lz4"
+          "--enable-automated-tests")))
+    (synopsis "Server implementation of the SPICE protocol")
+    (description "SPICE is a remote display system built for virtual
+environments which allows you to view a computing 'desktop' environment
+not only on the machine where it is running, but from anywhere on the
+Internet and from a wide variety of machine architectures.")
+    (home-page "http://www.spice-space.org")
+    (license (list license:lgpl2.1+ license:lgpl2.0+))))
-- 
2.9.0

[PATCH 6/7] gnu: Add spice-vdagent.

[David Craven]

* gnu/packages/spice.scm: Add it.
* gnu/packages/patches/spice-vdagent-localstatedir.patch: Add it.
---
 .../patches/spice-vdagent-localstatedir.patch      | 13 ++++++++
 gnu/packages/spice.scm                             | 35 ++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 gnu/packages/patches/spice-vdagent-localstatedir.patch

diff --git a/gnu/packages/patches/spice-vdagent-localstatedir.patch b/gnu/packages/patches/spice-vdagent-localstatedir.patch
new file mode 100644
index 0000000..0d0881c
--- /dev/null
+++ b/gnu/packages/patches/spice-vdagent-localstatedir.patch
@@ -0,0 +1,13 @@
+Allow mkdir localstatedir to fail.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1412,7 +1412,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-gdmautostart2DATA \
+
+
+ install-data-local:
+-	$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd
++	-$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 365385e..e78bdef 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -191,3 +191,38 @@ not only on the machine where it is running, but from anywhere on the
 Internet and from a wide variety of machine architectures.")
     (home-page "http://www.spice-space.org")
     (license (list license:lgpl2.1+ license:lgpl2.0+))))
+
+(define-public spice-vdagent
+  (package
+    (name "spice-vdagent")
+    (version "0.17.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "http://www.spice-space.org/download/releases/"
+                "spice-vdagent-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0gdkyylyg1hksg0i0anvznqfli2q39335fnrmcd6847frpc8njpi"))
+              (patches (search-patches "spice-vdagent-localstatedir.patch"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("alsa-lib" ,alsa-lib)
+        ("dbus" ,dbus)
+        ("glib" ,glib)
+        ("libpciaccess" ,libpciaccess)
+        ("libx11" ,libx11)
+        ("libxext" ,libxext)
+        ("libxfixes" ,libxfixes)
+        ("libxinerama" ,libxinerama)
+        ("libxrandr" ,libxrandr)
+        ("spice-protocol" ,spice-protocol)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (arguments
+     '(#:configure-flags '("--localstatedir=/var")))
+    (synopsis "Spice agent for linux")
+    (description "Enables sharing the clipboard and guest display resolution
+scaling on graphical console window resize.")
+    (home-page "http://www.spice-space.org")
+    (license license:gpl3+)))
-- 
2.9.0

[PATCH 7/7] gnu: Add virt-viewer.

[David Craven]

* gnu/packages/spice.scm: Add it.
---
 gnu/packages/spice.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index e78bdef..1755e8b 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -16,6 +16,7 @@
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xiph)
+  #:use-module (gnu packages xml)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
   #:use-module (guix packages)
@@ -226,3 +227,46 @@ Internet and from a wide variety of machine architectures.")
 scaling on graphical console window resize.")
     (home-page "http://www.spice-space.org")
     (license license:gpl3+)))
+
+(define-public virt-viewer
+  (package
+    (name "virt-viewer")
+    (version "4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                "https://virt-manager.org/download/sources/virt-viewer/"
+                "virt-viewer-" version ".tar.gz"))
+              (sha256
+               (base32
+                "07zsi1fqg05mag1ayniaqj25fzb6dxg76d4ka5196lq4l477nhhw"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("gtk+" ,gtk+)
+        ("libcap" ,libcap)
+        ("libxml2" ,libxml2)
+        ("openssl" ,openssl)
+        ("spice-gtk" ,spice-gtk)
+        ("spice-protocol" ,spice-protocol)))
+    (native-inputs
+      `(("glib:bin" ,glib "bin")
+        ("intltool" ,intltool)
+        ("pkg-config" ,pkg-config)))
+    (arguments
+      `(#:configure-flags
+        '("--with-spice-gtk")
+        #:phases
+         (modify-phases %standard-phases
+           (add-after
+            'install 'wrap-remote-viewer
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out             (assoc-ref outputs "out"))
+                    (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+                (wrap-program (string-append out "/bin/remote-viewer")
+                  `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))
+              #t)))))
+    (synopsis "Graphical console client for virtual machines")
+    (description "Graphical console client for virtual machines using spice or
+vnc.")
+    (home-page "https://virt-manager.org")
+    (license license:gpl2+)))
-- 
2.9.0

Re: [PATCH 4/7] gnu: Add spice-gtk.

[David Craven]

So is this a valid use case for propagated inputs? Making sure that
packages that use spice-gtk use the same gstreamer plugins?

Re: [PATCH 2/7] gnu: Add virglrenderer.

[Leo Famulari]

On Sun, Jul 24, 2016 at 01:07:35PM +0200, David Craven wrote:
> Alot of the dependencies I had to add was because of stuff like this:
> 
> > Package 'libudev', required by 'gbm', not found
> 
> Is there a better way then adding libudev as a dependency? I don't
> know why pkg-config checks for dependencies of dependencies, that's
> kind of weird...

Interesting. Can somebody with more experience than me offer some
advice?  I don't know the best way to approach this.

> I couldn't find any information regarding gallium, but see it in the
> source tree. Is it part of mesa that was copied/modified? I think that
> in that case they are probably still working on upstreaming the
> changes and don't think we have to bother making it a separate
> package.

Yes, I think it's part of mesa:
https://en.wikipedia.org/wiki/Gallium3D

Re: [PATCH 4/7] gnu: Add spice-gtk.

[Ludovic Courtès]

David Craven <david@craven.ch> skribis:

> What are valid reasons to propagate inputs?

If an installed .h file of spice-gtk #includes a .h file of a
dependency, that dependency should be a propagated input.  Likewise if
its .pc file “Requires” the .pc file of a dependency.

For additional examples, see:

  https://www.gnu.org/software/guix/manual/html_node/package-Reference.html

HTH!

Ludo’.

Re: [PATCH 4/7] gnu: Add spice-gtk.

[David Craven]

> Likewise if its .pc file “Requires” the .pc file of a dependency.

Maybe we want to patch pkg-config to not check for propagated
dependencies?

> If an installed .h file of spice-gtk #includes a .h file of a
> dependency, that dependency should be a propagated input.
> Likewise if its .pc file “Requires” the .pc file of a dependency.

Then I think the inputs I propagated in my first submission of the
patches follow this criteria.

Re: [PATCH 4/7] gnu: Add spice-gtk.

[David Craven]

I'm not sure if you still expect me to do something and what that is exactly.

But maybe we shouldn't propagate pkg-config inputs. I'm currently
trying to get a package to not pick up optional x11 dependencies that
are propagated by mesa...

Re: [PATCH 4/7] gnu: Add spice-gtk.

[Ludovic Courtès]

Hi David,

David Craven <david@craven.ch> skribis:

> I'm not sure if you still expect me to do something and what that is exactly.

Oops, I thought Leo was taking care of this patch series.  Leo?

> But maybe we shouldn't propagate pkg-config inputs.

Not sure what you mean.  As I wrote, if the .pc Requires another .pc,
then the required thing must be propagated.

Ludo’.

Re: [PATCH 4/7] gnu: Add spice-gtk.

[Leo Famulari]

Hi David!

Sorry for the delay. My last few days have been super busy, but I haven't forgotten about this patch series. I skimmed them yesterday and they seemed fine; I'll read them properly tonight :)


-------- Original Message --------
From: ludo@gnu.org
Sent: July 27, 2016 6:12:09 PM EDT
To: David Craven <david@craven.ch>
Cc: Leo Famulari <leo@famulari.name>, guix-devel <guix-devel@gnu.org>
Subject: Re: [PATCH 4/7] gnu: Add spice-gtk.

Hi David,

David Craven <david@craven.ch> skribis:

> I'm not sure if you still expect me to do something and what that is exactly.

Oops, I thought Leo was taking care of this patch series.  Leo?

> But maybe we shouldn't propagate pkg-config inputs.

Not sure what you mean.  As I wrote, if the .pc Requires another .pc,
then the required thing must be propagated.

Ludo’.

Re: [PATCH 4/7] gnu: Add spice-gtk.

[David Craven]

Hi Leo and Ludo!

Thanks! Just wasn't sure if you (Leo) had archived this thread =P

Re: [PATCH 4/7] gnu: Add spice-gtk.

[Leo Famulari]

On Mon, Jul 25, 2016 at 12:14:57AM +0200, Ludovic Courtès wrote:
> David Craven <david@craven.ch> skribis:
> 
> > What are valid reasons to propagate inputs?
> 
> If an installed .h file of spice-gtk #includes a .h file of a
> dependency, that dependency should be a propagated input.  Likewise if
> its .pc file “Requires” the .pc file of a dependency.

Okay, so many of David's original choices about what to propagate were
correct. Thanks for the clarification, Ludo!

Re: [PATCH 1/7] gnu: Add usbredir.

[Leo Famulari]

On Sun, Jul 24, 2016 at 07:52:24PM +0200, David Craven wrote:
> * gnu/local.mk: Add file.
> * gnu/packages/spice.scm: Add file.

> +(define-public usbredir

I standardized the commit message, added a copyright header with your
name, made the synopsis and description more descriptive (hopefully) and
pushed.

Thank you!

Re: [PATCH 2/7] gnu: Add virglrenderer.

[Leo Famulari]

On Sun, Jul 24, 2016 at 07:52:25PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.

> +(define-public virglrenderer

> +    (inputs
> +      `(("expat" ,expat)
> +        ("libdrm" ,libdrm)
> +        ("libepoxy" ,libepoxy)
> +        ("mesa" ,mesa)
> +        ("udev" ,eudev)))

Based on our discussion, I decided to leave expat and libdrm out. I
believe they come from mesa, in this case. 

I made some small edits to the commit message and description and
pushed!

Thank you!

Re: [PATCH 3/7] gnu: Add spice-protocol.

[Leo Famulari]

On Sun, Jul 24, 2016 at 07:52:26PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.

> +(define-public spice-protocol

Again, I made minor edits to the commit message and description, and
pushed!

Thanks!

Re: [PATCH 4/7] gnu: Add spice-gtk.

[Leo Famulari]

On Sun, Jul 24, 2016 at 07:52:27PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.

> +(define-public spice-gtk

Pushed with a standard commit message, thanks!

Re: [PATCH 5/7] gnu: Add spice.

[Leo Famulari]

On Sun, Jul 24, 2016 at 07:52:28PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.

> +(define-public spice

As discussed, your original choices regarding propagation were correct
(sorry I wasted your time!).

So, I re-propagated those inputs in this patch, keeping the celt051
comment and the license list.

Thanks!

Re: [PATCH 6/7] gnu: Add spice-vdagent.

[Leo Famulari]

On Sun, Jul 24, 2016 at 07:52:29PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.
> * gnu/packages/patches/spice-vdagent-localstatedir.patch: Add it.

> +(define-public spice-vdagent

> +              (patches (search-patches "spice-vdagent-localstatedir.patch"))))

As mentioned before, I converted this patch into a substitution in a build phase.

Re: [PATCH 7/7] gnu: Add virt-viewer.

[Leo Famulari]

On Sun, Jul 24, 2016 at 07:52:30PM +0200, David Craven wrote:
> * gnu/packages/spice.scm: Add it.

> +(define-public virt-viewer

I made some minor edits to the description and pushed. Thanks!

Re: [PATCH 1/7] gnu: Add usbredir.

[David Craven]

Thanks for reviewing and merging =). Just noticed two things...

libusb should be propagated in usbredir [0].
spice-protocol should be propagated in spice-gtk [1].

[0] https://github.com/SPICE/usbredir/blob/master/usbredirhost/libusbredirhost.pc.in
[1] https://github.com/SPICE/spice-gtk/blob/0de7b5cf1f906b7801adc0d41fa260adbaa80c0a/src/spice-client.h

Re: [PATCH 1/7] gnu: Add usbredir.

[Leo Famulari]

On Fri, Jul 29, 2016 at 10:09:40AM +0200, David Craven wrote:
> Thanks for reviewing and merging =). Just noticed two things...
> 
> libusb should be propagated in usbredir [0].
> spice-protocol should be propagated in spice-gtk [1].

Done with ba9e2ee64 !

Re: [PATCH 1/7] gnu: Add usbredir.

[David Craven]

Thank you! And sorry for all the complaining...

spice-gtk doesn't need libusb in it's inputs if it's propagated =P But
not that it matters too much...

Re: [PATCH 1/7] gnu: Add usbredir.

[Andreas Enge]

Hello, David!

Usbredir fails to build on armhf, and I am certain it will also fail on
i686 or more generally any 32 bit architecture:
   http://hydra.gnu.org:3000/build/1345279
usbredirhost.c:1162:5: error: format ?%lu? expects argument of type ?long unsigned int?, but argument 5 has type ?uint64_t? [-Werror=format=]

The fix is to use "%PRIu64" instead of "%lu" in the format strings for printf.
Do you think you could file a bug upstream?

Thanks,

Andreas