diff --git a/common/shlibs b/common/shlibs index 6e2b8e69328..bc5609e988e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2800,8 +2800,8 @@ libspectrum.so.8 libspectrum-1.2.2_1 libbearssl.so.0 bearssl-0.3_1 libXfont2.so.2 libXfont2-2.0.1_1 libqalculate.so.20 libqalculate-2.8.0_1 -libweston-4.so.0 weston-4.0.0_1 -libweston-desktop-4.so.0 weston-4.0.0_1 +libweston-5.so.0 weston-5.0.0_1 +libweston-desktop-5.so.0 weston-5.0.0_1 libostree-1.so.1 libostree-2017.3_1 librhash.so.0 rhash-1.3.4_1 libserialport.so.0 libserialport-0.1.1_1 diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index 0ccbcc2ca1e..c2e95fdcc39 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -1,51 +1,35 @@ # Template file for 'weston' pkgname=weston -version=4.0.0 -revision=2 +version=5.0.0 +revision=1 build_style=gnu-configure -# XXX enable rdp compositor if freerdp is updated to >=1.1. -configure_args="--enable-libinput-backend --disable-setuid-install +configure_args="--disable-setuid-install --enable-colord --enable-x11-compositor --enable-xwayland - $(vopt_enable backtrace libunwind) $(vopt_enable dbus) + $(vopt_enable dbus) $(vopt_enable elogind systemd-login) $(vopt_enable vaapi vaapi-recorder)" hostmakedepends="pkg-config wayland-devel wayland-protocols autoconf automake libtool" makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel poppler-glib-devel pam-devel lcms2-devel eudev-libudev-devel libdrm-devel libinput-devel libxcb-devel libXcursor-devel colord-devel - $(vopt_if backtrace libunwind-devel) $(vopt_if dbus dbus-devel) - $(vopt_if vaapi libva-devel)" + $(vopt_if dbus dbus-devel) $(vopt_if vaapi 'glu-devel libva-devel') + $(vopt_if elogind elogind-devel)" short_desc="Reference implementation of a Wayland compositor" maintainer="Juan RP " license="MIT" -homepage="http://wayland.freedesktop.org/" -distfiles="http://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz" -checksum=a0fc0ae7ef83dfbed12abfe9b8096a24a7dd00705e86fa0db1e619ded18b4b58 +homepage="https://wayland.freedesktop.org/" +distfiles="https://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz" +checksum=15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf system_groups="weston-launch" lib32disabled=yes # Package build options -build_options="backtrace dbus vaapi" +build_options="dbus elogind vaapi" build_options_default="dbus" case "$XBPS_TARGET_MACHINE" in -armv[67]l*) # Assume RPi for now. - broken="https://cgit.freedesktop.org/wayland/weston/commit/?id=ca52b31d3f867d9a14b2a3b9fcd4f21aa5fb0a3d" - CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include" - LDFLAGS="-Wl,-R/opt/vc/lib" - makedepends+=" rpi-userland-devel" - # Just enable the RPi compositor. - configure_args+=" --disable-drm-compositor - --disable-wayland-compositor --disable-simple-egl-clients - --disable-fbdev-compositor --disable-egl - --disable-setuid-install --disable-resize-optimization - --enable-weston-launch WESTON_NATIVE_BACKEND=rpi-backend.so" - ;; x86_64*|i686*|ppc64*) - build_options_default+=" vaapi" - makedepends+=" glu-devel libva-devel" - configure_args+=" --enable-vaapi-recorder" - ;; + build_options_default+=" vaapi" ;; esac pre_configure() {