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

gnu: weston: Update to 6.0.0. 

* gnu/packages/freedesktop.scm (weston): Update to 6.0.0.
[build-system]: Build with meson-build-system.
[inputs]: Add colord, lcms, libevdev, libjpeg, libva, libwebp, libxml2 and
pango.
[arguments]: Adjust to Meson.
This commit is contained in:
Rutger Helling 2019-04-09 11:50:22 +02:00
parent 3542266a69
commit 23635b2ee9
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnu/packages/freedesktop.scm
View File

@ -54,12 +54,14 @@
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) ;intltool #:use-module (gnu packages glib) ;intltool
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages libunwind) #:use-module (gnu packages libunwind)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
@ -74,6 +76,7 @@
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages valgrind) #:use-module (gnu packages valgrind)
#:use-module (gnu packages video)
#:use-module (gnu packages w3m) #:use-module (gnu packages w3m)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
@ -629,7 +632,7 @@ applications, X servers (rootless or fullscreen) or other display servers.")
(define-public weston (define-public weston
(package (package
(name "weston") (name "weston")
(version "5.0.0") (version "6.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -637,30 +640,40 @@ applications, X servers (rootless or fullscreen) or other display servers.")
"weston-" version ".tar.xz")) "weston-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1bsc9ry566mpk6fdwkqpvwq2j7m79d9cvh7d3lgf6igsphik98hm")))) "04p6hal5kalmdp5dxwh2h5qhkkb4dvbsk7l091zvvcq70slj6qsl"))))
(build-system gnu-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server))) ("xorg-server" ,xorg-server)))
(inputs (inputs
`(("cairo" ,cairo-xcb) `(("cairo" ,cairo-xcb)
("colord" ,colord)
("dbus" ,dbus) ("dbus" ,dbus)
("elogind" ,elogind) ("elogind" ,elogind)
("lcms" ,lcms)
("libevdev" ,libevdev)
("libinput" ,libinput-minimal) ("libinput" ,libinput-minimal)
("libjpeg" ,libjpeg)
("libunwind" ,libunwind) ("libunwind" ,libunwind)
("libva" ,libva)
("libwebp" ,libwebp)
("libxcursor" ,libxcursor) ("libxcursor" ,libxcursor)
("libxkbcommon" ,libxkbcommon) ("libxkbcommon" ,libxkbcommon)
("libxml2" ,libxml2)
("mesa" ,mesa) ("mesa" ,mesa)
("mtdev" ,mtdev) ("mtdev" ,mtdev)
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
("pango" ,pango)
("wayland" ,wayland) ("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols) ("wayland-protocols" ,wayland-protocols)
("xorg-server-xwayland" ,xorg-server-xwayland))) ("xorg-server-xwayland" ,xorg-server-xwayland)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "--disable-setuid-install" (list "-Dbackend-rdp=false" ; TODO: Enable.
"--enable-systemd-login" "-Dremoting=false" ; TODO: Enable.
(string-append "--with-xserver-path=" "-Dsimple-dmabuf-drm=auto"
"-Dsystemd=false"
(string-append "-Dxwayland-path="
(assoc-ref %build-inputs "xorg-server-xwayland") (assoc-ref %build-inputs "xorg-server-xwayland")
"/bin/Xwayland")) "/bin/Xwayland"))
#:parallel-tests? #f ; Parallel tests cause failures. #:parallel-tests? #f ; Parallel tests cause failures.
@ -669,8 +682,8 @@ applications, X servers (rootless or fullscreen) or other display servers.")
(add-before 'configure 'use-elogind (add-before 'configure 'use-elogind
(lambda _ (lambda _
;; Use elogind instead of systemd ;; Use elogind instead of systemd
(substitute* "configure" (substitute* "libweston/meson.build"
(("libsystemd-login >= 198") "libelogind")) (("libsystemd-login") "libelogind"))
(substitute* '("libweston/launcher-logind.c" (substitute* '("libweston/launcher-logind.c"
"libweston/weston-launch.c") "libweston/weston-launch.c")
(("#include <systemd/sd-login.h>") (("#include <systemd/sd-login.h>")
@ -678,7 +691,8 @@ applications, X servers (rootless or fullscreen) or other display servers.")
#t)) #t))
(add-after 'configure 'patch-confdefs.h (add-after 'configure 'patch-confdefs.h
(lambda _ (lambda _
(system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h"))) (system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h")
#t))
(add-before 'check 'setup (add-before 'check 'setup
(lambda _ (lambda _
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))