diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-12-03 00:01:25 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-12-03 00:01:25 +0000 |
| commit | 78edae084bc949bb854d0b7da16aadbb6412e34f (patch) | |
| tree | 436a4e4fe8e0fec761343bf143662296d49b94d3 | |
| parent | 556c0e57b5fd0ddf7743815157e1ae8b299fcda6 (diff) | |
| download | ports-78edae084bc949bb854d0b7da16aadbb6412e34f.tar.gz ports-78edae084bc949bb854d0b7da16aadbb6412e34f.zip | |
MFH: r551246 r551246 r553724 r554339 r554805 r555063 r555682 r556316 r556459 r556460 r556859
x11-servers/xwayland-devel: update to 1.20.0.789
- Use -D${PORTNAME}=true to denote the only X server enabled
- Annotate do-install target is a workaround
Changes: https://gitlab.freedesktop.org/xorg/xserver/-/compare/96d19e898...446ff2d31
Notes
Notes:
svn path=/branches/2020Q4/; revision=556865
| -rw-r--r-- | x11-servers/xwayland-devel/Makefile | 13 | ||||
| -rw-r--r-- | x11-servers/xwayland-devel/distinfo | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 0d0ebdc01fe2..f62214a66882 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -2,8 +2,8 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- -DISTVERSION= 1.20.0-741 -DISTVERSIONSUFFIX= -g96d19e898 +DISTVERSION= 1.20.0-789 +DISTVERSIONSUFFIX= -g446ff2d31 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel @@ -34,7 +34,7 @@ USE_GL= gbm gl USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans GH_ACCOUNT= freedesktop GH_PROJECT= xorg-xserver -MESON_ARGS= -Dxwayland=true \ +MESON_ARGS= -D${PORTNAME}=true \ -Dxorg=false \ -Dxnest=false \ -Dxvfb=false \ @@ -42,7 +42,8 @@ MESON_ARGS= -Dxwayland=true \ -Dudev_kms=false \ -Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}" PLIST_FILES= bin/Xwayland \ - libdata/pkgconfig/xwayland.pc + libdata/pkgconfig/xwayland.pc \ + man/man1/Xwayland.1.gz # Keep in sync with xorg-server FONTPATH_ROOT?= ${LOCALBASE}/share/fonts @@ -63,10 +64,12 @@ NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland NVIDIA_MESON_TRUE= xwayland_eglstream do-install: -# Wayland compositors only use the binary +# XXX Prevent Meson from installing unrelated files ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/xwayland/Xwayland \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${BUILD_WRKSRC}/hw/xwayland/xwayland.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig + ${INSTALL_MAN} ${BUILD_WRKSRC}/hw/xwayland/Xwayland.1 \ + ${STAGEDIR}${PREFIX}/man/man1 .include <bsd.port.mk> diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index 84f7c4b1edad..303fdbe1793f 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1601313384 -SHA256 (freedesktop-xorg-xserver-xorg-server-1.20.0-741-g96d19e898_GH0.tar.gz) = 6359c523c08ffc2898592249c41e5c2c2ee15c871f3436a132f757b3e74aab10 -SIZE (freedesktop-xorg-xserver-xorg-server-1.20.0-741-g96d19e898_GH0.tar.gz) = 5107934 +TIMESTAMP = 1606832938 +SHA256 (freedesktop-xorg-xserver-xorg-server-1.20.0-789-g446ff2d31_GH0.tar.gz) = 05c5bfc0e1f2bc265e8c8e7402b583aba387f5db90e29315b101f58e4dd19b9e +SIZE (freedesktop-xorg-xserver-xorg-server-1.20.0-789-g446ff2d31_GH0.tar.gz) = 5114983 SHA256 (9e0086f99b39.patch) = f8af32f1aba1062e351fe43722816ba1dda43ae691bed8a0f855b58341ad8f6c SIZE (9e0086f99b39.patch) = 10714 SHA256 (5ac296eb6c4e.patch) = ce85d0becf366c2a8835ae38347d1a4ce533affeab6f721af7838978fe4d4853 |