Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Nov 2018 23:23:41 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r484787 - head/deskutils/cairo-dock
Message-ID:  <201811112323.wABNNfcr096518@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Nov 11 23:23:40 2018
New Revision: 484787
URL: https://svnweb.freebsd.org/changeset/ports/484787

Log:
  deskutils/cairo-dock: track more dependencies
  
  ====> Running Q/A tests (stage-qa)
  Error: /usr/local/bin/cairo-dock is linked to /usr/local/lib/libdbus-1.so.3 from devel/dbus but it is not declared as a dependency
  Warning: you need LIB_DEPENDS+=libdbus-1.so:devel/dbus
  Error: /usr/local/bin/cairo-dock is linked to /usr/local/lib/libGLU.so.1 from graphics/libGLU but it is not declared as a dependency
  Warning: you need USE_GL+=glu
  Error: /usr/local/bin/cairo-dock is linked to /usr/local/lib/libGL.so.1 from graphics/mesa-libs but it is not declared as a dependency
  Warning: you need USE_GL+=gl
  Error: /usr/local/bin/cairo-dock is linked to /usr/local/lib/libwayland-client.so.0 from graphics/wayland but it is not declared as a dependency
  Warning: you need LIB_DEPENDS+=libwayland-client.so:graphics/wayland
  Error: /usr/local/bin/cairo-dock is linked to /usr/local/lib/libXcomposite.so.1 from x11/libXcomposite but it is not declared as a dependency
  Warning: you need USE_XORG+=xcomposite
  Error: /usr/local/bin/cairo-dock is linked to /usr/local/lib/libXrandr.so.2 from x11/libXrandr but it is not declared as a dependency
  Warning: you need USE_XORG+=xrandr
  Error: /usr/local/bin/cairo-dock is linked to /usr/local/lib/libX11.so.6 from x11/libX11 but it is not declared as a dependency
  Warning: you need USE_XORG+=x11
  Error: /usr/local/bin/cairo-dock is linked to /usr/local/lib/libXinerama.so.1 from x11/libXinerama but it is not declared as a dependency
  Warning: you need USE_XORG+=xinerama
  
  PR:		227509
  Reported by:	antoine (via exp-run)

Modified:
  head/deskutils/cairo-dock/Makefile   (contents, props changed)

Modified: head/deskutils/cairo-dock/Makefile
==============================================================================
--- head/deskutils/cairo-dock/Makefile	Sun Nov 11 23:23:27 2018	(r484786)
+++ head/deskutils/cairo-dock/Makefile	Sun Nov 11 23:23:40 2018	(r484787)
@@ -2,6 +2,7 @@
 
 PORTNAME=	cairo-dock
 PORTVERSION=	3.4.1
+PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	ports@FreeBSD.org
@@ -12,6 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libcurl.so:ftp/curl \
+		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 RUN_DEPENDS=	bash:shells/bash \
@@ -22,14 +24,34 @@ GH_ACCOUNT=	Cairo-Dock
 GH_PROJECT=	${PORTNAME}-core
 
 GNU_CONFIGURE=	yes
-USES=		cmake compiler:c++11-lang gettext gnome localbase:ldflags \
+USES=		cmake compiler:c++11-lang gettext gl gnome localbase:ldflags \
 		pkgconfig
+USE_GL=		glu
 USE_GNOME=	glib20 gtk30 librsvg2 libxml2
 USE_LDCONFIG=	yes
-USE_XORG=	xrender xtst
 CMAKE_ARGS=	-Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig" \
 		-DROOT_PREFIX:PATH=${STAGEDIR} \
 		-DCMAKE_INSTALL_MANDIR:PATH=man \
+
+OPTIONS_DEFINE=	X11 WAYLAND
+OPTIONS_DEFAULT=GLX X11
+OPTIONS_RADIO=	GL
+OPTIONS_RADIO_GL=	GLX EGL
+
+EGL_DESC=		${GLX_DESC:S/X11/Native/}
+EGL_CMAKE_BOOL=		enable-egl-support
+EGL_USE=		GL=egl
+
+GLX_USE=		GL=gl
+GLX_IMPLIES=		X11
+
+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
+WAYLAND_USE=		GL=egl
+WAYLAND_CMAKE_BOOL=	enable-wayland-support
+WAYLAND_IMPLIES=	EGL
+
+X11_USE=		XORG=x11,xcomposite,xinerama,xrandr,xrender,xtst
+X11_CMAKE_BOOL=		enable-x11-support
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -e \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811112323.wABNNfcr096518>