From nobody Sun Aug 14 10:44:01 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M5DYF6KCdz4Y7Dt; Sun, 14 Aug 2022 10:44:01 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M5DYF5w9xz3ylm; Sun, 14 Aug 2022 10:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660473841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WTm5DZT2jvWofxv515dAgnFqA+HR3qoiOJIwYTEt/P0=; b=mf/3boEeAycdLFgDzUaTgJKUmNwuSVYEfNSZghx0Av0kc2Wv0PpJiM71NiKJDEWEgtJ787 tb0iQNLrKBLIvUnN+YnSP5txN0S/PklM2W+QFsx657vqMN1lLAat97fKnTZRALWXe/KFpP 5n+db330mS9vJSQ/xIaJo7tXA8wgxZDaVGX/GnR4agLFhFGRtd6zUVZda333cAXwXX8aJr 8vQ6I0Gpa6Ol11YNFhxqrmuWmd5U5YfXp/5QZ7bl6CdSdhWu5XLUDM1oJUwpDCzciEZJHR udGwzp9+JcDbkua3qTHTN0uEdLHW9xpDE8jOlR+R82K7GrLJnmdpplZZHy+wyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M5DYF4yDvznZY; Sun, 14 Aug 2022 10:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27EAi1cN011164; Sun, 14 Aug 2022 10:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27EAi1MB011163; Sun, 14 Aug 2022 10:44:01 GMT (envelope-from git) Date: Sun, 14 Aug 2022 10:44:01 GMT Message-Id: <202208141044.27EAi1MB011163@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 0313e6adc31b - 2022Q3 - x11-servers/xwayland-devel: dedup HiDPI code after 05cdd9ed2abe List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 0313e6adc31bc220b94e972fa6955aeb171301de Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660473841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WTm5DZT2jvWofxv515dAgnFqA+HR3qoiOJIwYTEt/P0=; b=DYxl49uGnsMw25fmhWugwGpj8xMB7mdugLzC6JqOfZ3CaD4nyZ52cSK9McVfhYvPKaMyZp Y0oLoazTR2Q1BtC5gCNvzP4cWBPVtD4xuxN5VuQlaK0mvuAuclRFwVxBuVZevbL91UobZD TIdeyYXbijFzX8p1mMXUJhd8kQkhbV/JQ83VXYWw2Bf/GoQ3kejDLDSRroBzsoPe/ydEt3 6WGshjQ01vJQBbZ7+FzxRlIdYUuYt5KgfN5ZMMOxRQsMdSMNyWlADyLcVOaADSij5fxOWg 1WgehxSWofpAG6DOI3E3QTauXWJ/N1xG0O+Qomu8YFXyW8rkAWC0pGAWmRhnSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660473841; a=rsa-sha256; cv=none; b=ElwcboqMAatMuz3ruvp4ryiUQnpI1I1f68iVdxznReQvaIycN1ecAWVXK0RvzaRr7WNm5O bzw1EwM+bz+AjDvHvwYm+7ra0CtiuuTlrGsUc8XjXsqmlTvNiECsarIBBXclu3AibDxLyz hPXPfmXnTesxa+Gdnz3V+KIGr3QCW8kdMepJimgnwa+3MXrREO6n8+rhfg/a7WD9ZFCfHH YTloHbPHDp84dGOoMeNJub9WAfVU9FaJeen3uLPN7LzzGULLgyTbzwAGor4Nj0xXpyQnYh 5UbjgtFa9hUMPE5FxYEcO2OwMPlYmYEz/NGX1+FvG8TwyOlJffwQph45X3THAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0313e6adc31bc220b94e972fa6955aeb171301de commit 0313e6adc31bc220b94e972fa6955aeb171301de Author: Jan Beich AuthorDate: 2022-08-14 07:56:35 +0000 Commit: Jan Beich CommitDate: 2022-08-14 10:40:21 +0000 x11-servers/xwayland-devel: dedup HiDPI code after 05cdd9ed2abe (cherry picked from commit dedc6d2cf5fcaa0c253557863b19bd05919e3457) --- x11-servers/xwayland-devel/Makefile | 18 +++++++++++++++--- x11-servers/xwayland-devel/distinfo | 16 ++++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 45e5ef1c0ff0..b8dc06dfda73 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -2,13 +2,15 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 21.0.99.1-265 DISTVERSIONSUFFIX= -g2700bc604 +PORTREVISION= 1 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 4d0b5797ea05.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 -PATCHFILES+= d7f5c14cea5e.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 -PATCHFILES+= ede2ad4556df.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCHFILES+= 38be22990fbf.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/960 +PATCHFILES+= 27d3b00b1ffd.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCHFILES+= 9e1ea1442d7f.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCHFILES+= 74813b4c09ca.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Wayland client (development snapshot) @@ -34,6 +36,7 @@ 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-2022.2:xorgproto/subprojects/xorgproto MESON_ARGS= -D${PORTNAME}=true \ -Dxorg=false \ -Dxnest=false \ @@ -72,4 +75,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: +# XXX USES=meson invokes ninja directly, so doesn't support --skip-subprojects + @${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 diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index 89967bdcfb2b..8a2e5def6c39 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,9 +1,13 @@ TIMESTAMP = 1660177832 SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-265-g2700bc604_GH0.tar.gz) = f3bdce492e28148c0524482f257f510c2d065c523fca766abae28c58931c3cda SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-265-g2700bc604_GH0.tar.gz) = 5468202 -SHA256 (4d0b5797ea05.patch) = 2e152a5e6fa50e7205c2a5cd2058de0385e4b8c101a070f6cb35fdfd358aa4fa -SIZE (4d0b5797ea05.patch) = 10466 -SHA256 (d7f5c14cea5e.patch) = e78515da18998c55d0c54e11c0ad7d40a8eb5b7403e35efffe90f5582e8f28a5 -SIZE (d7f5c14cea5e.patch) = 18413 -SHA256 (ede2ad4556df.patch) = b3a15198f6a262b1c4cab9eb4c59e98b7037ed2811d69b6f5ed974015d4c0bb2 -SIZE (ede2ad4556df.patch) = 2519 +SHA256 (freedesktop-xorg-xorgproto-xorgproto-2022.2_GH0.tar.gz) = 407311f6fab7cd17404ee0a25eb11cbee0aac0347ddc36ae841070490116a204 +SIZE (freedesktop-xorg-xorgproto-xorgproto-2022.2_GH0.tar.gz) = 983580 +SHA256 (38be22990fbf.patch) = 0a42d8e71c9caaae34bb31a07abc72b81a0fe70eecf929dc9bfbf50f2a55cb10 +SIZE (38be22990fbf.patch) = 888 +SHA256 (27d3b00b1ffd.patch) = 5dd976d9b9cda681fdb7917c59900fd20e30296e0c4d0572b948946953d65d29 +SIZE (27d3b00b1ffd.patch) = 3884 +SHA256 (9e1ea1442d7f.patch) = 3e5f8761953e27cf877b5f3834c97ab236129e26c5a6376143da731a114427fe +SIZE (9e1ea1442d7f.patch) = 18413 +SHA256 (74813b4c09ca.patch) = 1e115e88f1e2b078a0c2aa32da6ea6dfe6f39451f334b4313c625e10986deb30 +SIZE (74813b4c09ca.patch) = 2519