diff --git a/common/shlibs b/common/shlibs index 35667ea0af1..9bc1cec62e6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2851,8 +2851,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.15 libqalculate-2.3.0_1 -libweston-3.so.0 weston-3.0.0_1 -libweston-desktop-3.so.0 weston-3.0.0_1 +libweston-4.so.0 weston-4.0.0_1 +libweston-desktop-4.so.0 weston-4.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/patches/musl-tests.patch b/srcpkgs/weston/patches/musl-tests.patch deleted file mode 100644 index 805552e8593..00000000000 --- a/srcpkgs/weston/patches/musl-tests.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 cd6912483d0..f6ab406c58e 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -1,6 +1,6 @@ # Template file for 'weston'. pkgname=weston -version=3.0.0 +version=4.0.0 revision=1 build_style=gnu-configure # XXX enable rdp compositor if freerdp is updated to >=1.1. @@ -8,15 +8,6 @@ configure_args="--enable-libinput-backend --disable-setuid-install --enable-colord --enable-x11-compositor --enable-xwayland $(vopt_enable backtrace libunwind) $(vopt_enable dbus) $(vopt_enable vaapi vaapi-recorder)" -short_desc="Reference implementation of a Wayland compositor" -maintainer="Juan RP " -homepage="http://wayland.freedesktop.org/" -license="MIT" -distfiles="http://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz" -checksum=cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5 - -system_groups="weston-launch" -lib32disabled=yes hostmakedepends="pkg-config wayland-devel wayland-protocols autoconf automake libtool" makedepends="libpng-devel wayland-devel wayland-protocols libwayland-egl libxkbcommon-devel pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel @@ -24,6 +15,14 @@ makedepends="libpng-devel wayland-devel wayland-protocols libwayland-egl libxkbc libinput-devel libxcb-devel libXcursor-devel colord-devel $(vopt_if backtrace libunwind-devel) $(vopt_if dbus dbus-devel) $(vopt_if vaapi libva-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 +system_groups="weston-launch" +lib32disabled=yes # Package build options build_options="backtrace dbus vaapi" @@ -52,6 +51,7 @@ esac pre_configure() { autoreconf -fi } + post_install() { # weston-launch must be setuid chmod u+s ${DESTDIR}/usr/bin/weston-launch @@ -67,15 +67,17 @@ weston-colord_package() { vmove /usr/lib/weston/cms-colord.so } } + weston-x11_package() { short_desc+=" - x11 backend" pkg_install() { - vmove /usr/lib/libweston-3/x11-backend.so + vmove "/usr/lib/libweston-${version%%.*}/x11-backend.so" } } + weston-xwayland_package() { short_desc+=" - xwayland backend" pkg_install() { - vmove /usr/lib/libweston-3/xwayland.so + vmove "/usr/lib/libweston-${version%%.*}/xwayland.so" } }