weston: 5.0.0 -> 6.0.0 (#58522)

https://lists.freedesktop.org/archives/wayland-devel/2019-March/040356.html
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040334.html

* weston: use freerdp2 not legacy
* freerdp_legacy: drop as no longer needed (weston was last user)

Co-Authored-By: Michael Weiss <dev.primeos@gmail.com>
This commit is contained in:
Will Dietz
2019-05-31 22:59:50 +02:00
committed by Michael Weiss
co-authored by Michael Weiss
parent 310a1ec454
commit 3a26a1fe94
3 changed files with 28 additions and 104 deletions
@@ -1,47 +1,51 @@
{ stdenv, fetchurl, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
, colord, lcms2
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null, xwayland ? null, wayland-protocols
# beware of null defaults, as the parameters *are* supplied by callPackage by default
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "weston-${version}";
version = "5.0.0";
version = "6.0.0";
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1bsc9ry566mpk6fdwkqpvwq2j7m79d9cvh7d3lgf6igsphik98hm";
sha256 = "04p6hal5kalmdp5dxwh2h5qhkkb4dvbsk7l091zvvcq70slj6qsl";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ meson ninja pkgconfig ];
buildInputs = [
wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva
mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
libwebp wayland-protocols
colord lcms2
];
configureFlags = [
"--enable-x11-compositor"
"--enable-drm-compositor"
"--enable-wayland-compositor"
"--enable-headless-compositor"
"--enable-fbdev-compositor"
"--enable-screen-sharing"
"--enable-clients"
"--enable-weston-launch"
"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor"
++ stdenv.lib.optional (vaapi != null) "--enable-vaapi-recorder"
++ stdenv.lib.optionals (xwayland != null) [
"--enable-xwayland"
"--with-xserver-path=${xwayland.out}/bin/Xwayland"
];
mesonFlags= [
"-Dbackend-drm-screencast-vaapi=${boolToString (vaapi != null)}"
"-Dbackend-rdp=${boolToString (freerdp != null)}"
"-Dxwayland=${boolToString (xwayland != null)}" # Default is true!
"-Dremoting=false" # TODO
"-Dimage-webp=${boolToString (libwebp != null)}"
"-Dsimple-dmabuf-drm=" # Disables all drivers
"-Ddemo-clients=false"
"-Dsimple-clients="
"-Dtest-junit-xml=false"
# TODO:
#"--enable-clients"
#"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
] ++ optionals (xwayland != null) [
"-Dxwayland-path=${xwayland.out}/bin/Xwayland"
];
meta = with stdenv.lib; {
meta = {
description = "Reference implementation of a Wayland compositor";
homepage = https://wayland.freedesktop.org/;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];
};
}