nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: freerdp: Update to 2.0.0-rc4. 

* gnu/packages/rdesktop.scm (freerdp): Update to 2.0.0-rc4.
[native-inputs]: Add docbook-xml, glib. Sort alphabetically.
[inputs]: Add libxkbcommon, wayland. Sort alphabetically.
[arguments]: Explicitly disable libsystemd.
This commit is contained in:
Efraim Flashner 2018-11-30 10:29:35 +02:00
parent 6ec43b0d6b
commit a1a6fc702a
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 65 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnu/packages/rdesktop.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,6 +29,8 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cups) #:use-module (gnu packages cups)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib)
#:use-module (gnu packages gstreamer) #:use-module (gnu packages gstreamer)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
@ -35,6 +38,7 @@
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml))
@ -73,28 +77,33 @@ to remotely control a user's Windows desktop.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public freerdp (define-public freerdp
(let ((commit "03ab68318966c3a22935a02838daaea7b7fbe96c"))
(package (package
(name "freerdp") (name "freerdp")
(version (git-version "1.1" "1" commit)) (version "2.0.0-rc4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
;; We need the 1.1 branch for RDP support in vinagre.
(url "git://github.com/FreeRDP/FreeRDP.git") (url "git://github.com/FreeRDP/FreeRDP.git")
(commit commit))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "07ish8rmvbk2zd99k91qybmmh5h4afly75l5kbvslhq1r6k8pbmp")))) (base32 "0546i0m2d4nz5jh84ngwzpcm3c43fp987jk6cynqspsmvapab6da"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("docbook-xml" ,docbook-xml)
("libxslt" ,libxslt)
("libxml2" ,libxml2)
("docbook-xsl" ,docbook-xsl) ("docbook-xsl" ,docbook-xsl)
("glib" ,glib)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("pkg-config" ,pkg-config)
("xmlto" ,xmlto))) ("xmlto" ,xmlto)))
(inputs (inputs
`(("libx11" ,libx11) `(("alsa-lib" ,alsa-lib)
("cups" ,cups)
("ffmpeg" ,ffmpeg)
("libjpeg" ,libjpeg)
("libx11" ,libx11)
("libxkbcommon" ,libxkbcommon)
("libxkbfile" ,libxkbfile) ("libxkbfile" ,libxkbfile)
("libxcursor" ,libxcursor) ("libxcursor" ,libxcursor)
("libxext" ,libxext) ("libxext" ,libxext)
@ -104,17 +113,15 @@ to remotely control a user's Windows desktop.")
("libxrender" ,libxrender) ("libxrender" ,libxrender)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxshmfence" ,libxshmfence) ("libxshmfence" ,libxshmfence)
("cups" ,cups) ("openssl" ,openssl)
("ffmpeg" ,ffmpeg-2.8)
("libjpeg" ,libjpeg)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("alsa-lib" ,alsa-lib) ("wayland" ,wayland)
("zlib" ,zlib) ("zlib" ,zlib)))
("openssl" ,openssl)))
(arguments (arguments
`(#:build-type "RELEASE" `(#:build-type "RELEASE"
#:configure-flags #:configure-flags
(list "-DWITH_JPEG=ON" (list "-DWITH_JPEG=ON"
"-DWITH_LIBSYSTEMD=OFF"
,@(if (string-prefix? "x86_64" ,@(if (string-prefix? "x86_64"
(or (%current-target-system) (or (%current-target-system)
(%current-system))) (%current-system)))
@ -133,4 +140,4 @@ to remotely control a user's Windows desktop.")
It consists of the @code{xfreerdp} client, libraries for client and server It consists of the @code{xfreerdp} client, libraries for client and server
functionality, and Windows Portable Runtime (WinPR), a portable implementation functionality, and Windows Portable Runtime (WinPR), a portable implementation
of parts of the Windows API.") of parts of the Windows API.")
(license license:asl2.0)))) (license license:asl2.0)))