Date: Thu, 10 Jun 2021 06:48:13 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 689dca24f212 - main - graphics/imv: allow building on Wayland-only Message-ID: <202106100648.15A6mDwM004647@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=689dca24f212dc55297c5d1bb7132b0c175bcfc2 commit 689dca24f212dc55297c5d1bb7132b0c175bcfc2 Author: Evgeniy Khramtsov <evgeniy@khramtsov.org> AuthorDate: 2021-06-10 06:46:30 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2021-06-10 06:46:30 +0000 graphics/imv: allow building on Wayland-only imv can work on a system where libX11 is fully removed and OpenGL is provided by libOpenGL instead of libGL[1]. USE_GL=gl implies lib-depends on libGL, which is built only when X11 symbols are available, which is not always the case. libglvnd provides libOpenGL which provides OpenGL symbols without X11 symbols. To satisfy poudriere testport, do USE_GL=egl because there is no libOpenGL handling in Mk/Uses/gl.mk currently. libEGL is supposed to always exist per pkg-plist of mesa-*. Adjust USE_GL for imv to build on global X11=off XCB=off XLIB=off. [1]: https://github.com/eXeC64/imv/commit/ 70a70727b74c532ffb303023b3eb215310948b31 Rebased version is always available here: https://codeberg.org/ei/ports/commits/branch/ei PR: 256419 Approved by: dbaio, garga (mentors) Differential Revision: https://reviews.freebsd.org/D30694 --- graphics/imv/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/graphics/imv/Makefile b/graphics/imv/Makefile index 8efed9f1736b..2115ee82e280 100644 --- a/graphics/imv/Makefile +++ b/graphics/imv/Makefile @@ -1,6 +1,7 @@ PORTNAME= imv DISTVERSIONPREFIX= v DISTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= eduardo@FreeBSD.org @@ -18,7 +19,7 @@ USES= compiler:c11 desktop-file-utils gettext-runtime gl gnome \ meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= eXeC64 -USE_GL= gl +USE_GL= egl USE_GNOME= cairo glib20 pango PLIST_FILES= bin/imv \ @@ -42,7 +43,7 @@ WIN_DESC= Windowing system ALL_LIB_DEPENDS+= libwayland-client.so:graphics/wayland ALL_USES= xorg -ALL_USE= gl=egl,glu xorg=x11,xcb +ALL_USE= gl=glu xorg=x11,xcb ALL_MESON_ON= -Dwindows=all ALL_PLIST_FILES= bin/imv-wayland \ bin/imv-x11 @@ -73,8 +74,6 @@ TIFF_MESON_ENABLED= libtiff WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libwayland-egl.so:graphics/wayland - -WAYLAND_USE= gl=egl WAYLAND_MESON_ON= -Dwindows=wayland X11_USES= xorg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106100648.15A6mDwM004647>