From e7a3f2a26f7e8e113238a72e3e90e1eee2d7782b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 16 Oct 2017 13:51:29 +0200 Subject: [PATCH] weston: update to 3.0.0. --- common/shlibs | 3 ++- srcpkgs/weston/patches/musl-tests.patch | 10 ++++++++++ srcpkgs/weston/template | 13 +++++-------- 3 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/weston/patches/musl-tests.patch diff --git a/common/shlibs b/common/shlibs index c0d236aad75..62d57027cc5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2750,7 +2750,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.11 libqalculate-2.0.0_1 -libweston-2.so.0 weston-2.0.0_1 +libweston-3.so.0 weston-3.0.0_1 +libweston-desktop-3.so.0 weston-3.0.0_1 libmutter-0.so.0 mutter-3.24.0_1 libmutter-clutter-0.so mutter-3.24.0_1 libmutter-cogl-path-0.so mutter-3.24.0_1 diff --git a/srcpkgs/weston/patches/musl-tests.patch b/srcpkgs/weston/patches/musl-tests.patch new file mode 100644 index 00000000000..805552e8593 --- /dev/null +++ b/srcpkgs/weston/patches/musl-tests.patch @@ -0,0 +1,10 @@ +--- shared/timespec-util.h.orig 2017-10-16 13:45:42.189826321 +0200 ++++ shared/timespec-util.h 2017-10-16 13:45:52.780979880 +0200 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + #define NSEC_PER_SEC 1000000000 + diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index 59396fa62a1..4e41e651d83 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -1,7 +1,7 @@ # Template file for 'weston'. pkgname=weston -version=2.0.0 -revision=3 +version=3.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 @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://wayland.freedesktop.org/" license="MIT" distfiles="http://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz" -checksum=b4e446ac27f118196f1609dab89bb3cb3e81652d981414ad860e733b355365d8 +checksum=cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5 system_groups="weston-launch" lib32disabled=yes @@ -46,9 +46,6 @@ x86_64*|i686*) makedepends+=" glu-devel libva-devel" configure_args+=" --enable-vaapi-recorder" ;; -aarch64*) - broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/1785/steps/shell_3/logs/stdio" - ;; esac pre_configure() { @@ -72,12 +69,12 @@ weston-colord_package() { weston-x11_package() { short_desc+=" - x11 backend" pkg_install() { - vmove /usr/lib/libweston-2/x11-backend.so + vmove /usr/lib/libweston-3/x11-backend.so } } weston-xwayland_package() { short_desc+=" - xwayland backend" pkg_install() { - vmove /usr/lib/libweston-2/xwayland.so + vmove /usr/lib/libweston-3/xwayland.so } }