From owner-dev-commits-ports-all@freebsd.org Thu Jun 10 06:48:13 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 96336643DD2; Thu, 10 Jun 2021 06:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G0vgd3Wz0z3JmJ; Thu, 10 Jun 2021 06:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 621312FCB; Thu, 10 Jun 2021 06:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15A6mDYi004648; Thu, 10 Jun 2021 06:48:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15A6mDwM004647; Thu, 10 Jun 2021 06:48:13 GMT (envelope-from git) Date: Thu, 10 Jun 2021 06:48:13 GMT Message-Id: <202106100648.15A6mDwM004647@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 689dca24f212 - main - graphics/imv: allow building on Wayland-only MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 689dca24f212dc55297c5d1bb7132b0c175bcfc2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2021 06:48:13 -0000 The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=689dca24f212dc55297c5d1bb7132b0c175bcfc2 commit 689dca24f212dc55297c5d1bb7132b0c175bcfc2 Author: Evgeniy Khramtsov AuthorDate: 2021-06-10 06:46:30 +0000 Commit: Nuno Teixeira 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