From nobody Wed Jul 27 13:22:19 2022 X-Original-To: dev-commits-ports-all@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 4LtDwC2b8Qz4XX14; Wed, 27 Jul 2022 13:22:19 +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 4LtDwC28Rnz3Ycy; Wed, 27 Jul 2022 13:22:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658928139; 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=US8tGFADQwjMHCZeF8LSlZDJcE6jb8jy+g4nJhJry3M=; b=T5bgmPgZMDW+KgToXwLnqN0yS4gSn2AOULnZAZ8oyQ7Pdeckswvg6aH5gO0OsrBDv30j2o GSHdAINyEu//F1FeVzAZa1KkFWQVYc3b4q+WMZWMmWTLR8r8TTU4ElrsJGXNgi1KlLIVEG +k0uknfIFflwPHzvPqw5B4zaVUYRUHoffH7ZeCtfdKTv9E1bWKCpTETV7DO1xKEq1okDMV iVIIDlQe5OVfXNscqVW4i4Y0xwdmjDmPKOYshcHDnEv94+Ka2Hm8QbregBY6bvqXqKnM4T IkUr2Uw1zewLvWfXsZWvRfQV1GoeA9dLgJi5MFlGjP3+qgDiaTPAuCb51wSfQQ== 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 4LtDwC1CpkzJcb; Wed, 27 Jul 2022 13:22:19 +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 26RDMJwQ083474; Wed, 27 Jul 2022 13:22:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RDMJYS083473; Wed, 27 Jul 2022 13:22:19 GMT (envelope-from git) Date: Wed, 27 Jul 2022 13:22:19 GMT Message-Id: <202207271322.26RDMJYS083473@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5f87249229d3 - main - x11-servers/xwayland: update to 22.1.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f87249229d34dcdad7b60433fd423db35203efb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658928139; 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=US8tGFADQwjMHCZeF8LSlZDJcE6jb8jy+g4nJhJry3M=; b=PB2uXfM7ctL+/wyl5zg7VAiFg/AOrl0YIBkdRH/kRY7FieEF0tg7+C+myrTSpAwvpioCTa rHyJDKXCZzv55OwerzqD/ojmgr7CwECsHWIhpDKVEVHdHgdWbCzMBnaNyq2hH4WcAWPtzh U3UIzRbUX3qvJ5KBXRSsXhXGLQH6AlUymsUCOAie8bbKe7saE8ARN0KCyQjpyra7OSy0+W 9UITWG5yqAvPN8wECcBO17NdKHPkMLkL8T/6QpGSujOkJeuSrKf6A54aDCHo1Sx5aNTwvj nnxyXAcm4dm3Web91cVjkPGHh676T+zEVO55itxPva26ExiRSoaNzgPNYKoBzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658928139; a=rsa-sha256; cv=none; b=qA7fwMa8z4XwxG1zTJmkho0aye3AayJu9aAvkrYj9mbl2WXSkxxm8OoCPZo8wDCa+9HdRk fQHPYI9IPr5eCMNMlfC3RmcW/fLgbY2EdZ91SQZSvL3+FHm26+UbFjx74WS2c1/sdcYBPV Fq6AMqlOsoIArPxnq4wdhxHa9ildVnBAC12S3flPvrGtmzfCFk8pycP/ey7g6/taNrA+XI jUkrJ1LgnTUFL35+9vIAN03f1l26UcbYueAYR0nNBbWbcPG5wzEOfigboUAcDU6irPvb2I CZfd/O7VBSBIpzl4ETfwXKZ8Fgx+dItLAqoIzTqhFW+tnqEIQNRHIkZrohVOKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f87249229d34dcdad7b60433fd423db35203efb commit 5f87249229d34dcdad7b60433fd423db35203efb Author: Baptiste Daroussin AuthorDate: 2022-06-29 15:58:18 +0000 Commit: Baptiste Daroussin CommitDate: 2022-07-27 13:08:09 +0000 x11-servers/xwayland: update to 22.1.2 --- x11-servers/xwayland/Makefile | 73 +++++++++++++++++++++++++++++------------- x11-servers/xwayland/distinfo | 9 ++++++ x11-servers/xwayland/pkg-plist | 5 +++ 3 files changed, 64 insertions(+), 23 deletions(-) diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile index 5d0a02e9061c..35acc0194f96 100644 --- a/x11-servers/xwayland/Makefile +++ b/x11-servers/xwayland/Makefile @@ -1,36 +1,63 @@ PORTNAME= xwayland -PORTREVISION= 0 +PORTVERSION= 22.1.2 +PORTEPOCH= 1 +CATEGORIES= x11-servers +MASTER_SITES= XORG/individual/xserver -COMMENT= X Clients under Wayland +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 42e34498f87a.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCHFILES+= 0d56c27582a2.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCHFILES+= 1f7b28547011.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 -LICENSE= MIT +MAINTAINER= x11@FreeBSD.org +COMMENT= X11 server as Wayland Client -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols \ - ${LOCALBASE}/include/linux/input.h:devel/evdev-proto -LIB_DEPENDS= libwayland-client.so:graphics/wayland \ - libinput.so:x11/libinput +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 \ + libxcvt.so:x11/libxcvt +RUN_DEPENDS= xkbcomp:x11/xkbcomp \ + xkeyboard-config>0:x11/xkeyboard-config CONFLICTS_INSTALL= ${PORTNAME}-devel -MASTERDIR= ${.CURDIR}/../xorg-server -DESCR= ${.CURDIR}/pkg-descr - -SLAVE_PORT= yes -USE_XORG= x11 xext -USE_GL+= egl gbm - -CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ - --enable-xwayland --with-default-xkb-ruleset=evdev - -PLIST_FILES= bin/Xwayland +USES= compiler:c11 gl meson pkgconfig xorg tar:xz +USE_GL= egl gbm gl +USE_XORG= pixman xau xfont2 xkbfile xshmfence xtrans + +MESON_ARGS= -Dxvfb=false \ + -Dxdmcp=false \ + -Dxcsecurity=false \ + -Ddri3=true \ + -Dglamor=true \ + -Dsha1=libmd \ + -Dipv6=true \ + -Dxkb_dir=${LOCALBASE}/share/X11/xkb \ + -Dxkb_output_dir=/var/lib/xkb \ + -Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}" + +# 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_CONFIGURE_ENABLE=xwayland-eglstream - -do-install: - cd ${WRKSRC}/hw/xwayland; DESTDIR=${STAGEDIR} ${MAKE_CMD} install +NVIDIA_MESON_TRUE= xwayland_eglstream -.include "${MASTERDIR}/Makefile" +.include diff --git a/x11-servers/xwayland/distinfo b/x11-servers/xwayland/distinfo new file mode 100644 index 000000000000..1ea5745c07df --- /dev/null +++ b/x11-servers/xwayland/distinfo @@ -0,0 +1,9 @@ +TIMESTAMP = 1656586403 +SHA256 (xwayland-22.1.2.tar.xz) = 743c4d56cfc0818755e2281d625d51860b41a473c641e179649a4f41776d1fca +SIZE (xwayland-22.1.2.tar.xz) = 1271848 +SHA256 (42e34498f87a.patch) = 64cd5eed076cdc575f1189e8491fb752054970032697445e6c192b4e63cac2a4 +SIZE (42e34498f87a.patch) = 10310 +SHA256 (0d56c27582a2.patch) = b7a53f6f52c197ac42ae521881c2d5e986f9983f5eb3640ecf1adb51356db40f +SIZE (0d56c27582a2.patch) = 17463 +SHA256 (1f7b28547011.patch) = 483d5e636f011570953579a53814c45789958af94d003cda19cedd394df93ed8 +SIZE (1f7b28547011.patch) = 2472 diff --git a/x11-servers/xwayland/pkg-plist b/x11-servers/xwayland/pkg-plist new file mode 100644 index 000000000000..76fbca053230 --- /dev/null +++ b/x11-servers/xwayland/pkg-plist @@ -0,0 +1,5 @@ +bin/Xwayland +@comment lib/xorg/protocol.txt +libdata/pkgconfig/xwayland.pc +@comment man/man1/Xserver.1.gz +man/man1/Xwayland.1.gz