diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2021-05-30 20:26:51 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2021-05-30 20:34:58 +0000 |
| commit | 271311970c094bb6ceda0de1d7c4bfe27db478ee (patch) | |
| tree | c98a0adf3857a855acb04aa57a89b18664efed73 /x11-servers | |
| parent | b687f54982762ce5b92c7fe5f84ef5b1060b7f8d (diff) | |
| download | ports-271311970c094bb6ceda0de1d7c4bfe27db478ee.tar.gz ports-271311970c094bb6ceda0de1d7c4bfe27db478ee.zip | |
x11-servers/xwayland-devel: unbreak after b687f5498276 via bundled xorgproto
meson.build:73:0: ERROR: Invalid version of dependency, need 'inputproto' ['>= 2.3.99.1'] found '2.3.2'.
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xwayland-devel/Makefile | 11 | ||||
| -rw-r--r-- | x11-servers/xwayland-devel/distinfo | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index d84ede0d92ac..244588c50d7c 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -9,6 +9,7 @@ PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 231720f8b212.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 PATCHFILES+= 48a7bfeb4687.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 PATCHFILES+= 9fef4b809165.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCHFILES+= f29d0a945a56.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/678 MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Wayland client (development snapshot) @@ -33,6 +34,7 @@ USE_GL= gbm gl USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans GH_ACCOUNT= mirror GH_PROJECT= xserver +GH_TUPLE= freedesktop:xorg-xorgproto:xorgproto-2021.4.99.2:xorgproto/subprojects/xorgproto MESON_ARGS= -D${PORTNAME}=true \ -Dxorg=false \ -Dxnest=false \ @@ -64,4 +66,13 @@ NVIDIA_DESC= EGLStream support for glamor on Xwayland NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland NVIDIA_MESON_TRUE= xwayland_eglstream +.ifdef GH_TUPLE +post-install: +# https://github.com/mesonbuild/meson/issues/2550 + @${RM} -r ${STAGEDIR}${PREFIX}/include/GL + @${RM} -r ${STAGEDIR}${PREFIX}/include/X11 + @${RM} -r ${STAGEDIR}${PREFIX}/share/doc/xorgproto + @${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig +.endif + .include <bsd.port.mk> diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index 1cf8bb5ab0b3..706970b6371f 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,9 +1,13 @@ TIMESTAMP = 1622372398 SHA256 (mirror-xserver-xorg-server-1.20.0-959-gbcb1de600_GH0.tar.gz) = 16fa61c0d6a906c4907ba77c609e3fb32807126c3ee4fbd8a0e25f960bf9bdda SIZE (mirror-xserver-xorg-server-1.20.0-959-gbcb1de600_GH0.tar.gz) = 5859751 +SHA256 (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = ea68fe40cf55247538fd3f0f891ef0ba229b541b56e0874b7efed60688228638 +SIZE (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = 981510 SHA256 (231720f8b212.patch) = ed3db053b86e5c7492cefb9dbb3dd373609f9318a5b848382aac59da322188f0 SIZE (231720f8b212.patch) = 10714 SHA256 (48a7bfeb4687.patch) = ae284622227b317085360f61553bae7fc21a57f4d2b6d4133a6ead0c93b47cee SIZE (48a7bfeb4687.patch) = 17542 SHA256 (9fef4b809165.patch) = c658d16069924edc461cb030136f12b1cb73d82496a2548a5df7f335f3735012 SIZE (9fef4b809165.patch) = 2466 +SHA256 (f29d0a945a56.patch) = 11f3c0caf2187df9850f52de3149d6e45f3f5ecb2161cb84b724d358b99524f5 +SIZE (f29d0a945a56.patch) = 5679 |