sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

x11/libei: temporarily drop subpackages

Browse source 
Whole tree builds fail to parse subpackage syntax in *_DEPENDS.

$ poudriere bulk -j 132amd64 -a
[...]
[00:02:31] Error: compute_deps_pkg failed to lookup pkgname for x11/libei~basu processing package xwayland-devel-21.0.99.1.664_1 from x11-servers/xwayland-devel -- Is SUBDIR+=libei missing in x11/Makefile?

$ make index
[...]
make_index: xwayland-devel-21.0.99.1.664_1: no entry for /usr/ports/x11/libei~basu
make_index: xwayland-devel-21.0.99.1.664_1: no entry for /usr/ports/x11/libei~basu

Reported by:	David Wolfskill

This reverts commit 367a49562b.
This commit is contained in:
Jan Beich 2024-01-29 16:24:28 +01:00
parent bb176de034
commit 0482926a54
4 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
x11-servers/xwayland-devel/Makefile
View file

@ -2,7 +2,6 @@ PORTNAME= xwayland
DISTVERSIONPREFIX= xorg-server- DISTVERSIONPREFIX= xorg-server-
DISTVERSION= 21.0.99.1-664 DISTVERSION= 21.0.99.1-664
DISTVERSIONSUFFIX= -g133e0d651 DISTVERSIONSUFFIX= -g133e0d651
PORTREVISION= 1
CATEGORIES= x11-servers CATEGORIES= x11-servers
PKGNAMESUFFIX= -devel PKGNAMESUFFIX= -devel
@ -65,18 +64,14 @@ DEFAULT_FONTPATH_LIST= \
${FONTPATH_ROOT}/75dpi/ \ ${FONTPATH_ROOT}/75dpi/ \
catalogue:${FONTPATHD} catalogue:${FONTPATHD}
OPTIONS_DEFINE= BASU CSD EI NVIDIA OPTIONS_DEFINE= CSD EI NVIDIA
OPTIONS_DEFAULT=BASU CSD EI OPTIONS_DEFAULT=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_DESC= Client-side decorations via libdecor
CSD_LIB_DEPENDS= libdecor-0.so:x11-toolkits/libdecor CSD_LIB_DEPENDS= libdecor-0.so:x11-toolkits/libdecor
CSD_MESON_TRUE= 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_LIB_DEPENDS= libei.so:x11/libei
EI_MESON_OFF= -Dxwayland_ei=false EI_MESON_OFF= -Dxwayland_ei=false

6
x11/libei/Makefile
View file

@ -1,6 +1,5 @@
PORTNAME= libei PORTNAME= libei
DISTVERSION= 1.2.0 DISTVERSION= 1.2.0
PORTREVISION= 1
CATEGORIES= x11 CATEGORIES= x11
MAINTAINER= jbeich@FreeBSD.org MAINTAINER= jbeich@FreeBSD.org
@ -35,10 +34,7 @@ OPTIONS_DEFAULT=BASU
OPTIONS_SUB= yes OPTIONS_SUB= yes
BASU_DESC= XDG RemoteDesktop portal via basu BASU_DESC= XDG RemoteDesktop portal via basu
BASU_SUBPACKAGES= basu BASU_LIB_DEPENDS= libbasu.so:devel/basu
COMMENT.basu= ${BASU_DESC}
LIB_DEPENDS.basu= libbasu.so:devel/basu \
libepoll-shim.so:devel/libepoll-shim
BASU_MESON_ENABLED= liboeffis BASU_MESON_ENABLED= liboeffis
.ifdef GH_TUPLE .ifdef GH_TUPLE

8
x11/libei/pkg-descr.basu
View file

@ -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.

10
x11/libei/pkg-plist
View file

@ -1,16 +1,16 @@
bin/ei-debug-events bin/ei-debug-events
include/libei-1.0/libei.h include/libei-1.0/libei.h
include/libei-1.0/libeis.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
lib/libei.so.1 lib/libei.so.1
lib/libei.so.1.2.0 lib/libei.so.1.2.0
lib/libeis.so lib/libeis.so
lib/libeis.so.1 lib/libeis.so.1
lib/libeis.so.1.2.0 lib/libeis.so.1.2.0
%%BASU%%@@basu@@lib/liboeffis.so %%BASU%%lib/liboeffis.so
%%BASU%%@@basu@@lib/liboeffis.so.1 %%BASU%%lib/liboeffis.so.1
%%BASU%%@@basu@@lib/liboeffis.so.1.2.0 %%BASU%%lib/liboeffis.so.1.2.0
libdata/pkgconfig/libei-1.0.pc libdata/pkgconfig/libei-1.0.pc
libdata/pkgconfig/libeis-1.0.pc libdata/pkgconfig/libeis-1.0.pc
%%BASU%%@@basu@@libdata/pkgconfig/liboeffis-1.0.pc %%BASU%%libdata/pkgconfig/liboeffis-1.0.pc