On Fri, 29 Jul 2022 at 19:28:21 +0200, Sebastien Marie wrote: > Hi, > > The following diff enables wayland in arcan. It *should* be possible to run > wayland clients, and x11 clients too via xwayland (see arcan-wayland(1) man > page). > > Additionally, I fixed some libraries picking: > > - libmagic: autodetected, so just ensure it is here. > - mupdf: I explicitly disabled it: it failed to build with it (jbig2dec > symbol > missing, maybe wrong version ? unsure) > > Comments or OK ?
OK abieber@ > -- > Sebastien Marie > > > diff /data/semarie/repos/openbsd/ports > commit - 88ccef5816f512bc0f8b2a184c7710aba1c90b80 > path + /data/semarie/repos/openbsd/ports > blob - fd1a8507abe143a732abf4f3b7f22900e45c4446 > file + graphics/arcan/Makefile > --- graphics/arcan/Makefile > +++ graphics/arcan/Makefile > @@ -11,6 +11,8 @@ GH_ACCOUNT = letoram > GH_PROJECT = arcan > GH_TAGNAME = 0.6.2 > > +REVISION = 0 > + > CATEGORIES = graphics devel > HOMEPAGE = https://arcan-fe.com > > @@ -24,7 +26,8 @@ WANTLIB += ${COMPILER_LIBCXX} EGL GL SDL2 archive avco > WANTLIB += avfilter avformat avutil bz2 c curl drm espeak freetype > WANTLIB += gbm iconv lzma m openal sqlite3 swresample swscale > WANTLIB += tesseract util vlc vncclient vncserver xkbcommon z > -WANTLIB += ${MODLUA_WANTLIB} > +WANTLIB += magic wayland-server xcb xcb-composite xcb-icccm xcb-util > +WANTLIB += xcb-xfixes ${MODLUA_WANTLIB} > > COMPILER = base-clang ports-gcc base-gcc > > @@ -33,13 +36,17 @@ MODULES = devel/cmake \ > > MODLUA_VERSION = 5.1 > > +BUILD_DEPENDS = wayland/wayland-protocols > + > LIB_DEPENDS = archivers/bzip2 \ > audio/espeak \ > audio/openal \ > databases/sqlite3 \ > + devel/libmagic \ > graphics/ffmpeg \ > graphics/tesseract/tesseract \ > net/libvncserver \ > + wayland/wayland \ > x11/vlc \ > x11/xkbcommon > > @@ -47,7 +54,7 @@ CONFIGURE_ARGS = -DVIDEO_PLATFORM=egl-dri \ > -DHYBRID_SDL=ON \ > -DHYBRID_HEADLESS=ON \ > -DDISABLE_JIT=ON \ > - -DDISABLE_WAYLAND=ON \ > - -DLIBVNC_INCLUDE_DIRS=${LOCALBASE}/include > + -DLIBVNC_INCLUDE_DIRS=${LOCALBASE}/include \ > + -DCMAKE_DISABLE_FIND_PACKAGE_MuPDF=TRUE > > .include <bsd.port.mk> > blob - 457b4a8111c2ab840053df33e5b1b179f9035d11 > file + graphics/arcan/pkg/PLIST > --- graphics/arcan/pkg/PLIST > +++ graphics/arcan/pkg/PLIST > @@ -7,10 +7,12 @@ > @bin bin/afsrv_terminal > @bin bin/arcan > @bin bin/arcan-net > +@bin bin/arcan-wayland > @bin bin/arcan_db > @bin bin/arcan_frameserver > @bin bin/arcan_headless > @bin bin/arcan_sdl > +@bin bin/arcan_xwm > include/arcan/ > include/arcan/a12.h > include/arcan/arcan_tui.h > @@ -39,6 +41,7 @@ lib/pkgconfig/arcan-shmif-ext.pc > lib/pkgconfig/arcan-shmif-srv.pc > lib/pkgconfig/arcan-shmif-tui.pc > lib/pkgconfig/arcan-shmif.pc > +@man man/man1/arcan-wayland.1 > @man man/man1/arcan.1 > @man man/man1/arcan_db.1 > share/arcan/ >
