On 2024/11/25 03:48, Kurt Mosiejczuk wrote:
> On Mon, Nov 25, 2024 at 08:35:01AM +0100, Antoine Jacoutot wrote:
> > On Sat, 2024-11-23 at 14:20 -0700, Kurt Mosiejczuk wrote:
> > > CVSROOT:  /cvs
> > > Module name:      ports
> > > Changes by:       [email protected]    2024/11/23 14:20:10
> > > 
> > > Modified files:
> > >   graphics/glfw  : Makefile distinfo 
> > > 
> > > Log message:
> > > Update glfw to 3.4
> > > 
> > > This update introduces compilation of multiple backends at once and
> > > picking the runtime with environment variables. It defaults to X
> > > but now has Wayland support.
> 
> > This does not build, it needs xkbcommon.
> 
> This patch builds for me. Does this look better to you?
> 
> --Kurt
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/glfw/Makefile,v
> diff -u -p -r1.13 Makefile
> --- Makefile  23 Nov 2024 21:20:10 -0000      1.13
> +++ Makefile  25 Nov 2024 08:46:54 -0000
> @@ -3,6 +3,7 @@ COMMENT =     open source, multi-platform li
>  V =          3.4
>  DISTNAME =   glfw-${V}
>  CATEGORIES = graphics x11
> +REVISION =   0
>  
>  SHARED_LIBS +=  glfw                      1.2 # 3.4
>  
> @@ -12,7 +13,8 @@ MAINTAINER =        Kurt Mosiejczuk <kmos@openb
>  # zlib
>  PERMIT_PACKAGE =     Yes
>  
> -WANTLIB =    X11 m pthread
> +WANTLIB =    X11 m pthread wayland-client wayland-cursor \
> +             wayland-egl xkbcommon

Since they're not directly linked, check-lib-depends will flag them,
so somebody might remove the WANTLIB in a sweep later if they're not
marked out in the Makefile as being needed.

glfw-3.4p0(graphics/glfw):
Missing: epoll-shim.0 from epoll-shim-0.0.20240608 
(/usr/local/lib/libglfw.so.1.2)
Extra:  X11.18 wayland-client.0 wayland-cursor.0 wayland-egl.0
Extra:  xkbcommon.2
WANTLIB += epoll-shim

I'd recommend this:

---
WANTLIB +=      X11 epoll-shim m pthread

# dlopen()'d
WANTLIB +=      X11 wayland-client wayland-cursor wayland-egl xkbcommon
---

Build fails if doxygen is installed:

===>  Faking installation for glfw-3.4p0
-- Install configuration: "Release"
-- Installing: /pobj/glfw-3.4/fake-amd64/usr/local/lib/libglfw.so.1.2
-- Set non-toolchain portion of runtime path of 
"/pobj/glfw-3.4/fake-amd64/usr/local/lib/libglfw.so.1.2" to "/usr/loca
l/lib"
CMake Error at /pobj/glfw-3.4/build-amd64/docs/cmake_install.cmake:46 (file):
  file INSTALL cannot find "/pobj/glfw-3.4/build-amd64/docs/html": No such
  file or directory.
Call Stack (most recent call first):
  /pobj/glfw-3.4/build-amd64/cmake_install.cmake:57 (include)

Reply via email to