Page MenuHomeFreeBSD

D43568.diff
No OneTemporary

D43568.diff

diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -2,6 +2,7 @@
DISTVERSIONPREFIX= xorg-server-
DISTVERSION= 21.0.99.1-664
DISTVERSIONSUFFIX= -g133e0d651
+PORTREVISION= 1
CATEGORIES= x11-servers
PKGNAMESUFFIX= -devel
@@ -64,14 +65,18 @@
${FONTPATH_ROOT}/75dpi/ \
catalogue:${FONTPATHD}
-OPTIONS_DEFINE= CSD EI NVIDIA
-OPTIONS_DEFAULT=CSD EI
+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
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
+EI_DESC= Emulated input via libei socket
EI_LIB_DEPENDS= libei.so:x11/libei
EI_MESON_OFF= -Dxwayland_ei=false
diff --git a/x11/libei/Makefile b/x11/libei/Makefile
--- a/x11/libei/Makefile
+++ b/x11/libei/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libei
DISTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= jbeich@FreeBSD.org
@@ -34,7 +35,10 @@
OPTIONS_SUB= yes
BASU_DESC= XDG RemoteDesktop portal via basu
-BASU_LIB_DEPENDS= libbasu.so:devel/basu
+BASU_SUBPACKAGES= basu
+COMMENT.basu= ${BASU_DESC}
+LIB_DEPENDS.basu= libbasu.so:devel/basu \
+ libepoll-shim.so:devel/libepoll-shim
BASU_MESON_ENABLED= liboeffis
.ifdef GH_TUPLE
diff --git a/x11/libei/pkg-descr.basu b/x11/libei/pkg-descr.basu
new file mode 100644
--- /dev/null
+++ b/x11/libei/pkg-descr.basu
@@ -0,0 +1,8 @@
+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
--- 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%%include/libei-1.0/liboeffis.h
+%%BASU%%@@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%%lib/liboeffis.so
-%%BASU%%lib/liboeffis.so.1
-%%BASU%%lib/liboeffis.so.1.2.0
+%%BASU%%@@basu@@lib/liboeffis.so
+%%BASU%%@@basu@@lib/liboeffis.so.1
+%%BASU%%@@basu@@lib/liboeffis.so.1.2.0
libdata/pkgconfig/libei-1.0.pc
libdata/pkgconfig/libeis-1.0.pc
-%%BASU%%libdata/pkgconfig/liboeffis-1.0.pc
+%%BASU%%@@basu@@libdata/pkgconfig/liboeffis-1.0.pc

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 5, 4:15 PM (20 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16996375
Default Alt Text
D43568.diff (2 KB)

Event Timeline