svn commit: r523838 - in head: devel/wf-config x11-toolkits/wlroots x11-wm/cage x11-wm/sway x11-wm/sway/files x11-wm/wayfire x11-wm/wayfire/files

Wed Jan 22 20:16:27 UTC 2020

Author: jbeich
Date: Wed Jan 22 20:16:25 2020
New Revision: 523838
URL: https://svnweb.freebsd.org/changeset/ports/523838

Log:
  x11-toolkits/wlroots: update to 0.10.0
  
  Changes:	https://github.com/swaywm/wlroots/releases/tag/0.10.0
  Changes:	https://github.com/swaywm/wlroots/compare/0.9.1...0.10.0
  Reported by:	GitHub (watch releases)
  MFH:		2020Q1 (required by sway 1.4)

Added:
  head/x11-wm/sway/files/
  head/x11-wm/sway/files/patch-meson.build   (contents, props changed)
  head/x11-wm/wayfire/files/
  head/x11-wm/wayfire/files/patch-meson.build   (contents, props changed)
Modified:
  head/devel/wf-config/Makefile   (contents, props changed)
  head/x11-toolkits/wlroots/Makefile   (contents, props changed)
  head/x11-toolkits/wlroots/distinfo   (contents, props changed)
  head/x11-toolkits/wlroots/pkg-plist   (contents, props changed)
  head/x11-wm/cage/Makefile   (contents, props changed)
  head/x11-wm/sway/Makefile   (contents, props changed)
  head/x11-wm/wayfire/Makefile   (contents, props changed)

Modified: head/devel/wf-config/Makefile
==============================================================================

--- head/devel/wf-config/Makefile	Wed Jan 22 20:16:16 2020	(r523837)
+++ head/devel/wf-config/Makefile	Wed Jan 22 20:16:25 2020	(r523838)
@@ -2,7 +2,7 @@
 
 PORTNAME=	wf-config
 DISTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich at FreeBSD.org

Modified: head/x11-toolkits/wlroots/Makefile
==============================================================================
--- head/x11-toolkits/wlroots/Makefile	Wed Jan 22 20:16:16 2020	(r523837)
+++ head/x11-toolkits/wlroots/Makefile	Wed Jan 22 20:16:25 2020	(r523838)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	wlroots
-DISTVERSION=	0.9.1
+DISTVERSION=	0.10.0
 CATEGORIES=	x11-toolkits
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -32,8 +32,8 @@ MESON_ARGS=	-Dexamples=false
 LLD_UNSAFE=	yes
 .endif
 
-OPTIONS_DEFINE=	CONSOLEKIT FREERDP X11
-OPTIONS_DEFAULT=FREERDP X11
+OPTIONS_DEFINE=	CONSOLEKIT X11
+OPTIONS_DEFAULT=X11
 OPTIONS_SUB=	yes
 
 CONSOLEKIT_DESC=	DRM sessions without root using ConsoleKit2
@@ -46,18 +46,10 @@ CONSOLEKIT_MESON_ENABLED=	consolekit2
 .MAKEFLAGS:		WITH+=CONSOLEKIT
 .endif
 
-FREERDP_DESC=	RDP backend with freerdp
-FREERDP_LIB_DEPENDS=	libfreerdp2.so:net/freerdp
-FREERDP_MESON_ENABLED=	freerdp
-
 X11_LIB_DEPENDS=libxcb-errors.so:x11/xcb-util-errors \
 		libxcb-icccm.so:x11/xcb-util-wm
 X11_RUN_DEPENDS=Xwayland:x11-servers/xwayland
 X11_USE=	XORG=x11,xcb
 X11_MESON_ENABLED=x11-backend xcb-icccm xwayland
-
-post-patch:
-# Ignore unused dependencies
-	@${REINPLACE_CMD} '/examples/d' ${WRKSRC}/meson.build
 
 .include <bsd.port.mk>

Modified: head/x11-toolkits/wlroots/distinfo
==============================================================================
--- head/x11-toolkits/wlroots/distinfo	Wed Jan 22 20:16:16 2020	(r523837)
+++ head/x11-toolkits/wlroots/distinfo	Wed Jan 22 20:16:25 2020	(r523838)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1578319270
-SHA256 (swaywm-wlroots-0.9.1_GH0.tar.gz) = 2ddd8371b8cf847b6a9b20628512474b1405171393e6ec8a071e46afc73ca2e7
-SIZE (swaywm-wlroots-0.9.1_GH0.tar.gz) = 464941
+TIMESTAMP = 1579717324
+SHA256 (swaywm-wlroots-0.10.0_GH0.tar.gz) = 9414ba761c321f9c2b3e0426e1bbed55443fa8f97d46643d1706d1ddd614f6cd
+SIZE (swaywm-wlroots-0.10.0_GH0.tar.gz) = 454540
 SHA256 (606b009fcdd1.patch) = ece828c41a8a155426f481f840a5de252fa1d5856aca91d728721f98e2055a69
 SIZE (606b009fcdd1.patch) = 27824

Modified: head/x11-toolkits/wlroots/pkg-plist
==============================================================================
--- head/x11-toolkits/wlroots/pkg-plist	Wed Jan 22 20:16:16 2020	(r523837)
+++ head/x11-toolkits/wlroots/pkg-plist	Wed Jan 22 20:16:25 2020	(r523838)
@@ -5,7 +5,6 @@ include/wlr/backend/interface.h
 include/wlr/backend/libinput.h
 include/wlr/backend/multi.h
 include/wlr/backend/noop.h
-include/wlr/backend/rdp.h
 include/wlr/backend/session.h
 include/wlr/backend/session/interface.h
 include/wlr/backend/wayland.h
@@ -84,6 +83,6 @@ include/wlr/version.h
 include/wlr/xcursor.h
 %%X11%%include/wlr/xwayland.h
 lib/libwlroots.so
-lib/libwlroots.so.4
-lib/libwlroots.so.4.8.1
+lib/libwlroots.so.5
+lib/libwlroots.so.5.9.1
 libdata/pkgconfig/wlroots.pc

Modified: head/x11-wm/cage/Makefile
==============================================================================
--- head/x11-wm/cage/Makefile	Wed Jan 22 20:16:16 2020	(r523837)
+++ head/x11-wm/cage/Makefile	Wed Jan 22 20:16:25 2020	(r523838)
@@ -3,7 +3,7 @@
 PORTNAME=	cage
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich at FreeBSD.org

Modified: head/x11-wm/sway/Makefile
==============================================================================
--- head/x11-wm/sway/Makefile	Wed Jan 22 20:16:16 2020	(r523837)
+++ head/x11-wm/sway/Makefile	Wed Jan 22 20:16:25 2020	(r523838)
@@ -2,6 +2,7 @@
 
 PORTNAME=	sway
 DISTVERSION=	1.3-rc3
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -12,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
-		wlroots>=0.9.0<0.10.0:x11-toolkits/wlroots
+		wlroots>=0.9.0<0.11.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libevdev.so:devel/libevdev \
 		libpcre.so:devel/pcre \

Added: head/x11-wm/sway/files/patch-meson.build
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/sway/files/patch-meson.build	Wed Jan 22 20:16:25 2020	(r523838)
@@ -0,0 +1,11 @@
+--- meson.build.orig	2020-01-15 17:02:20 UTC
++++ meson.build
+@@ -58,7 +58,7 @@ math           = cc.find_library('m')
+ rt             = cc.find_library('rt')
+ 
+ # Try first to find wlroots as a subproject, then as a system dependency
+-wlroots_version = ['>=0.9.0', '<0.10.0']
++wlroots_version = ['>=0.9.0', '<0.11.0']
+ wlroots_proj = subproject(
+ 	'wlroots',
+ 	default_options: ['examples=false'],

Modified: head/x11-wm/wayfire/Makefile
==============================================================================
--- head/x11-wm/wayfire/Makefile	Wed Jan 22 20:16:16 2020	(r523837)
+++ head/x11-wm/wayfire/Makefile	Wed Jan 22 20:16:25 2020	(r523838)
@@ -2,6 +2,7 @@
 
 PORTNAME=	wayfire
 DISTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -14,7 +15,7 @@ BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \
 		wayland-protocols>=1.12:graphics/wayland-protocols \
 		glm>=0.9.8:math/glm \
-		wlroots>=0.9.0<0.10.0:x11-toolkits/wlroots
+		wlroots>=0.9.0<0.11.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libinotify.so:devel/libinotify \
 		libwf-config.so:devel/wf-config \
 		libpng.so:graphics/png \

Added: head/x11-wm/wayfire/files/patch-meson.build
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/wayfire/files/patch-meson.build	Wed Jan 22 20:16:25 2020	(r523838)
@@ -0,0 +1,11 @@
+--- meson.build.orig	2020-01-03 07:04:50 UTC
++++ meson.build
+@@ -29,7 +29,7 @@ libinput       = dependency('libinput', version: '>=1.
+ pixman         = dependency('pixman-1')
+ threads        = dependency('threads')
+ xkbcommon      = dependency('xkbcommon')
+-wlroots        = dependency('wlroots', version: ['>=0.9.0', '<0.10.0'], fallback: ['wlroots', 'wlroots'])
++wlroots        = dependency('wlroots', version: ['>=0.9.0', '<0.11.0'], fallback: ['wlroots', 'wlroots'])
+ wfconfig       = dependency('wf-config', version: '>=0.3', fallback: ['wf-config', 'wfconfig'])
+ 
+ needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system())
