diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2022-10-10 11:43:43 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2022-10-14 14:27:25 +0000 |
| commit | ac7c9db4410c3e3b50ea90c8a63ee16ce866ec16 (patch) | |
| tree | 31b8e2538cabefe55a1e0e74168ecef14c906151 | |
| parent | 2f14955ca9e4fa2346661ddec532f3e2aa8664a6 (diff) | |
| download | ports-ac7c9db4410c3e3b50ea90c8a63ee16ce866ec16.tar.gz ports-ac7c9db4410c3e3b50ea90c8a63ee16ce866ec16.zip | |
x11-toolkits/wlroots-devel: unbreak after 2f14955ca9e4 via bundling
===> wlroots-devel-0.15.0.478 depends on package: wayland-protocols>=1.27 - not found
===> Installing existing package /packages/All/wayland-protocols-1.26.pkg
Installing wayland-protocols-1.26...
Extracting wayland-protocols-1.26: 100%
===> wlroots-devel-0.15.0.478 depends on package: wayland-protocols>=1.27 - not found
*** Error code 1
Dependency wayland-protocols found: NO found 1.26 but need: '>=1.27'
Did not find CMake 'cmake'
Found CMake: NO
Run-time dependency wayland-protocols found: NO (tried pkgconfig and cmake)
Looking for a fallback subproject for the dependency wayland-protocols
protocol/meson.build:1:0: ERROR: Neither a subproject directory nor a wayland-protocols.wrap file was found.
protocol/meson.build:65:1: ERROR: File //usr/local/share/wayland-protocols/staging/ext-idle-notify/ext-idle-notify-v1.xml does not exist.
(direct commit to 2022Q4 as 13a88fcede18 is missing on the branch)
| -rw-r--r-- | x11-toolkits/wlroots-devel/Makefile | 8 | ||||
| -rw-r--r-- | x11-toolkits/wlroots-devel/distinfo | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index 78326b09890f..4798d2bc9f1c 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -17,7 +17,6 @@ WWW= https://gitlab.freedesktop.org/wlroots/wlroots LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= wayland-protocols>=1.27:graphics/wayland-protocols LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ @@ -31,12 +30,19 @@ USE_XORG= pixman USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org GL_COMMIT= 3a949ea8eb0277f52d10ef0d54760323752321c9 +GL_TUPLE= wayland:wayland-protocols:e631010ab7b96988e7c64c24b7d90f64717eaeee:wlproto/subprojects/wayland-protocols MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} .ifdef PKGNAMESUFFIX PORTSCOUT= ignore:1 PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default MESON_ARGS+= -Ddatadir="${LOCALBASE}/share" + +post-install: post-install${PKGNAMESUFFIX} +post-install${PKGNAMESUFFIX}: +# XXX USES=meson invokes ninja directly, so doesn't support --skip-subprojects + @${RM} -r ${STAGEDIR}${LOCALBASE}/share/pkgconfig + @${RM} -r ${STAGEDIR}${LOCALBASE}/share/wayland-protocols .endif OPTIONS_DEFINE= DRM OPENGL VULKAN X11 diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo index 65ba532f5e48..efac4c067c6b 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,6 +1,8 @@ TIMESTAMP = 1665754575 SHA256 (wlroots-wlroots-3a949ea8eb0277f52d10ef0d54760323752321c9_GL0.tar.gz) = 932c461cc1cccfe992af12308fb3b17e2218cb58876b72ab446b6a4086d30ec2 SIZE (wlroots-wlroots-3a949ea8eb0277f52d10ef0d54760323752321c9_GL0.tar.gz) = 586059 +SHA256 (wayland-wayland-protocols-e631010ab7b96988e7c64c24b7d90f64717eaeee_GL0.tar.gz) = d6700f08259e7aabbd376e6f8dd2d85260452d0b05eac94150ad1219f714c28d +SIZE (wayland-wayland-protocols-e631010ab7b96988e7c64c24b7d90f64717eaeee_GL0.tar.gz) = 115303 SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da217017188ba7195e SIZE (7c0e2a271a4c.patch) = 5729 SHA256 (a5df0a02a2d9.patch) = df5deb1714001870b846501cbee1e775468ac9c61e735ee3b4ad3a2b83c5573e |