aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2021-12-26 12:35:08 +0000
committerJan Beich <jbeich@FreeBSD.org>2021-12-26 12:36:50 +0000
commite3dde9b37b787b10d81175d36467714719c10695 (patch)
tree0ee37f0a685add77cf55e707b469960236c5b6d9
parentb6f4f1e6971a07341b925f066409fa5e7a2993fd (diff)
downloadports-e3dde9b37b787b10d81175d36467714719c10695.tar.gz
ports-e3dde9b37b787b10d81175d36467714719c10695.zip
x11-servers/xwayland-devel: drop inputproto workaround after bea752c6b22e
-rw-r--r--x11-servers/xwayland-devel/Makefile10
-rw-r--r--x11-servers/xwayland-devel/distinfo2
2 files changed, 0 insertions, 12 deletions
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index d29b4b8bba46..8440de73c2ae 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -34,7 +34,6 @@ USE_GL= gbm gl
USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
GH_ACCOUNT= freedesktop
GH_PROJECT= xorg-xserver
-GH_TUPLE= freedesktop:xorg-xorgproto:xorgproto-2021.4.99.2:xorgproto/subprojects/xorgproto
MESON_ARGS= -D${PORTNAME}=true \
-Dxorg=false \
-Dxnest=false \
@@ -66,13 +65,4 @@ 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 1e06562dc36f..7ccda9d0f153 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,8 +1,6 @@
TIMESTAMP = 1640015830
SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-156-g38291fa86_GH0.tar.gz) = c5adfcfd8e764c1a27d4d34b49a203e0ecb23360caab37b016ac81953f36b7bc
SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-156-g38291fa86_GH0.tar.gz) = 5457201
-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 (42e34498f87a.patch) = 29df34103d68165f6284ad0a2f62873b6e824aa318b15a54fff20bb3c4207d4e
SIZE (42e34498f87a.patch) = 10298
SHA256 (0d56c27582a2.patch) = f3081ec0184c0cb764c4ec065d4e437e23741523cf77231f84d48253435ff49b