;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 David Craven <david@craven.ch>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
(define-module (gnu packages spice)
#:use-module (gnu packages)
+ #:use-module (gnu packages autotools) ; remove after updating usbredir to 0.7.1+
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#: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 git-download) ; remove after updating usbredir to 0.7.1+
#: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 "Tools for sending USB device traffic over a network")
- (description "Usbredir is a network protocol for sending USB device traffic
-over a network connection. It can be used to redirect traffic from a USB device
-to a different (virtual) machine than 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+))))
+ (let ((commit "ac80a5971c6318d73d5fba4b5f13d3a9389558c9")
+ (revision "1")) ;Guix package revision
+ (package
+ (name "usbredir")
+ (version (string-append "0.7.1-" revision "."
+ (string-take commit 7)))
+ ;(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"))))
+ ; FIXME: usbredir 0.7.1 release doesn't build on 32 bit systems.
+ ; issue is fixed in HEAD
+ ; remove 'autogen phase and autoconf, automake, libtool inputs
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://anongit.freedesktop.org/git/spice/usbredir.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "052fywgi72j68dr5ybldncg4vk8iqfrh58la7iazyxxpph9aag1g"))))
+ (build-system gnu-build-system)
+ (propagated-inputs
+ `(("libusb" ,libusb)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'autogen
+ (lambda _
+ ;; Build without '-Werror', in particular to avoid errors due
+ ;; to the use of the deprecated 'libusb_set_debug' function.
+ (substitute* "configure.ac"
+ (("-Werror") ""))
+ (zero? (system* "autoreconf" "-vfi")))))))
+ (synopsis "Tools for sending USB device traffic over a network")
+ (description "Usbredir is a network protocol for sending USB device traffic
+ over a network connection. It can be used to redirect traffic from a USB device
+ to a different (virtual) machine than the one to which the USB device is
+ attached.")
+ (home-page "https://www.spice-space.org")
+ (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))))
(define-public virglrenderer
(package
(name "virglrenderer")
- (version "0.5.0")
+ (version "0.6.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://www.freedesktop.org/software/virgl/"
"virglrenderer-" version ".tar.bz2"))
+ (patches (search-patches "virglrenderer-CVE-2017-6386.patch"))
(sha256
(base32
- "1dj0j8nbyr7nrpds4dqlp43ji8ixjyqhgw6ywlz1r9dn6cs5m5d1"))))
+ "06kf0q4l52gzx5p63l8850hff8pmhp7xv1hk8zgx2apbw18y6jd5"))))
(build-system gnu-build-system)
(inputs
`(("libepoxy" ,libepoxy)
(define-public spice-protocol
(package
(name "spice-protocol")
- (version "0.12.11")
+ (version "0.12.13")
(source (origin
(method url-fetch)
(uri (string-append
- "http://www.spice-space.org/download/releases/"
+ "https://www.spice-space.org/download/releases/"
"spice-protocol-" version ".tar.bz2"))
(sha256
(base32
- "0c33kg3vdz3nnl2wjfbgmszz5hbjbvsw6map35dj9hxnpwwf9fi2"))))
+ "0cwrgkp558mblcf4vrhacb3iizz12khsrrl82w38w9nj0ar13vl9"))))
(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 desktop computing environment.")
- (home-page "http://www.spice-space.org")
+ (home-page "https://www.spice-space.org")
(license (list license:bsd-3 license:lgpl2.1+))))
(define-public spice-gtk
(package
(name "spice-gtk")
- (version "0.32")
+ (version "0.34")
(source (origin
(method url-fetch)
(uri (string-append
- "http://spice-space.org/download/gtk/"
+ "https://spice-space.org/download/gtk/"
"spice-gtk-" version ".tar.bz2"))
(sha256
(base32
- "00pf94xh2xf0h1g13lnavxrysd0d0x22l5jl108cvq1mjc4z8j2c"))))
+ "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"))))
(build-system gnu-build-system)
(propagated-inputs
`(("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
("gst-plugins-bad" ,gst-plugins-bad)
- ("gst-plugins-ugly" ,gst-plugins-ugly)))
+ ("gst-plugins-ugly" ,gst-plugins-ugly)
+ ("spice-protocol" ,spice-protocol)))
(inputs
`(("glib-networking" ,glib-networking)
+ ("gobject-introspection" ,gobject-introspection)
("gtk+" ,gtk+)
("libepoxy" ,libepoxy)
("libjpeg" ,libjpeg)
- ("libusb" ,libusb)
("libxcb" ,libxcb)
("lz4" ,lz4)
("mesa" ,mesa)
("python" ,python)
("openssl" ,openssl)
("opus" ,opus)
- ("spice-protocol" ,spice-protocol)
("usbredir" ,usbredir)))
(native-inputs
`(("glib:bin" ,glib "bin")
`(#:configure-flags
'("--enable-gstaudio"
"--enable-gstvideo"
- "--enable-pulse")
+ "--enable-pulse"
+ "--enable-introspection")
#:phases
(modify-phases %standard-phases
(add-after
#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")
+ (home-page "https://www.spice-space.org")
(license (list license:lgpl2.1+ license:lgpl2.0+))))
(define-public spice
(package
(name "spice")
- (version "0.13.1")
+ (version "0.14.0")
(source (origin
(method url-fetch)
(uri (string-append
- "http://www.spice-space.org/download/releases/"
+ "https://www.spice-space.org/download/releases/"
"spice-" version ".tar.bz2"))
(sha256
(base32
- "18hxk47z58cqbix5h477qmvcdmsrwzv984jw4c6fj0ns4h217jwy"))))
+ "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs"))))
(build-system gnu-build-system)
(propagated-inputs
`(("openssl" ,openssl)
("pixman" ,pixman)
("spice-protocol" ,spice-protocol)))
(inputs
- `(("glib" ,glib)
- ("libjpeg" ,libjpeg)
+ `(("cyrus-sasl" ,cyrus-sasl)
+ ("glib" ,glib)
+ ("libjpeg-turbo" ,libjpeg-turbo)
("lz4" ,lz4)
("opus" ,opus)
+ ("orc" ,orc)
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)
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")
+ (home-page "https://www.spice-space.org")
(license (list license:lgpl2.1+ license:lgpl2.0+))))
(define-public spice-vdagent
(((string-append "\\$\\(mkdir_p\\) \\$\\(DESTDIR\\)"
"\\$\\(localstatedir\\)/run/spice-vdagentd"))
"-$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd"))
+ #t))
+ (add-after 'unpack 'patch-spice-vdagent.desktop
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "data/spice-vdagent.desktop"
+ (("Exec=/usr/bin/spice-vdagent\n")
+ (string-append "Exec=" (assoc-ref outputs "out")
+ "/bin/spice-vdagent")))
#t)))))
(inputs
`(("alsa-lib" ,alsa-lib)
(synopsis "Spice agent for Linux")
(description "Spice-vdagent enables sharing the clipboard and guest display
resolution scaling on graphical console window resize.")
- (home-page "http://www.spice-space.org")
+ (home-page "https://www.spice-space.org")
(license license:gpl3+)))
+
+(define-public virt-viewer
+ (package
+ (name "virt-viewer")
+ (version "6.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://virt-manager.org/download/sources/virt-viewer/"
+ "virt-viewer-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1chqrf658niivzfh85cbwkbv9vyg8sv1mv3i31vawkfsfdvvsdwh"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("gtk+" ,gtk+)
+ ("libcap" ,libcap)
+ ("libxml2" ,libxml2)
+ ("openssl" ,openssl)
+ ("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+)))
HCoop / jackhill / guix / guix.git / blobdiff