Page MenuHomeFreeBSD
Files F115644748

D35662.id107583.diff
No OneTemporary
Actions

D35662.id107583.diff
View Options

Index: x11-servers/xwayland/Makefile
===================================================================
--- x11-servers/xwayland/Makefile
+++ x11-servers/xwayland/Makefile
@@ -1,36 +1,58 @@
PORTNAME= xwayland
-PORTREVISION= 0
+PORTVERSION= 22.1.2
+PORTEPOCH= 1
+CATEGORIES= x11-servers
+MASTER_SITES= XORG/individual/xserver
-COMMENT= X Clients under Wayland
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X11 server as Wayland Client
LICENSE= MIT
-
-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
-
-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
+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
+
+USES= compiler:c11 gl meson pkgconfig xorg tar:xz
+USE_GL+= egl gbm gl
+USE_XORG= pixman xau xdmcp 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/db/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 <bsd.port.mk>
Index: x11-servers/xwayland/distinfo
===================================================================
--- /dev/null
+++ x11-servers/xwayland/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1656578404
+SHA256 (xwayland-22.1.2.tar.xz) = 743c4d56cfc0818755e2281d625d51860b41a473c641e179649a4f41776d1fca
+SIZE (xwayland-22.1.2.tar.xz) = 1271848
Index: x11-servers/xwayland/pkg-plist
===================================================================
--- /dev/null
+++ 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
Index: x11-toolkits/wlroots/Makefile
===================================================================
--- x11-toolkits/wlroots/Makefile
+++ x11-toolkits/wlroots/Makefile
@@ -62,8 +62,8 @@
libxcb-render-util.so:x11/xcb-util-renderutil \
libxcb-icccm.so:x11/xcb-util-wm
X11_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
- xwayland-devel>0:x11-servers/xwayland-devel
-X11_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel
+ xwayland>0:x11-servers/xwayland
+X11_RUN_DEPENDS= xwayland>0:x11-servers/xwayland
X11_USE= XORG=xcb
X11_MESON_ENABLED= xwayland
X11_VARS= BACKENDS+=x11

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 27, 11:48 AM (17 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17817209
Default Alt Text
D35662.id107583.diff (3 KB)

Event Timeline