Diff waffle-1.7.3 with a waffle-1.8.0

/usr/portage/media-libs/waffle/waffle-1.8.0.ebuild 2023-10-09 14:52:31.720368406 +0300
11 11
	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
12 12
	S="${WORKDIR}"/${PN}-v${PV}
13 13
fi
14
inherit meson-multilib multilib ${GIT_ECLASS}
14
inherit meson-multilib multilib virtualx ${GIT_ECLASS}
15 15

  
16 16
DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
17 17
HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle"
18 18

  
19 19
LICENSE="BSD-2"
20 20
SLOT="0"
21
IUSE="doc +egl +gbm wayland X"
22
RESTRICT="test" # gl_basic tests don't work when run from portage
21
IUSE="doc test wayland X"
22
RESTRICT="!test? ( test ) test" # gl_basic tests don't work when run under sandbox
23 23

  
24 24
RDEPEND="
25
	>=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
25
	>=media-libs/mesa-23[${MULTILIB_USEDEP}]
26
	>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
26 27
	X? (
27 28
		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
28 29
		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
29 30
	)
30
	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
31 31
	wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
32 32
"
33 33
DEPEND="${RDEPEND}
......
38 38
	dev-libs/libxslt
39 39
	dev-util/wayland-scanner
40 40
"
41
#	test? (
42
#		wayland? ( dev-libs/weston[headless] )
43
#	)
41 44

  
42 45
MULTILIB_CHOST_TOOLS=(
43 46
	/usr/bin/wflinfo$(get_exeext)
......
48 51
		$(meson_feature X glx)
49 52
		$(meson_feature wayland)
50 53
		$(meson_feature X x11_egl)
51
		$(meson_feature gbm)
52
		$(meson_feature egl surfaceless_egl)
54
		-Dgbm=enabled
55
		-Dsurfaceless_egl=enabled
56

  
57
		$(meson_use test build-tests)
53 58
		$(meson_native_true build-manpages)
54
		-Dbuild-tests=false
59
		-Dbuild-htmldocs=false
60
		-Dbuild-examples=false
55 61
	)
56 62
	meson_src_configure
57 63
}
58 64

  
65
multilib_src_test() {
66
	if use wayland; then
67
		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
68

  
69
		weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 &
70
		compositor=$!
71
		export WAYLAND_DISPLAY=wayland-6
72
	fi
73

  
74
	export MESA_SHADER_CACHE_DISABLE=true
75
	virtx meson_src_test
76

  
77
	if use wayland; then
78
		kill ${compositor}
79
	fi
80
}
81

  
59 82
multilib_src_install() {
60 83
	meson_src_install
61 84
}
Thank you!