From nobody Wed Apr 10 21:24:46 2024 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 4VFG7L5rB0z5G94j; Wed, 10 Apr 2024 21:24:46 +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 4VFG7L4lwrz4Zy8; Wed, 10 Apr 2024 21:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712784286; 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=dUbWllSdeykEEPIaZimsqGvZ5YzjNJKUiPk4dUZCdOQ=; b=m1qDetunAXmjRn6A1X3lfSLRqoZdGvKpMkhstDodBA6YptELMQ/y5dyIJfvahgb+WZFKNH VYPu2G8lEc+kTPRalWpAgMUPdvgBai6vueaMvzVH/jPS0Pd+jQ637CM012GKTQLxLGEfCA WYZ3ESHqAxMQYNw8UaDmkB5bvPV++IhHJKGpbzd7ZdQTX1fCn9yNYGjoYXRriEnQT5Ep5f z1dWnIX8EL5ZNWSzifb7+E50VguLsGuUFHhkLDSrEirXzvp4E0qWVtVFIrnBsgouE0BSTf mQIsTC47uL4xNjyRySRDBxZKz+07o0qBPLtGXirxC0kQ/o5el8SZHnPl114ooA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712784286; a=rsa-sha256; cv=none; b=fEEYWAjASuWWaJI7X3RNMOmfQ842RLiC0wrQDdjRZlbZ7XjNWlX7m40odXNelgO8xkYNgu AnbUDK4OH7ZQo4eYgpQkT4D/z4eNYi/v/R2efjbs9XqJdYrGRH1EVYU7tNE/6DyS5IwDhS eYJV+oTdCWbePAIi9Jy0KJ3nX48OqywA64EZcgN/UsdorRRPAOyKkEKOuw9PyYpFMiAwj+ Dd+Wc2U2nRnDul1JYx/Cgjvtl5mptdMtdhIMBCzN69XacNXwIfXI1mYcV3zMQ04AlDtvFU D4B+Qol8Cc5x9sJvAUM3bnjCz8DBZtfcdghiJS32g8Rs6On7AL+87/6q21wJhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712784286; 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=dUbWllSdeykEEPIaZimsqGvZ5YzjNJKUiPk4dUZCdOQ=; b=wxNL/Df30K0BsPeCSWjsJZGJhn/c6th6eFshtcejsJkcu8r7o7SY6U8lrUv+oonYiSYPIz 1llhay8dVdM0Io9jvc6bHMVCXt182LSW3ICCt8t90BewY86xZwSJsdATHfJF1TcQ4iUpY/ 4onsU0KsJsCdXxNR5JX1kMueBiHPikRpbYOP6iZzjdsLijgrzkl5zuLTL9Iln0NXx/k5rZ tvSJFVPRPj1zkrGTny067ClnapzRwluqCWsbUWMhtp4XHARogptwPXc5U8CM9W6YXnY9qL Etj9zUcQnPro9alS+t71C3p3Br46VRtR/HJKQRtw5lT0cPguDcbEJ2lqW73Xig== 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 4VFG7L4MPrztys; Wed, 10 Apr 2024 21:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43ALOkh2019661; Wed, 10 Apr 2024 21:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ALOkop019658; Wed, 10 Apr 2024 21:24:46 GMT (envelope-from git) Date: Wed, 10 Apr 2024 21:24:46 GMT Message-Id: <202404102124.43ALOkop019658@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: 75ab4c1ebdff - 2024Q2 - x11-servers/xwayland-devel: update to 21.0.99.1.923 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: dev-commits-ports-branches+owner@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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 75ab4c1ebdff0037fe8ac6d8ac92e1b27b80f5bc Auto-Submitted: auto-generated The branch 2024Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=75ab4c1ebdff0037fe8ac6d8ac92e1b27b80f5bc commit 75ab4c1ebdff0037fe8ac6d8ac92e1b27b80f5bc Author: Jan Beich AuthorDate: 2024-04-09 07:02:26 +0000 Commit: Jan Beich CommitDate: 2024-04-10 21:23:53 +0000 x11-servers/xwayland-devel: update to 21.0.99.1.923 Explicit sync requires https://github.com/freebsd/drm-kmod/issues/278 and currently disabled at build time due to missing Changes: https://gitlab.freedesktop.org/xorg/xserver/-/compare/052909ab9...c7d56b0e2 (cherry picked from commit 7982b8922d80be5c96acc6151aa3301040070dae) (cherry picked from commit 4eca3319032d9570e886222cb61baafbed1226cd) --- x11-servers/xwayland-devel/Makefile | 17 ++++++++++------- x11-servers/xwayland-devel/distinfo | 18 +++++++----------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 1760c0f0f277..1ad2841ad8ca 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -1,16 +1,12 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- -DISTVERSION= 21.0.99.1-841 -DISTVERSIONSUFFIX= -g052909ab9 -PORTREVISION= 3 +DISTVERSION= 21.0.99.1-923 +DISTVERSIONSUFFIX= -gc7d56b0e2 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ -PATCHFILES+= 96798fc19674.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 -PATCHFILES+= 3e77295f888c.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 -PATCHFILES+= 6c684d035c06.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 -PATCHFILES+= bdca6c3d1f50.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463 +PATCHFILES+= cc43713d49ab.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1481 MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Wayland client (development snapshot) @@ -38,6 +34,7 @@ USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= xorg GL_PROJECT= xserver +GL_TUPLE= xorg/proto:xorgproto:xorgproto-2024.1:xorgproto/subprojects/xorgproto MESON_ARGS= -D${PORTNAME}=true \ -Dxorg=false \ -Dxnest=false \ @@ -77,4 +74,10 @@ EI_DESC= Emulated input via libei EI_LIB_DEPENDS= libei.so:x11/libei EI_MESON_OFF= -Dxwayland_ei=false +.ifdef GL_TUPLE +post-configure: + @${REINPLACE_CMD} 's/meson install/& \ + --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja +.endif + .include diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index 5d3e616b8444..70d6f54e37c6 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,11 +1,7 @@ -TIMESTAMP = 1710808655 -SHA256 (xserver-xorg-server-21.0.99.1-841-g052909ab9.tar.bz2) = a5913f854f0d3035cf3c750ee2ddb0f9fd2573daaa1cb47ddc4f0c63b2367a50 -SIZE (xserver-xorg-server-21.0.99.1-841-g052909ab9.tar.bz2) = 3697834 -SHA256 (96798fc19674.patch) = 8b59b74f09476bb44d7b425dc2453b54766db4b7d30e20e1b1f1bef4ad0db7c1 -SIZE (96798fc19674.patch) = 1467 -SHA256 (3e77295f888c.patch) = 33686bbf6ecec42d064b4066b13f79f9e32f86d4ceef819ebdb7567f326fbd7d -SIZE (3e77295f888c.patch) = 1358 -SHA256 (6c684d035c06.patch) = 01ad0be2af7c0a00fd3efd218eee64fb5bd8acbf0978186947f0b6b4b1b9febd -SIZE (6c684d035c06.patch) = 1569 -SHA256 (bdca6c3d1f50.patch) = fcec0b3e508ee12824e7b2e48ede67766104105605ff996ad0df9cb1d9ad389d -SIZE (bdca6c3d1f50.patch) = 3830 +TIMESTAMP = 1712739308 +SHA256 (xserver-xorg-server-21.0.99.1-923-gc7d56b0e2.tar.bz2) = 6eb6b36549db29194da2931e0030ec0774abc960461c204b6205c285bd4e792b +SIZE (xserver-xorg-server-21.0.99.1-923-gc7d56b0e2.tar.bz2) = 3709024 +SHA256 (xorgproto-xorgproto-2024.1.tar.bz2) = 3959b2d17d86dd9d165dc24d26f372ca64f27127cd381739366ba8383a6cd51a +SIZE (xorgproto-xorgproto-2024.1.tar.bz2) = 775116 +SHA256 (cc43713d49ab.patch) = 4d7b0c95f899ead624d26af2952053c2840bec0b4a010e566ef0a0dfb0056f34 +SIZE (cc43713d49ab.patch) = 1011