Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Feb 2020 22:21:52 +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: r525680 - in head: graphics graphics/wayland-protocols graphics/wayland-protocols-devel x11-servers/xwayland-devel
Message-ID:  <202002092221.019MLqb3078684@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Feb  9 22:21:51 2020
New Revision: 525680
URL: https://svnweb.freebsd.org/changeset/ports/525680

Log:
  x11-servers/xwayland-devel: unbreak due to x11@ being slow
  
  ===>   xwayland-devel-1.20.0.592 depends on package: wayland-protocols>=1.18 - not found
  [...]
  Dependency wayland-protocols found: NO found 1.17 but need: '>= 1.18'
  Run-time dependency wayland-protocols found: NO (tried pkgconfig and cmake)
  [...]
  install   -m 555 /usr/ports/default/x11-servers/xwayland-devel/work/xserver-1cfdd1a96580733df3625bcea3384ffee3dc92df-1cfdd1a96580733df3625bcea3384ffee3dc92df/_build/hw/xwayland/Xwayland  /usr/ports/default/x11-servers/xwayland-devel/work/stage/usr/local/bin
  install: /usr/ports/default/x11-servers/xwayland-devel/work/xserver-1cfdd1a96580733df3625bcea3384ffee3dc92df-1cfdd1a96580733df3625bcea3384ffee3dc92df/_build/hw/xwayland/Xwayland: No such file or directory
  *** Error code 71

Added:
  head/graphics/wayland-protocols-devel/
  head/graphics/wayland-protocols-devel/Makefile   (contents, props changed)
  head/graphics/wayland-protocols-devel/distinfo   (contents, props changed)
Modified:
  head/graphics/Makefile   (contents, props changed)
  head/graphics/wayland-protocols/Makefile   (contents, props changed)
  head/x11-servers/xwayland-devel/Makefile   (contents, props changed)

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Sun Feb  9 22:21:40 2020	(r525679)
+++ head/graphics/Makefile	Sun Feb  9 22:21:51 2020	(r525680)
@@ -1039,6 +1039,7 @@
     SUBDIR += waifu2x-ncnn-vulkan
     SUBDIR += wayland
     SUBDIR += wayland-protocols
+    SUBDIR += wayland-protocols-devel
     SUBDIR += waylandpp
     SUBDIR += webp
     SUBDIR += webp-pixbuf-loader

Added: head/graphics/wayland-protocols-devel/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/wayland-protocols-devel/Makefile	Sun Feb  9 22:21:51 2020	(r525680)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTVERSION=	1.18
+PKGNAMESUFFIX=	-devel
+
+MAINTAINER=	jbeich@FreeBSD.org
+
+CONFLICTS_INSTALL=	${PORTNAME}
+
+MASTERDIR=	${.CURDIR}/../wayland-protocols
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
+.include "${MASTERDIR}/Makefile"

Added: head/graphics/wayland-protocols-devel/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/wayland-protocols-devel/distinfo	Sun Feb  9 22:21:51 2020	(r525680)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1564045285
+SHA256 (wayland-protocols-1.18.tar.xz) = 3d73b7e7661763dc09d7d9107678400101ecff2b5b1e531674abfa81e04874b3
+SIZE (wayland-protocols-1.18.tar.xz) = 108344

Modified: head/graphics/wayland-protocols/Makefile
==============================================================================
--- head/graphics/wayland-protocols/Makefile	Sun Feb  9 22:21:40 2020	(r525679)
+++ head/graphics/wayland-protocols/Makefile	Sun Feb  9 22:21:51 2020	(r525680)
@@ -1,17 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	wayland-protocols
-PORTVERSION=	1.17
+PORTVERSION?=	1.17
+PORTREVISION?=	0
 CATEGORIES=	graphics wayland
 MASTER_SITES=	https://wayland.freedesktop.org/releases/
 
-MAINTAINER=	x11@FreeBSD.org
+MAINTAINER?=	x11@FreeBSD.org
 COMMENT=	Wayland protocols
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	wayland-scanner:graphics/wayland
+
+CONFLICTS_INSTALL?=	${PORTNAME}-devel
 
 USES=		tar:xz
 NO_ARCH=	yes

Modified: head/x11-servers/xwayland-devel/Makefile
==============================================================================
--- head/x11-servers/xwayland-devel/Makefile	Sun Feb  9 22:21:40 2020	(r525679)
+++ head/x11-servers/xwayland-devel/Makefile	Sun Feb  9 22:21:51 2020	(r525680)
@@ -20,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
-		wayland-protocols>=1.18:graphics/wayland-protocols
+		wayland-protocols-devel>=1.18:graphics/wayland-protocols-devel
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libepoxy.so:graphics/libepoxy \
 		libwayland-client.so:graphics/wayland



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