amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: freerdp: Revert to version 1.1.

Browse source 
* gnu/packages/rdesktop.scm (freerdp) [version, source]: Revert to upstream
  branch 1.1.  [inputs]: Use ffmpeg-2.8.
* gnu/packages/gnome.scm (vinagre): Add patches required to build against
  freerdp branch 1.1.
* gnu/packages/patches/vinagre-revert-1.patch,
  gnu/packages/patches/vinagre-revert-2.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
This commit is contained in:
Thomas Danckaert 2017-08-16 21:49:17 +02:00
parent c5a856d551
commit cc81f1c349
No known key found for this signature in database
GPG key ID: 5C3B064C724A5726
5 changed files with 558 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

95
gnu/packages/rdesktop.scm
View file

@ -70,51 +70,54 @@ to remotely control a user's Windows desktop.")
(license license:gpl3+)))
(define-public freerdp
(package
(name "freerdp")
(version "2.0.0-rc0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/FreeRDP/FreeRDP/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0r36zwhl7fhmdng5pvl2a106gqbcqq184g2i2klz6ilna8pxjcml"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("xmlto" ,xmlto)))
(inputs
`(("libx11" ,libx11)
("libxkbfile" ,libxkbfile)
("libxcursor" ,libxcursor)
("libxext" ,libxext)
("libxi" ,libxi)
("libxv" ,libxv)
("libxrandr" ,libxrandr)
("libxrender" ,libxrender)
("libxinerama" ,libxinerama)
("libxshmfence" ,libxshmfence)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("cups" ,cups)
("ffmpeg" ,ffmpeg)
("pulseaudio" ,pulseaudio)
("alsa-lib" ,alsa-lib)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("zlib" ,zlib)
("openssl" ,openssl)))
(arguments
`(#:configure-flags
'("-DCMAKE_INSTALL_LIBDIR=lib"
"-DWITH_PULSE=ON"
"-DWITH_CUPS=ON")
#:tests? #f)) ; no 'test' target
(home-page "https://www.freerdp.com")
(synopsis "Remote Desktop Protocol implementation")
(description "FreeRDP implements Microsoft's Remote Desktop Protocol. It
consists of the @code{xfreerdp} client, libraries for client and server
(let ((commit "03ab68318966c3a22935a02838daaea7b7fbe96c"))
(package
(name "freerdp")
(version (git-version "1.1" "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
;; We need the 1.1 branch for RDP support in vinagre.
(url "git://github.com/FreeRDP/FreeRDP.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "07ish8rmvbk2zd99k91qybmmh5h4afly75l5kbvslhq1r6k8pbmp"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("xmlto" ,xmlto)))
(inputs
`(("libx11" ,libx11)
("libxkbfile" ,libxkbfile)
("libxcursor" ,libxcursor)
("libxext" ,libxext)
("libxi" ,libxi)
("libxv" ,libxv)
("libxrandr" ,libxrandr)
("libxrender" ,libxrender)
("libxinerama" ,libxinerama)
("libxshmfence" ,libxshmfence)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("cups" ,cups)
("ffmpeg" ,ffmpeg-2.8)
("pulseaudio" ,pulseaudio)
("alsa-lib" ,alsa-lib)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("zlib" ,zlib)
("openssl" ,openssl)))
(arguments
`(#:configure-flags
'("-DCMAKE_INSTALL_LIBDIR=lib"
"-DWITH_PULSE=ON"
"-DWITH_CUPS=ON")
#:tests? #f)) ; no 'test' target
(home-page "https://www.freerdp.com")
(synopsis "Remote Desktop Protocol implementation")
(description "FreeRDP implements Microsoft's Remote Desktop Protocol.
It consists of the @code{xfreerdp} client, libraries for client and server
functionality, and Windows Portable Runtime (WinPR), a portable implementation
of parts of the Windows API.")
(license license:asl2.0)))
(license license:asl2.0))))