dev-libs/weston-9999: migrate to meson

Upstream after v6 won't support autotools:
https://lists.freedesktop.org/archives/wayland-devel/2019-February/040080.html

Also bump the wayland dependency, because current master matches v6
beta, and weston 6 will be released alongside wayland 1.17. Before the
release, >=1.17 resolves to 9999, which is how I'm testing it.

Signed-off-by: makepost <makepost@firemail.cc>
Closes: https://github.com/gentoo/gentoo/pull/11326
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 40aa43e4412b2ae67ae63f8ec4597bf6968df2cb..1a039dffa3122c31b772a0c7e26ce2eaeea5b9da 100644 (file)
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
        EXPERIMENTAL="true"
 fi
 
-inherit autotools readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
+inherit meson readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
 
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/"
@@ -25,20 +25,19 @@ fi
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
 
 REQUIRED_USE="
        drm? ( gles2 )
        screen-sharing? ( rdp )
-       systemd? ( dbus )
        test? ( headless xwayland )
        wayland-compositor? ( gles2 )
 "
 
 RDEPEND="
        >=dev-libs/libinput-0.8.0
-       >=dev-libs/wayland-1.12.0
-       >=dev-libs/wayland-protocols-1.14
+       >=dev-libs/wayland-1.17.0
+       >=dev-libs/wayland-protocols-1.17
        lcms? ( media-libs/lcms:2 )
        media-libs/libpng:0=
        webp? ( media-libs/libwebp:0= )
@@ -53,7 +52,6 @@ RDEPEND="
                >=virtual/udev-136
        )
        colord? ( >=x11-misc/colord-0.1.27 )
-       dbus? ( >=sys-apps/dbus-1.6 )
        drm? (
                >=media-libs/mesa-17.1[gbm]
                >=sys-libs/mtdev-1.1.0
@@ -70,6 +68,7 @@ RDEPEND="
        )
        systemd? (
                sys-auth/pambase[systemd]
+               >=sys-apps/dbus-1.6
                >=sys-apps/systemd-209[pam]
        )
        launch? ( sys-auth/pambase )
@@ -88,68 +87,50 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
 "
 
-src_prepare() {
-       default
-       if [[ ${PV} = 9999* ]]; then
-               eautoreconf
-       else
-               elibtoolize
-       fi
-}
-
 src_configure() {
-       local myconf=()
-
-       if use examples || use test; then
-               myconf+=( --enable-simple-clients )
-       else
-               myconf+=( --disable-simple-clients )
-       fi
-
-       econf \
-               $(use_enable examples demo-clients-install) \
-               $(use_enable fbdev fbdev-compositor) \
-               $(use_enable dbus) \
-               $(use_enable drm drm-compositor) \
-               $(use_enable headless headless-compositor) \
-               $(use_enable ivi ivi-shell) \
-               $(use_enable lcms) \
-               $(use_enable rdp rdp-compositor) \
-               $(use_enable wayland-compositor) \
-               $(use_enable X x11-compositor) \
-               $(use_enable launch weston-launch) \
-               $(use_enable colord) \
-               $(use_enable gles2 egl) \
-               $(use_enable remoting) \
-               $(use_enable resize-optimization) \
-               $(use_enable screen-sharing) \
-               $(use_enable suid setuid-install) \
-               $(use_enable systemd systemd-login) \
-               $(use_enable systemd systemd-notify) \
-               $(use_enable xwayland) \
-               $(use_enable xwayland xwayland-test) \
-               $(use_with jpeg) \
-               $(use_with webp) \
-               --with-cairo=image \
-               --disable-junit-xml \
-               --disable-simple-dmabuf-drm-client \
-               --disable-simple-dmabuf-v4l-client \
-               --disable-simple-egl-clients \
-               --disable-vaapi-recorder \
+       local emesonargs=(
+               $(meson_use drm backend-drm)
+               -Dbackend-drm-screencast-vaapi=false
+               $(meson_use headless backend-headless)
+               $(meson_use rdp backend-rdp)
+               $(meson_use screen-sharing screenshare)
+               $(meson_use X backend-x11)
+               $(meson_use fbdev backend-fbdev)
+               $(meson_use gles2 renderer-gl)
+               $(meson_use launch weston-launch)
+               $(meson_use xwayland)
+               $(meson_use systemd)
+               $(meson_use remoting)
+               $(meson_use wayland-compositor shell-desktop)
+               $(meson_use ivi shell-ivi)
+               $(meson_use lcms color-management-lcms)
+               $(meson_use colord color-management-colord)
+               $(meson_use systemd launcher-logind)
+               $(meson_use jpeg image-jpeg)
+               $(meson_use webp image-webp)
+               -Dtools=debug,info,terminal
+               -Dsimple-dmabuf-drm=auto
+               $(meson_use examples demo-clients)
+               $(usex examples -Dsimple-clients=damage,img,egl,shm,touch "")
+               $(meson_use resize-optimization resize-pool)
+               -Dtest-junit-xml=false
                "${myconf[@]}"
+       )
+       meson_src_configure
 }
 
 src_test() {
        export XDG_RUNTIME_DIR="${T}/runtime-dir"
        mkdir "${XDG_RUNTIME_DIR}" || die
        chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
        cd "${BUILD_DIR}" || die
-       emake check
+       meson_src_test
 }
 
 src_install() {
-       default
-
+       meson_src_install
+       if use launch && use suid; then
+               chmod u+s "${ED}"/usr/bin/weston-launch || die
+       fi
        readme.gentoo_create_doc
 }