From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/
Date: Sun, 10 Mar 2019 13:10:43 +0000 (UTC) [thread overview]
Message-ID: <1552223341.e9b91e3e81bc779c07b7b52619277ce6e873fae9.chewi@gentoo> (raw)
commit: e9b91e3e81bc779c07b7b52619277ce6e873fae9
Author: makepost <makepost <AT> firemail <DOT> cc>
AuthorDate: Sun Mar 10 07:15:22 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 13:09:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b91e3e
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 <AT> firemail.cc>
Closes: https://github.com/gentoo/gentoo/pull/11326
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-libs/weston/weston-9999.ebuild | 97 +++++++++++++++-----------------------
1 file changed, 39 insertions(+), 58 deletions(-)
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 40aa43e4412..1a039dffa31 100644
--- 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
}
next reply other threads:[~2019-03-10 13:10 UTC|newest]
Thread overview: 148+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-10 13:10 James Le Cuirot [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-19 13:19 [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/ James Le Cuirot
2025-05-19 13:14 James Le Cuirot
2025-03-13 3:15 Sam James
2025-03-13 1:21 Sam James
2025-03-13 1:09 Sam James
2025-03-13 1:09 Sam James
2025-03-13 0:53 Sam James
2024-12-15 23:01 James Le Cuirot
2024-10-25 21:05 James Le Cuirot
2024-10-15 13:34 James Le Cuirot
2024-09-06 22:37 James Le Cuirot
2024-09-06 22:37 James Le Cuirot
2024-09-05 22:07 James Le Cuirot
2024-09-05 22:07 James Le Cuirot
2024-09-05 22:07 James Le Cuirot
2024-07-01 13:43 James Le Cuirot
2024-06-30 15:05 James Le Cuirot
2024-06-08 9:31 James Le Cuirot
2024-06-08 9:31 James Le Cuirot
2024-05-28 22:28 Ionen Wolkens
2024-04-26 22:07 James Le Cuirot
2024-04-26 22:07 James Le Cuirot
2024-04-26 22:07 James Le Cuirot
2024-04-26 21:58 James Le Cuirot
2024-04-26 21:32 James Le Cuirot
2024-04-26 21:32 James Le Cuirot
2024-04-26 0:14 Sam James
2024-04-26 0:14 Sam James
2024-04-25 22:18 Sam James
2024-04-25 22:18 Sam James
2024-04-25 21:10 James Le Cuirot
2024-04-24 22:59 James Le Cuirot
2024-04-24 17:39 Arthur Zamarin
2024-04-19 8:31 Arthur Zamarin
2024-04-16 22:29 Sam James
2024-03-17 16:35 Mike Gilbert
2023-12-30 18:39 Mike Gilbert
2023-12-17 22:59 James Le Cuirot
2023-11-28 22:56 James Le Cuirot
2023-11-28 22:56 James Le Cuirot
2023-10-17 21:34 James Le Cuirot
2023-08-07 13:45 James Le Cuirot
2023-08-07 12:54 James Le Cuirot
2023-08-04 21:54 James Le Cuirot
2023-06-24 13:41 James Le Cuirot
2023-06-13 18:10 Arthur Zamarin
2023-05-27 9:12 James Le Cuirot
2023-05-27 6:35 Arthur Zamarin
2023-05-27 6:35 Arthur Zamarin
2023-05-27 6:34 Arthur Zamarin
2023-05-22 19:36 James Le Cuirot
2023-05-20 20:22 James Le Cuirot
2023-05-20 20:22 James Le Cuirot
2023-05-05 9:43 Arthur Zamarin
2023-04-26 21:37 James Le Cuirot
2023-03-19 10:46 James Le Cuirot
2023-03-11 17:04 Sam James
2022-12-24 17:12 James Le Cuirot
2022-12-24 17:12 James Le Cuirot
2022-12-21 23:15 James Le Cuirot
2022-12-21 23:15 James Le Cuirot
2022-12-08 22:06 James Le Cuirot
2022-12-05 17:24 WANG Xuerui
2022-12-05 17:24 WANG Xuerui
2022-09-28 21:03 James Le Cuirot
2022-09-25 13:40 James Le Cuirot
2022-08-08 22:57 James Le Cuirot
2022-07-27 22:38 James Le Cuirot
2022-06-24 9:24 James Le Cuirot
2022-06-24 9:24 James Le Cuirot
2022-05-21 9:25 James Le Cuirot
2022-05-15 3:10 Sam James
2022-05-10 4:06 Arthur Zamarin
2022-05-07 18:28 Arthur Zamarin
2022-04-30 12:06 Arthur Zamarin
2022-04-30 12:00 Arthur Zamarin
2022-04-30 12:00 Arthur Zamarin
2022-04-30 12:00 Arthur Zamarin
2022-04-30 12:00 Arthur Zamarin
2022-02-05 22:58 James Le Cuirot
2022-02-05 17:01 James Le Cuirot
2022-01-12 6:24 Georgy Yakovlev
2021-09-24 22:05 James Le Cuirot
2021-09-24 22:05 James Le Cuirot
2021-08-25 0:10 Marek Szuba
2021-08-20 0:28 Sam James
2021-08-18 1:41 Sam James
2021-08-18 1:28 Sam James
2021-08-18 1:28 Sam James
2021-07-26 19:52 Piotr Karbowski
2021-05-29 8:58 James Le Cuirot
2021-05-15 1:59 Sam James
2021-04-11 12:28 James Le Cuirot
2021-04-03 15:44 Sam James
2021-02-18 8:50 Sam James
2021-01-19 19:17 Sam James
2021-01-01 18:25 Andreas Sturmlechner
2020-12-17 11:59 Sam James
2020-12-02 23:31 Thomas Deutschmann
2020-09-05 10:32 James Le Cuirot
2020-09-05 10:32 James Le Cuirot
2020-09-05 10:32 James Le Cuirot
2020-07-25 20:39 James Le Cuirot
2020-03-08 17:21 James Le Cuirot
2020-03-08 10:42 Agostino Sarubbo
2020-03-08 10:37 Agostino Sarubbo
2020-03-08 10:25 Agostino Sarubbo
2020-02-15 23:38 James Le Cuirot
2020-02-15 23:38 James Le Cuirot
2020-01-14 22:39 James Le Cuirot
2019-11-24 23:49 James Le Cuirot
2019-09-14 13:35 James Le Cuirot
2019-08-26 9:00 James Le Cuirot
2019-08-26 9:00 James Le Cuirot
2019-08-18 10:20 James Le Cuirot
2019-08-10 9:21 James Le Cuirot
2019-06-25 19:46 James Le Cuirot
2019-06-25 19:46 James Le Cuirot
2019-04-30 22:00 James Le Cuirot
2019-04-14 21:47 James Le Cuirot
2019-04-14 21:47 James Le Cuirot
2019-04-14 14:17 James Le Cuirot
2019-04-14 14:17 James Le Cuirot
2018-11-16 23:05 James Le Cuirot
2018-11-16 23:05 James Le Cuirot
2018-10-19 8:51 Michał Górny
2018-08-19 20:17 James Le Cuirot
2018-05-13 11:30 Markus Meier
2018-05-06 12:26 Mikle Kolyada
2017-09-14 10:25 James Le Cuirot
2017-09-14 10:25 James Le Cuirot
2017-09-14 10:25 James Le Cuirot
2017-08-17 17:06 Michał Górny
2017-03-09 14:39 Chí-Thanh Christopher Nguyễn
2017-03-09 14:39 Chí-Thanh Christopher Nguyễn
2017-03-03 4:25 Matt Turner
2016-10-04 18:12 Manuel Rüger
2016-08-05 17:23 Markus Meier
2016-06-04 11:18 Chí-Thanh Christopher Nguyễn
2016-03-10 18:20 Chí-Thanh Christopher Nguyễn
2015-12-19 19:56 Markus Meier
2015-09-22 16:33 Matt Turner
2015-08-31 21:24 Matt Turner
2015-08-30 20:00 Matt Turner
2015-08-30 0:43 Matt Turner
2015-08-30 0:43 Matt Turner
2015-08-30 0:08 Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1552223341.e9b91e3e81bc779c07b7b52619277ce6e873fae9.chewi@gentoo \
--to=chewi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox