diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 4f394a38fbb1..516b9d888f88 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -1,72 +1,72 @@ # $FreeBSD$ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- -DISTVERSION= 1.20.0-714 -DISTVERSIONSUFFIX= -g2902b7853 +DISTVERSION= 1.20.0-719 +DISTVERSIONSUFFIX= -g727df0a74 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 9e0086f99b39.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 -PATCHFILES+= 32bd2b1592f6.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCHFILES+= 5ac296eb6c4e.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Wayland client (development snapshot) LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ ${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \ wayland-protocols>=1.18:graphics/wayland-protocols LIB_DEPENDS= libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy \ libwayland-client.so:graphics/wayland RUN_DEPENDS= xkbcomp:x11/xkbcomp \ xkeyboard-config>0:x11/xkeyboard-config CONFLICTS_INSTALL= ${PORTNAME} USES= compiler:c11 gl meson pkgconfig xorg USE_GITHUB= yes USE_GL= gbm gl USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans GH_ACCOUNT= freedesktop GH_PROJECT= xorg-xserver MESON_ARGS= -Dxwayland=true \ -Dxorg=false \ -Dxnest=false \ -Dxvfb=false \ -Dudev=false \ -Dudev_kms=false \ -Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}" PLIST_FILES= bin/Xwayland \ libdata/pkgconfig/xwayland.pc # Keep in sync with xorg-server FONTPATH_ROOT?= ${LOCALBASE}/share/fonts FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/misc/ \ ${FONTPATH_ROOT}/TTF/ \ ${FONTPATH_ROOT}/OTF/ \ ${FONTPATH_ROOT}/Type1/ \ ${FONTPATH_ROOT}/100dpi/ \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} OPTIONS_DEFINE= NVIDIA NVIDIA_DESC= EGLStream support for glamor on Xwayland NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland NVIDIA_MESON_TRUE= xwayland_eglstream do-install: # Wayland compositors only use the binary ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/xwayland/Xwayland \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${BUILD_WRKSRC}/hw/xwayland/xwayland.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index 2ef7bd0a5e76..8b0f22da1413 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1598367689 -SHA256 (freedesktop-xorg-xserver-xorg-server-1.20.0-714-g2902b7853_GH0.tar.gz) = 2c25e9c8840a263d299bc6ced8c34e7a82e8ec81c1d6da33a0d01e0c53c71058 -SIZE (freedesktop-xorg-xserver-xorg-server-1.20.0-714-g2902b7853_GH0.tar.gz) = 5107809 +TIMESTAMP = 1598966037 +SHA256 (freedesktop-xorg-xserver-xorg-server-1.20.0-719-g727df0a74_GH0.tar.gz) = aa9cb66659c0e186a1b807da969fe4d945c29dfa062b0ee1cdb5d3b6ec96aaed +SIZE (freedesktop-xorg-xserver-xorg-server-1.20.0-719-g727df0a74_GH0.tar.gz) = 5108066 SHA256 (9e0086f99b39.patch) = f8af32f1aba1062e351fe43722816ba1dda43ae691bed8a0f855b58341ad8f6c SIZE (9e0086f99b39.patch) = 10714 -SHA256 (32bd2b1592f6.patch) = 812adcbe5c15d644c28f352752f328ac406de6a1603cffa3b8cfdd725434c794 -SIZE (32bd2b1592f6.patch) = 17780 +SHA256 (5ac296eb6c4e.patch) = ce85d0becf366c2a8835ae38347d1a4ce533affeab6f721af7838978fe4d4853 +SIZE (5ac296eb6c4e.patch) = 17729