From owner-svn-ports-branches@freebsd.org Thu Dec 3 00:01:25 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F387D472863; Thu, 3 Dec 2020 00:01:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CmbbT6blwz4Thk; Thu, 3 Dec 2020 00:01:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D548B7FC7; Thu, 3 Dec 2020 00:01:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B301Pet073623; Thu, 3 Dec 2020 00:01:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B301PSP073622; Thu, 3 Dec 2020 00:01:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202012030001.0B301PSP073622@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 3 Dec 2020 00:01:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r556865 - branches/2020Q4/x11-servers/xwayland-devel X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q4/x11-servers/xwayland-devel X-SVN-Commit-Revision: 556865 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2020 00:01:26 -0000 Author: jbeich Date: Thu Dec 3 00:01:25 2020 New Revision: 556865 URL: https://svnweb.freebsd.org/changeset/ports/556865 Log: 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 Modified: branches/2020Q4/x11-servers/xwayland-devel/Makefile branches/2020Q4/x11-servers/xwayland-devel/distinfo Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/x11-servers/xwayland-devel/Makefile ============================================================================== --- branches/2020Q4/x11-servers/xwayland-devel/Makefile Thu Dec 3 00:00:39 2020 (r556864) +++ branches/2020Q4/x11-servers/xwayland-devel/Makefile Thu Dec 3 00:01:25 2020 (r556865) @@ -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-wayla 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 Modified: branches/2020Q4/x11-servers/xwayland-devel/distinfo ============================================================================== --- branches/2020Q4/x11-servers/xwayland-devel/distinfo Thu Dec 3 00:00:39 2020 (r556864) +++ branches/2020Q4/x11-servers/xwayland-devel/distinfo Thu Dec 3 00:01:25 2020 (r556865) @@ -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