commit: 34b36c694557dedd9c88f2ec102292a5cb63fea3
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 6 22:20:21 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Sep 6 22:20:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b36c69
dev-libs/weston: Version bump to 14.0.0
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-libs/weston/Manifest | 1 +
dev-libs/weston/files/weston-kiosk-test.patch | 53 ++++++++++++++++++++++
.../{weston-9999.ebuild => weston-14.0.0.ebuild} | 13 ++++--
dev-libs/weston/weston-9999.ebuild | 9 ++--
4 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index a95d2f4929c6..4dc524fdf4d3 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,2 +1,3 @@
DIST weston-13.0.0.tar.xz 1986520 BLAKE2B
df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917
SHA512
8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc
DIST weston-13.0.3.tar.xz 1986952 BLAKE2B
cc3e2be9f1fbcbfd45c9e75a9a34bbb7cd75256d851129e0d29cc0079cbaf4e35eb40b302f557ffe7b89edbc094b1823d667a54d44a9af765945e3ca541068fc
SHA512
60e655b57cf418902ec6e4371883354165241d9a99a712aabe2165e11ac190dec22836fd885f5178def5416dc5f00e70042b022c96a8e0aa74827bbd4563f9cb
+DIST weston-14.0.0.tar.xz 2043020 BLAKE2B
1a92e3b04677f3ba1f2c02f15aba64511774dd08738c2a490135a1ca7200a846c1b5102349a36c76e2dd6a9e39bd041cd25c2552958741e96f8291fd3029046e
SHA512
8bdeed91befd5cbb0bde0f1860ff7775c1835a5fa8c3bf26e99d2f0c16e81255fcf35bf338ae02d7826463d0efdf41ba3fe78e38e4c27787831dfa331acafc08
diff --git a/dev-libs/weston/files/weston-kiosk-test.patch
b/dev-libs/weston/files/weston-kiosk-test.patch
new file mode 100644
index 000000000000..7fe340a75bb3
--- /dev/null
+++ b/dev-libs/weston/files/weston-kiosk-test.patch
@@ -0,0 +1,53 @@
+From 4d5224027c941224eb9a7aaa71c949558f2b4796 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <[email protected]>
+Date: Fri, 6 Sep 2024 23:15:05 +0100
+Subject: [PATCH] tests: Make the kiosk test dependent on the shell-kiosk
+ option
+
+Signed-off-by: James Le Cuirot <[email protected]>
+---
+ tests/meson.build | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 45b475c3..4b52cb29 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -180,14 +180,6 @@ tests = [
+ input_timestamps_unstable_v1_protocol_c,
+ ],
+ },
+- {
+- 'name': 'kiosk-shell',
+- 'sources': [
+- 'kiosk-shell-test.c',
+- xdg_shell_client_protocol_h,
+- xdg_shell_protocol_c,
+- ],
+- },
+ {
+ 'name': 'linux-explicit-synchronization',
+ 'sources': [
+@@ -427,6 +419,19 @@ if get_option('shell-ivi')
+ ]
+ endif
+
++if get_option('shell-kiosk')
++ tests += [
++ {
++ 'name': 'kiosk-shell',
++ 'sources': [
++ 'kiosk-shell-test.c',
++ xdg_shell_client_protocol_h,
++ xdg_shell_protocol_c,
++ ],
++ },
++ ]
++endif
++
+ test_config_h = configuration_data()
+ test_config_h.set_quoted('WESTON_TEST_REFERENCE_PATH',
meson.current_source_dir() + '/reference')
+ test_config_h.set_quoted('WESTON_MODULE_MAP', env_modmap)
+--
+2.46.0
+
diff --git a/dev-libs/weston/weston-9999.ebuild
b/dev-libs/weston/weston-14.0.0.ebuild
similarity index 93%
copy from dev-libs/weston/weston-9999.ebuild
copy to dev-libs/weston/weston-14.0.0.ebuild
index 3df7fd4b2e1c..17020667a9de 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-14.0.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI="${SRC_PATCHES}"
else
SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
fi
LICENSE="MIT CC-BY-SA-3.0"
@@ -49,14 +49,14 @@ RDEPEND="
>=x11-libs/pixman-0.25.2
x11-misc/xkeyboard-config
drm? (
- =media-libs/libdisplay-info-0.1*
+ <media-libs/libdisplay-info-0.3.0:=
>=media-libs/mesa-17.1[gbm(+)]
>=sys-libs/mtdev-1.1.0
>=virtual/udev-136
)
editor? ( x11-libs/pango )
examples? ( x11-libs/pango )
- gles2? ( media-libs/mesa[gles2(+),wayland] )
+ gles2? ( media-libs/libglvnd )
jpeg? ( media-libs/libjpeg-turbo:0= )
lcms? ( >=media-libs/lcms-2.9:2 )
pipewire? ( >=media-video/pipewire-0.3:= )
@@ -85,7 +85,7 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- >=dev-libs/wayland-protocols-1.24
+ >=dev-libs/wayland-protocols-1.33
"
BDEPEND="
${PYTHON_DEPS}
@@ -94,6 +94,10 @@ BDEPEND="
$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-kiosk-test.patch
+)
+
python_check_deps() {
python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
}
@@ -126,6 +130,7 @@ src_configure() {
$(meson_use examples demo-clients)
-Dsimple-clients=$(usex examples
damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
$(meson_use resize-optimization resize-pool)
+ $(meson_use test tests)
-Dtest-junit-xml=false
"${myconf[@]}"
)
diff --git a/dev-libs/weston/weston-9999.ebuild
b/dev-libs/weston/weston-9999.ebuild
index 3df7fd4b2e1c..62c8cc6c4eac 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI="${SRC_PATCHES}"
else
SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
fi
LICENSE="MIT CC-BY-SA-3.0"
@@ -49,14 +49,14 @@ RDEPEND="
>=x11-libs/pixman-0.25.2
x11-misc/xkeyboard-config
drm? (
- =media-libs/libdisplay-info-0.1*
+ <media-libs/libdisplay-info-0.3.0:=
>=media-libs/mesa-17.1[gbm(+)]
>=sys-libs/mtdev-1.1.0
>=virtual/udev-136
)
editor? ( x11-libs/pango )
examples? ( x11-libs/pango )
- gles2? ( media-libs/mesa[gles2(+),wayland] )
+ gles2? ( media-libs/libglvnd )
jpeg? ( media-libs/libjpeg-turbo:0= )
lcms? ( >=media-libs/lcms-2.9:2 )
pipewire? ( >=media-video/pipewire-0.3:= )
@@ -85,7 +85,7 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- >=dev-libs/wayland-protocols-1.24
+ >=dev-libs/wayland-protocols-1.33
"
BDEPEND="
${PYTHON_DEPS}
@@ -126,6 +126,7 @@ src_configure() {
$(meson_use examples demo-clients)
-Dsimple-clients=$(usex examples
damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
$(meson_use resize-optimization resize-pool)
+ $(meson_use test tests)
-Dtest-junit-xml=false
"${myconf[@]}"
)
