diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 6132a9e6bb1d..9759fc744065 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -1,87 +1,82 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 21.0.99.1-664 DISTVERSIONSUFFIX= -g133e0d651 -PORTREVISION= 1 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel PATCH_SITES+= https://github.com/mirror/${GL_PROJECT}/commit/:github PATCHFILES+= cd6c9c1246af.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 PATCHFILES+= 91b97b031290.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 PATCHFILES+= 3b0d1a3a2296.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Wayland client (development snapshot) WWW= https://wayland.freedesktop.org/xserver.html 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.30: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} USES= compiler:c11 gl meson pkgconfig xorg USE_GITLAB= yes USE_GL= gbm gl USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= xorg GL_PROJECT= xserver MESON_ARGS= -D${PORTNAME}=true \ -Dxorg=false \ -Dxnest=false \ -Dxvfb=false \ -Dudev=false \ -Dudev_kms=false \ -Dxcsecurity=true \ -Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}" PLIST_FILES= bin/Xwayland \ "@comment lib/xorg/protocol.txt" \ libdata/pkgconfig/xwayland.pc \ "@comment share/man/man1/Xserver.1.gz" \ share/man/man1/Xwayland.1.gz \ share/applications/org.freedesktop.Xwayland.desktop # 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= BASU CSD EI NVIDIA -OPTIONS_DEFAULT=BASU CSD EI - -BASU_DESC= Emulated input via libei portal -BASU_LIB_DEPENDS= liboeffis.so:x11/libei~basu -BASU_IMPLIES= EI +OPTIONS_DEFINE= CSD EI NVIDIA +OPTIONS_DEFAULT=CSD EI CSD_DESC= Client-side decorations via libdecor CSD_LIB_DEPENDS= libdecor-0.so:x11-toolkits/libdecor CSD_MESON_TRUE= libdecor -EI_DESC= Emulated input via libei socket +EI_DESC= Emulated input via libei EI_LIB_DEPENDS= libei.so:x11/libei EI_MESON_OFF= -Dxwayland_ei=false NVIDIA_DESC= EGLStream support for glamor on Xwayland NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland NVIDIA_MESON_TRUE= xwayland_eglstream .include diff --git a/x11/libei/Makefile b/x11/libei/Makefile index a72acda75bca..a1940a290588 100644 --- a/x11/libei/Makefile +++ b/x11/libei/Makefile @@ -1,63 +1,59 @@ PORTNAME= libei DISTVERSION= 1.2.0 -PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org COMMENT= Library for Emulated Input WWW= https://gitlab.freedesktop.org/libinput/libei LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ ${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libevdev.so:devel/libevdev TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}structlog>0:devel/py-structlog@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} USES= compiler:c11 localbase meson pkgconfig python:build USE_GITHUB= nodefault USE_GITLAB= yes USE_LDCONFIG= yes GH_TUPLE= nemequ:munit:v0.2.0-38-gfbbdf14:munit/subprojects/munit GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= libinput BINARY_ALIAS= python3=${PYTHON_CMD} MESON_ARGS= -Dsd-bus-provider=basu -Dtests=disabled OPTIONS_DEFINE= BASU OPTIONS_DEFAULT=BASU OPTIONS_SUB= yes BASU_DESC= XDG RemoteDesktop portal via basu -BASU_SUBPACKAGES= basu -COMMENT.basu= ${BASU_DESC} -LIB_DEPENDS.basu= libbasu.so:devel/basu \ - libepoll-shim.so:devel/libepoll-shim +BASU_LIB_DEPENDS= libbasu.so:devel/basu BASU_MESON_ENABLED= liboeffis .ifdef GH_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif pre-test: @if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \ ${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \ ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \ ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi .include .if ${PYTHON_REL} < 31100 TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}StrEnum>0:devel/py-strenum@${PY_FLAVOR} .endif .include diff --git a/x11/libei/pkg-descr.basu b/x11/libei/pkg-descr.basu deleted file mode 100644 index b3e9dad0fc37..000000000000 --- a/x11/libei/pkg-descr.basu +++ /dev/null @@ -1,8 +0,0 @@ -libei is a library for Emulated Input, primarily aimed at the Wayland -stack. It provides three parts: -- EI (Emulated Input) for the client side (libei) -- EIS (Emulated Input Server) for the server side (libeis) -- oeffis is an optional helper library for DBus communication with the - XDG RemoteDesktop portal (liboeffis) - -This package provides liboeffis. diff --git a/x11/libei/pkg-plist b/x11/libei/pkg-plist index c2a818793748..c6f1f0580429 100644 --- a/x11/libei/pkg-plist +++ b/x11/libei/pkg-plist @@ -1,16 +1,16 @@ bin/ei-debug-events include/libei-1.0/libei.h include/libei-1.0/libeis.h -%%BASU%%@@basu@@include/libei-1.0/liboeffis.h +%%BASU%%include/libei-1.0/liboeffis.h lib/libei.so lib/libei.so.1 lib/libei.so.1.2.0 lib/libeis.so lib/libeis.so.1 lib/libeis.so.1.2.0 -%%BASU%%@@basu@@lib/liboeffis.so -%%BASU%%@@basu@@lib/liboeffis.so.1 -%%BASU%%@@basu@@lib/liboeffis.so.1.2.0 +%%BASU%%lib/liboeffis.so +%%BASU%%lib/liboeffis.so.1 +%%BASU%%lib/liboeffis.so.1.2.0 libdata/pkgconfig/libei-1.0.pc libdata/pkgconfig/libeis-1.0.pc -%%BASU%%@@basu@@libdata/pkgconfig/liboeffis-1.0.pc +%%BASU%%libdata/pkgconfig/liboeffis-1.0.pc