aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2024-03-26 07:16:32 +0000
committerJan Beich <jbeich@FreeBSD.org>2024-05-15 22:28:52 +0000
commitc3f142350f8f9f4a929023eca10055be1cd2cd08 (patch)
treec286fba193990348cf27071cca7645039b2d3d30
parentc947234280dae5d5b59454e0ce5c79bcdfe970cb (diff)
x11/xorgproto: update to 2024.1
-rw-r--r--x11-servers/xwayland-devel/Makefile7
-rw-r--r--x11-servers/xwayland-devel/distinfo2
-rw-r--r--x11/xorgproto/Makefile2
-rw-r--r--x11/xorgproto/distinfo6
4 files changed, 4 insertions, 13 deletions
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 7e336c3003a9..1f92b58fb127 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -31,7 +31,6 @@ USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
GL_SITE= https://gitlab.freedesktop.org
GL_ACCOUNT= xorg
GL_PROJECT= xserver
-GL_TUPLE= xorg/proto:xorgproto:xorgproto-2024.1:xorgproto/subprojects/xorgproto
MESON_ARGS= -D${PORTNAME}=true \
-Dxorg=false \
-Dxnest=false \
@@ -71,10 +70,4 @@ EI_DESC= Emulated input via libei
EI_LIB_DEPENDS= libei.so:x11/libei
EI_MESON_OFF= -Dxwayland_ei=false
-.ifdef GL_TUPLE
-post-configure:
- @${REINPLACE_CMD} 's/meson install/& \
- --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
-.endif
-
.include <bsd.port.mk>
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index 3dde716dd8b7..988a8c9cd5e3 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,5 +1,3 @@
TIMESTAMP = 1715642088
SHA256 (xserver-xorg-server-21.0.99.1-1057-ga4d298d85.tar.bz2) = 6b148134f1798c913ce802270e2b0946d7c381573140b51706ae26f59f00d04c
SIZE (xserver-xorg-server-21.0.99.1-1057-ga4d298d85.tar.bz2) = 3712187
-SHA256 (xorgproto-xorgproto-2024.1.tar.bz2) = 3959b2d17d86dd9d165dc24d26f372ca64f27127cd381739366ba8383a6cd51a
-SIZE (xorgproto-xorgproto-2024.1.tar.bz2) = 775116
diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile
index 8271be8bad85..50ab69358a11 100644
--- a/x11/xorgproto/Makefile
+++ b/x11/xorgproto/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xorgproto
-DISTVERSION= 2023.2
+DISTVERSION= 2024.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xorgproto/distinfo b/x11/xorgproto/distinfo
index 275f43ec4d49..fe87b2b0eba8 100644
--- a/x11/xorgproto/distinfo
+++ b/x11/xorgproto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698309470
-SHA256 (xorg/proto/xorgproto-2023.2.tar.xz) = b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c
-SIZE (xorg/proto/xorgproto-2023.2.tar.xz) = 759040
+TIMESTAMP = 1711437392
+SHA256 (xorg/proto/xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59
+SIZE (xorg/proto/xorgproto-2024.1.tar.xz) = 760500