From d0c93dc93a940b528e7bdd9028674aaf85a02e43 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 9 Feb 2020 22:36:08 +0000 Subject: [PATCH] graphics/wayland-protocols: Update to 1.18 Changes: https://gitlab.freedesktop.org/wayland/wayland-protocols/compare/1.17...1.18 --- MOVED | 1 + graphics/Makefile | 1 - graphics/wayland-protocols-devel/Makefile | 13 ------------- graphics/wayland-protocols-devel/distinfo | 3 --- graphics/wayland-protocols/Makefile | 7 ++----- graphics/wayland-protocols/distinfo | 6 +++--- x11-servers/xwayland-devel/Makefile | 2 +- 7 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 graphics/wayland-protocols-devel/Makefile delete mode 100644 graphics/wayland-protocols-devel/distinfo diff --git a/MOVED b/MOVED index cdeeb15b0b09..6f042c3e2e98 100644 --- a/MOVED +++ b/MOVED @@ -14241,3 +14241,4 @@ www/py-collective.templateengines||2020-02-06|Has expired: Outdated, uses EOLed www/zope213||2020-02-06|Has expired: Outdated, uses EOLed python27 misc/py-glance||2020-02-06|Has expired: Outdated, uses EOLed python27 devel/py-memory_profiler|devel/py-memory-profiler|2020-02-08|Rename to match upstream naming +graphics/wayland-protocols-devel|graphics/wayland-protocols|2020-02-24|Merged into master port diff --git a/graphics/Makefile b/graphics/Makefile index 5955462910eb..c3b345ddbfc6 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1039,7 +1039,6 @@ SUBDIR += waifu2x-ncnn-vulkan SUBDIR += wayland SUBDIR += wayland-protocols - SUBDIR += wayland-protocols-devel SUBDIR += waylandpp SUBDIR += webp SUBDIR += webp-pixbuf-loader diff --git a/graphics/wayland-protocols-devel/Makefile b/graphics/wayland-protocols-devel/Makefile deleted file mode 100644 index 59c5e9154c19..000000000000 --- a/graphics/wayland-protocols-devel/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -PORTVERSION= 1.18 -PKGNAMESUFFIX= -devel - -MAINTAINER= jbeich@FreeBSD.org - -CONFLICTS_INSTALL= ${PORTNAME} - -MASTERDIR= ${.CURDIR}/../wayland-protocols -DISTINFO_FILE= ${.CURDIR}/distinfo - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/wayland-protocols-devel/distinfo b/graphics/wayland-protocols-devel/distinfo deleted file mode 100644 index 84150bda4018..000000000000 --- a/graphics/wayland-protocols-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1564045285 -SHA256 (wayland-protocols-1.18.tar.xz) = 3d73b7e7661763dc09d7d9107678400101ecff2b5b1e531674abfa81e04874b3 -SIZE (wayland-protocols-1.18.tar.xz) = 108344 diff --git a/graphics/wayland-protocols/Makefile b/graphics/wayland-protocols/Makefile index be25d81b4d0b..f260d0ae9622 100644 --- a/graphics/wayland-protocols/Makefile +++ b/graphics/wayland-protocols/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= wayland-protocols -PORTVERSION?= 1.17 -PORTREVISION?= 0 +PORTVERSION= 1.18 CATEGORIES= graphics wayland MASTER_SITES= https://wayland.freedesktop.org/releases/ -MAINTAINER?= x11@FreeBSD.org +MAINTAINER= x11@FreeBSD.org COMMENT= Wayland protocols LICENSE= MIT @@ -14,8 +13,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= wayland-scanner:graphics/wayland -CONFLICTS_INSTALL?= ${PORTNAME}-devel - USES= tar:xz NO_ARCH= yes GNU_CONFIGURE= yes diff --git a/graphics/wayland-protocols/distinfo b/graphics/wayland-protocols/distinfo index 30b7083c1e45..f9301b6b2544 100644 --- a/graphics/wayland-protocols/distinfo +++ b/graphics/wayland-protocols/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542038372 -SHA256 (wayland-protocols-1.17.tar.xz) = df1319cf9705643aea9fd16f9056f4e5b2471bd10c0cc3713d4a4cdc23d6812f -SIZE (wayland-protocols-1.17.tar.xz) = 107680 +TIMESTAMP = 1448003142 +SHA256 (wayland-protocols-1.18.tar.xz) = 3d73b7e7661763dc09d7d9107678400101ecff2b5b1e531674abfa81e04874b3 +SIZE (wayland-protocols-1.18.tar.xz) = 108344 diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 6ebe06161683..b11c83ad52f4 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -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-devel>=1.18:graphics/wayland-protocols-devel + wayland-protocols>=1.18:graphics/wayland-protocols LIB_DEPENDS= libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy \ libwayland-client.so:graphics/wayland