dev-libs/weston: Version bump to 6.0.0, EAPI 7
authorJames Le Cuirot <chewi@gentoo.org>
Sun, 14 Apr 2019 14:15:47 +0000 (15:15 +0100)
committerJames Le Cuirot <chewi@gentoo.org>
Sun, 14 Apr 2019 14:17:24 +0000 (15:17 +0100)
The "devices" test fails most of the time but I haven't been able to
figure out why. It seems to work fine other than that.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
dev-libs/weston/Manifest
dev-libs/weston/metadata.xml
dev-libs/weston/weston-6.0.0.ebuild [new file with mode: 0644]
dev-libs/weston/weston-9999.ebuild

index 2c30fde70a94fa246f2fe34f5d2f2f17912e3e42..b383b67e8486d0cfc24b3dc29994ed7f5c0f0342 100644 (file)
@@ -1,2 +1,3 @@
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
 DIST weston-5.0.0.tar.xz 1467496 BLAKE2B 514bc4c4f09dc8bc5b068c66cf14b86687bee1e691f7dfcb251a5ae7fe02389b48626ed02c97eff9334b43e227ea8b83beef48c53a83b4691f59a65af53ad61d SHA512 b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf
+DIST weston-6.0.0.tar.xz 1517032 BLAKE2B 598c525598f877715320d8b468618595d1f7b10ed56aa82c3535b05c369216d1a938d32354e3a8cc9077a0d910d0dbfdcf504fb687c73942d8ad92b13a124bd2 SHA512 127ab64b689f202acca4d9461e4decfd42357e4bbb63493af257b3b20b693a8ab4207b3c6b97663cefeed200505aad5f32b6a064db2e53fa1e201877613b394f
index c976a4437cfc9b3696699008a3f13dceaa5b6a75..c98075bd2fedf32bcd68f38b0ec5fe143cadc600 100644 (file)
@@ -7,9 +7,11 @@
 </maintainer>
 <use>
        <flag name="colord">Allow setting color managment</flag>
+       <flag name="desktop">Enable the desktop shell</flag>
        <flag name="drm">Enable drm compositor support</flag>
        <flag name="editor">Install wayland-editor example application</flag>
        <flag name="fbdev">Enable fbdev compositor support</flag>
+       <flag name="fullscreen">Enable fullscreen/kiosk shell</flag>
        <flag name="gles2">Use GLESv2 cairo instead of full GL</flag>
        <flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag>
        <flag name="ivi">Enable the IVI shell</flag>
diff --git a/dev-libs/weston/weston-6.0.0.ebuild b/dev-libs/weston/weston-6.0.0.ebuild
new file mode 100644 (file)
index 0000000..70df712
--- /dev/null
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999* ]]; then
+       EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+       GIT_ECLASS="git-r3"
+       EXPERIMENTAL="true"
+fi
+
+inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ $PV = 9999* ]]; then
+       SRC_URI="${SRC_PATCHES}"
+       KEYWORDS=""
+else
+       SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+       KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +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 )
+       test? ( desktop headless xwayland )
+       wayland-compositor? ( gles2 )
+"
+
+RDEPEND="
+       >=dev-libs/libinput-0.8.0
+       >=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= )
+       jpeg? ( virtual/jpeg:0= )
+       >=x11-libs/cairo-1.11.3
+       >=x11-libs/libdrm-2.4.68
+       >=x11-libs/libxkbcommon-0.5.0
+       >=x11-libs/pixman-0.25.2
+       x11-misc/xkeyboard-config
+       fbdev? (
+               >=sys-libs/mtdev-1.1.0
+               >=virtual/udev-136
+       )
+       colord? ( >=x11-misc/colord-0.1.27 )
+       drm? (
+               >=media-libs/mesa-17.1[gbm]
+               >=sys-libs/mtdev-1.1.0
+               >=virtual/udev-136
+       )
+       editor? ( x11-libs/pango )
+       gles2? (
+               media-libs/mesa[gles2,wayland]
+       )
+       rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
+       remoting? (
+               media-libs/gstreamer:1.0
+               media-libs/gst-plugins-base:1.0
+       )
+       systemd? (
+               sys-auth/pambase[systemd]
+               >=sys-apps/dbus-1.6
+               >=sys-apps/systemd-209[pam]
+       )
+       launch? ( sys-auth/pambase )
+       X? (
+               >=x11-libs/libxcb-1.9
+               x11-libs/libX11
+       )
+       xwayland? (
+               x11-base/xorg-server[wayland]
+               x11-libs/cairo[xcb]
+               >=x11-libs/libxcb-1.9
+               x11-libs/libXcursor
+       )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+       virtual/pkgconfig
+"
+
+src_configure() {
+       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 wayland-compositor backend-wayland)
+               $(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 desktop shell-desktop)
+               $(meson_use fullscreen shell-fullscreen)
+               $(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() {
+       xdg_environment_reset
+
+       # devices test usually fails.
+       cd "${BUILD_DIR}" || die
+       meson test $(meson test --list | grep -Fxv devices) || die
+}
+
+src_install() {
+       meson_src_install
+       if use launch && use suid; then
+               chmod u+s "${ED}"/usr/bin/weston-launch || die
+       fi
+       readme.gentoo_create_doc
+}
index b06805e2e15d3582fc9e70622585deb95f4aa70d..f0ba4e027b7093eccd5f062de616d7dca7ce11f3 100644 (file)
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = 9999* ]]; then
        EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
        EXPERIMENTAL="true"
 fi
 
-inherit meson readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
+inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
 
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
@@ -25,12 +25,12 @@ fi
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-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"
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +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 )
-       test? ( headless xwayland )
+       test? ( desktop headless xwayland )
        wayland-compositor? ( gles2 )
 "
 
@@ -61,7 +61,7 @@ RDEPEND="
        gles2? (
                media-libs/mesa[gles2,wayland]
        )
-       rdp? ( >=net-misc/freerdp-1.1.0:= )
+       rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
        remoting? (
                media-libs/gstreamer:1.0
                media-libs/gst-plugins-base:1.0
@@ -83,7 +83,8 @@ RDEPEND="
                x11-libs/libXcursor
        )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
        virtual/pkgconfig
 "
 
@@ -94,6 +95,7 @@ src_configure() {
                $(meson_use headless backend-headless)
                $(meson_use rdp backend-rdp)
                $(meson_use screen-sharing screenshare)
+               $(meson_use wayland-compositor backend-wayland)
                $(meson_use X backend-x11)
                $(meson_use fbdev backend-fbdev)
                $(meson_use gles2 renderer-gl)
@@ -101,7 +103,8 @@ src_configure() {
                $(meson_use xwayland)
                $(meson_use systemd)
                $(meson_use remoting)
-               $(meson_use wayland-compositor shell-desktop)
+               $(meson_use desktop shell-desktop)
+               $(meson_use fullscreen shell-fullscreen)
                $(meson_use ivi shell-ivi)
                $(meson_use lcms color-management-lcms)
                $(meson_use colord color-management-colord)
@@ -120,10 +123,7 @@ 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
+       xdg_environment_reset
        meson_src_test
 }